am 44ff0d4e: Merge "NoMan: Allow SysUI to register as listener" into lmp-preview-dev (ab17ddf6) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/notification/ManagedServices.java

+7 −2

Original line number	Diff line number	Diff line
		@@ -175,7 +175,10 @@ abstract public class ManagedServices {

		public void registerService(IInterface service, ComponentName component, int userid) {
		checkNotNull(service);
		registerServiceImpl(service, component, userid);
		ManagedServiceInfo info = registerServiceImpl(service, component, userid);
		if (info != null) {
		onServiceAdded(info);
		}
		}

		/**
		@@ -464,7 +467,7 @@ abstract public class ManagedServices {
		}
		}

		private void registerServiceImpl(final IInterface service,
		private ManagedServiceInfo registerServiceImpl(final IInterface service,
		final ComponentName component, final int userid) {
		synchronized (mMutex) {
		try {
		@@ -472,10 +475,12 @@ abstract public class ManagedServices {
		true /isSystem/, null, Build.VERSION_CODES.L);
		service.asBinder().linkToDeath(info, 0);
		mServices.add(info);
		return info;
		} catch (RemoteException e) {
		// already dead
		}
		}
		return null;
		}

		/**

+1 −1

Original line number	Diff line number	Diff line
		@@ -1264,7 +1264,7 @@ public class NotificationManagerService extends SystemService {
		@Override
		public void registerListener(final INotificationListener listener,
		final ComponentName component, final int userid) {
		checkCallerIsSystem();
		enforceSystemOrSystemUI("INotificationManager.registerListener");
		mListeners.registerService(listener, component, userid);
		}