Merge "[Media ML] Replace observing changes in Settings value" (47d65844) · Commits · e / os / android_frameworks_base

api/module-lib-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -7,6 +7,7 @@ package android.app {

		public class NotificationManager {
		method public boolean hasEnabledNotificationListener(@NonNull String, @NonNull android.os.UserHandle);
		field public static final String ACTION_NOTIFICATION_LISTENER_ENABLED_CHANGED = "android.app.action.NOTIFICATION_LISTENER_ENABLED_CHANGED";
		}

		}

core/java/android/app/NotificationManager.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -281,6 +281,16 @@ public class NotificationManager {
		public static final String ACTION_INTERRUPTION_FILTER_CHANGED
		= "android.app.action.INTERRUPTION_FILTER_CHANGED";

		/**
		* Intent that is broadcast when the state of
		* {@link #hasEnabledNotificationListener(String, UserHandle)} changes.
		* @hide
		*/
		@SdkConstant(SdkConstant.SdkConstantType.BROADCAST_INTENT_ACTION)
		@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
		public static final String ACTION_NOTIFICATION_LISTENER_ENABLED_CHANGED =
		"android.app.action.NOTIFICATION_LISTENER_ENABLED_CHANGED";

		/**
		* Intent that is broadcast when the state of getCurrentInterruptionFilter() changes.
		* @hide

core/res/AndroidManifest.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -558,6 +558,7 @@
		<protected-broadcast android:name="android.os.action.ACTION_EFFECTS_SUPPRESSOR_CHANGED" />
		<protected-broadcast android:name="android.app.action.NOTIFICATION_CHANNEL_BLOCK_STATE_CHANGED" />
		<protected-broadcast android:name="android.app.action.NOTIFICATION_CHANNEL_GROUP_BLOCK_STATE_CHANGED" />
		<protected-broadcast android:name="android.app.action.NOTIFICATION_LISTENER_ENABLED_CHANGED" />
		<protected-broadcast android:name="android.app.action.APP_BLOCK_STATE_CHANGED" />

		<protected-broadcast android:name="android.permission.GET_APP_GRANTED_URI_PERMISSIONS" />

non-updatable-api/module-lib-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -7,6 +7,7 @@ package android.app {

		public class NotificationManager {
		method public boolean hasEnabledNotificationListener(@NonNull String, @NonNull android.os.UserHandle);
		field public static final String ACTION_NOTIFICATION_LISTENER_ENABLED_CHANGED = "android.app.action.NOTIFICATION_LISTENER_ENABLED_CHANGED";
		}

		}

services/core/java/com/android/server/media/MediaSessionService.java

+14 −25

Original line number	Diff line number	Diff line
		@@ -32,14 +32,15 @@ import android.app.KeyguardManager;
		import android.app.NotificationManager;
		import android.app.PendingIntent;
		import android.content.ActivityNotFoundException;
		import android.content.BroadcastReceiver;
		import android.content.ComponentName;
		import android.content.ContentResolver;
		import android.content.Context;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.content.pm.PackageManager;
		import android.content.pm.ParceledListSlice;
		import android.content.pm.UserInfo;
		import android.database.ContentObserver;
		import android.media.AudioManager;
		import android.media.AudioManagerInternal;
		import android.media.AudioPlaybackConfiguration;
		@@ -58,7 +59,6 @@ import android.media.session.ISessionManager;
		import android.media.session.MediaController;
		import android.media.session.MediaSession;
		import android.media.session.MediaSessionManager;
		import android.net.Uri;
		import android.os.Binder;
		import android.os.Bundle;
		import android.os.Handler;
		@@ -138,7 +138,6 @@ public class MediaSessionService extends SystemService implements Monitor {
		private KeyguardManager mKeyguardManager;
		private AudioManagerInternal mAudioManagerInternal;
		private ContentResolver mContentResolver;
		private SettingsObserver mSettingsObserver;
		private boolean mHasFeatureLeanback;

		// The FullUserRecord of the current users. (i.e. The foreground user that isn't a profile)
		@@ -192,8 +191,6 @@ public class MediaSessionService extends SystemService implements Monitor {
		}
		}, null /* handler */);
		mContentResolver = mContext.getContentResolver();
		mSettingsObserver = new SettingsObserver();
		mSettingsObserver.observe();
		mHasFeatureLeanback = mContext.getPackageManager().hasSystemFeature(
		PackageManager.FEATURE_LEANBACK);

		@@ -202,8 +199,20 @@ public class MediaSessionService extends SystemService implements Monitor {
		instantiateCustomProvider(null);
		instantiateCustomDispatcher(null);
		mRecordThread.start();

		final IntentFilter filter = new IntentFilter(
		NotificationManager.ACTION_NOTIFICATION_LISTENER_ENABLED_CHANGED);
		mContext.registerReceiver(mNotificationListenerEnabledChangedReceiver, filter);
		}

		private final BroadcastReceiver mNotificationListenerEnabledChangedReceiver =
		new BroadcastReceiver() {
		@Override
		public void onReceive(Context context, Intent intent) {
		updateActiveSessionListeners();
		}
		};

		private boolean isGlobalPriorityActiveLocked() {
		return mGlobalPrioritySession != null && mGlobalPrioritySession.isActive();
		}
		@@ -1082,25 +1091,6 @@ public class MediaSessionService extends SystemService implements Monitor {
		}
		}

		final class SettingsObserver extends ContentObserver {
		private final Uri mSecureSettingsUri = Settings.Secure.getUriFor(
		Settings.Secure.ENABLED_NOTIFICATION_LISTENERS);

		private SettingsObserver() {
		super(null);
		}

		private void observe() {
		mContentResolver.registerContentObserver(mSecureSettingsUri,
		false, this, ALL.getIdentifier());
		}

		@Override
		public void onChange(boolean selfChange, Uri uri) {
		updateActiveSessionListeners();
		}
		}

		class SessionManagerImpl extends ISessionManager.Stub {
		private static final String EXTRA_WAKELOCK_ACQUIRED =
		"android.media.AudioService.WAKELOCK_ACQUIRED";
		@@ -2710,5 +2700,4 @@ public class MediaSessionService extends SystemService implements Monitor {
		obtainMessage(msg, userIdInteger).sendToTarget();
		}
		}

		}