From 835da289fad97002fbc419082b8ac927394d9c30 Mon Sep 17 00:00:00 2001 From: Ashutosh Joshi Date: Tue, 27 Dec 2016 09:32:49 -0800 Subject: [PATCH] Change the name of the contexthub service. Change the name used by the contexthub service. Specifically, this change switches from using the "ContexthubService.CONTEXTHUB_SERVICE" constant to using the "Context.CONTEXTHUB_SERVICE" constant- which is in line with the other Android services. Merged-In: I18ae73ed0fda2f938e3233670dc52b5692d321ae Test: GTS tests pass. Change-Id: I18ae73ed0fda2f938e3233670dc52b5692d321ae --- core/java/android/hardware/location/ContextHubManager.java | 2 +- .../core/java/com/android/server/ContextHubSystemService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/java/android/hardware/location/ContextHubManager.java b/core/java/android/hardware/location/ContextHubManager.java index d4dcacceb7616..0c4573b3d7a27 100644 --- a/core/java/android/hardware/location/ContextHubManager.java +++ b/core/java/android/hardware/location/ContextHubManager.java @@ -391,7 +391,7 @@ public final class ContextHubManager { public ContextHubManager(Context context, Looper mainLooper) { mMainLooper = mainLooper; - IBinder b = ServiceManager.getService(ContextHubService.CONTEXTHUB_SERVICE); + IBinder b = ServiceManager.getService(Context.CONTEXTHUB_SERVICE); if (b != null) { mContextHubService = IContextHubService.Stub.asInterface(b); diff --git a/services/core/java/com/android/server/ContextHubSystemService.java b/services/core/java/com/android/server/ContextHubSystemService.java index 1b85632b806c6..06abca9c0746b 100644 --- a/services/core/java/com/android/server/ContextHubSystemService.java +++ b/services/core/java/com/android/server/ContextHubSystemService.java @@ -37,7 +37,7 @@ class ContextHubSystemService extends SystemService { public void onBootPhase(int phase) { if (phase == SystemService.PHASE_SYSTEM_SERVICES_READY) { Log.d(TAG, "onBootPhase: PHASE_SYSTEM_SERVICES_READY"); - publishBinderService(ContextHubService.CONTEXTHUB_SERVICE, mContextHubService); + publishBinderService(Context.CONTEXTHUB_SERVICE, mContextHubService); } } }