Merge "Properly update remote service when ContentSuggestionsPerUserService is updated." (5a9668a5) · Commits · e / os / android_frameworks_base

services/contentsuggestions/java/com/android/server/contentsuggestions/ContentSuggestionsPerUserService.java

+10 −6

Original line number	Diff line number	Diff line
		@@ -80,12 +80,7 @@ public final class ContentSuggestionsPerUserService extends
		@Override // from PerUserSystemService
		protected boolean updateLocked(boolean disabled) {
		final boolean enabledChanged = super.updateLocked(disabled);
		if (enabledChanged) {
		if (!isEnabledLocked()) {
		// Clear the remote service for the next call
		mRemoteService = null;
		}
		}
		updateRemoteServiceLocked();
		return enabledChanged;
		}

		@@ -132,6 +127,15 @@ public final class ContentSuggestionsPerUserService extends
		}
		}

		@GuardedBy("mLock")
		private void updateRemoteServiceLocked() {
		if (mRemoteService != null) {
		mRemoteService.destroy();
		mRemoteService = null;
		}
		}


		@GuardedBy("mLock")
		@Nullable
		private RemoteContentSuggestionsService getRemoteServiceLocked() {