| commit | 3659363d06cde677dc75b886ac3ff6450235ce1c | [log] [tgz] |
|---|---|---|
| author | ashutoshj <ashutoshj@google.com> | Thu Dec 29 01:52:34 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Dec 29 01:52:34 2016 +0000 |
| tree | 04af305486144f898ca4346bd49b45ce77851262 | |
| parent | 53389399486e8cefe356f74d84e58cb900d04af5 [diff] | |
| parent | cf33fd791073fa89826f1bed4a6045083d89bbcc [diff] |
Merge "Change the name of the contexthub service." am: fba752e64c am: 8a3f7c0738 am: cf33fd7910 Change-Id: Ic9daa912077d6162092a0adcb5d8debf10be9c55
diff --git a/core/java/android/hardware/location/ContextHubManager.java b/core/java/android/hardware/location/ContextHubManager.java index d4dcacc..0c4573b 100644 --- a/core/java/android/hardware/location/ContextHubManager.java +++ b/core/java/android/hardware/location/ContextHubManager.java
@@ -391,7 +391,7 @@ 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 1b85632..06abca9 100644 --- a/services/core/java/com/android/server/ContextHubSystemService.java +++ b/services/core/java/com/android/server/ContextHubSystemService.java
@@ -37,7 +37,7 @@ 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); } } }