diff options
| author | Joey Grover <joeygrover@gmail.com> | 2017-05-31 15:29:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-31 15:29:33 -0400 |
| commit | ef019af73a2df782afec73ae21a6f20cd2e3d462 (patch) | |
| tree | 6200dbf5c0e177816cae92aeb842928053b514be | |
| parent | 505a1a739cf93e640f17d6db588e5421073b0945 (diff) | |
| parent | 144b37bcbc0dc451bd50e926dcbf883648c47948 (diff) | |
| download | sdl_android-ef019af73a2df782afec73ae21a6f20cd2e3d462.tar.gz | |
Merge pull request #522 from smartdevicelink/bugfix/issue_462
#462 Consolidated all intent action “sdl.router.startservice”
| -rw-r--r-- | sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java | 2 | ||||
| -rw-r--r-- | sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java b/sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java index 6703232d5..b42732d3a 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java +++ b/sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java @@ -351,7 +351,7 @@ public class RouterServiceValidator { List<SdlApp> apps = new ArrayList<SdlApp>(); PackageManager packageManager = context.getPackageManager(); Intent intent = new Intent(); - intent.setAction("sdl.router.startservice"); + intent.setAction(TransportConstants.START_ROUTER_SERVICE_ACTION); List<ResolveInfo> infoList = packageManager.queryBroadcastReceivers(intent, 0); //We want to sort our list so that we know it's the same everytime Collections.sort(infoList,new Comparator<ResolveInfo>() { diff --git a/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java b/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java index ec89ed86c..4d3dabfa5 100644 --- a/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java +++ b/sdl_android/src/main/java/com/smartdevicelink/transport/SdlRouterService.java @@ -93,6 +93,10 @@ public class SdlRouterService extends Service{ private static final long CLIENT_PING_DELAY = 1000; public static final String REGISTER_NEWER_SERVER_INSTANCE_ACTION = "com.sdl.android.newservice"; + /** + * @deprecated use {@link TransportConstants#START_ROUTER_SERVICE_ACTION} instead + */ + @Deprecated public static final String START_SERVICE_ACTION = "sdl.router.startservice"; public static final String REGISTER_WITH_ROUTER_ACTION = "com.sdl.android.register"; @@ -839,7 +843,7 @@ public class SdlRouterService extends Service{ } HashMap<String,ResolveInfo> sdlMultiList ; public void startVersionCheck(){ - Intent intent = new Intent(START_SERVICE_ACTION); + Intent intent = new Intent(TransportConstants.START_ROUTER_SERVICE_ACTION); List<ResolveInfo> infos = getPackageManager().queryBroadcastReceivers(intent, 0); sdlMultiList = new HashMap<String,ResolveInfo>(); for(ResolveInfo info: infos){ @@ -1148,7 +1152,7 @@ public class SdlRouterService extends Service{ connectedTransportType = type; Intent startService = new Intent(); - startService.setAction(START_SERVICE_ACTION); + startService.setAction(TransportConstants.START_ROUTER_SERVICE_ACTION); startService.putExtra(TransportConstants.START_ROUTER_SERVICE_SDL_ENABLED_EXTRA, true); startService.putExtra(TransportConstants.FORCE_TRANSPORT_CONNECTED, true); startService.putExtra(TransportConstants.START_ROUTER_SERVICE_SDL_ENABLED_APP_PACKAGE, getBaseContext().getPackageName()); @@ -1935,7 +1939,7 @@ public class SdlRouterService extends Service{ private void initPingIntent(){ pingIntent = new Intent(); - pingIntent.setAction(START_SERVICE_ACTION); + pingIntent.setAction(TransportConstants.START_ROUTER_SERVICE_ACTION); pingIntent.putExtra(TransportConstants.START_ROUTER_SERVICE_SDL_ENABLED_EXTRA, true); pingIntent.putExtra(TransportConstants.START_ROUTER_SERVICE_SDL_ENABLED_APP_PACKAGE, getBaseContext().getPackageName()); pingIntent.putExtra(TransportConstants.START_ROUTER_SERVICE_SDL_ENABLED_CMP_NAME, new ComponentName(SdlRouterService.this, SdlRouterService.this.getClass())); |