Merge cherrypicks of ['googleplex-android-review.googlesource.com/23476871',... (3e09cce1) · Commits · e / os / android_frameworks_base

core/java/android/app/NotificationManager.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -562,6 +562,12 @@ public class NotificationManager {
		*/
		public static final int BUBBLE_PREFERENCE_SELECTED = 2;

		/**
		* Maximum length of the component name of a registered NotificationListenerService.
		* @hide
		*/
		public static int MAX_SERVICE_COMPONENT_NAME_LENGTH = 500;

		@UnsupportedAppUsage
		private static INotificationManager sService;

packages/SettingsLib/src/com/android/settingslib/RestrictedSwitchPreference.java

+6 −2

Original line number	Diff line number	Diff line
		@@ -243,7 +243,9 @@ public class RestrictedSwitchPreference extends SwitchPreference {
		return mHelper != null ? mHelper.packageName : null;
		}

		public void updateState(@NonNull String packageName, int uid, boolean isEnabled) {
		/** Updates enabled state based on associated package. */
		public void updateState(
		@NonNull String packageName, int uid, boolean isEnableAllowed, boolean isEnabled) {
		mHelper.updatePackageDetails(packageName, uid);
		if (mAppOpsManager == null) {
		mAppOpsManager = getContext().getSystemService(AppOpsManager.class);
		@@ -254,7 +256,9 @@ public class RestrictedSwitchPreference extends SwitchPreference {
		final boolean ecmEnabled = getContext().getResources().getBoolean(
		com.android.internal.R.bool.config_enhancedConfirmationModeEnabled);
		final boolean appOpsAllowed = !ecmEnabled \|\| mode == AppOpsManager.MODE_ALLOWED;
		if (isEnabled) {
		if (!isEnableAllowed && !isEnabled) {
		setEnabled(false);
		} else if (isEnabled) {
		setEnabled(true);
		} else if (appOpsAllowed && isDisabledByAppOps()) {
		setEnabled(true);

packages/SystemUI/src/com/android/systemui/media/MediaResumeListener.kt

+36 −10

Original line number	Diff line number	Diff line
		@@ -101,9 +101,16 @@ class MediaResumeListener @Inject constructor(
		Log.e(TAG, "Error getting package information", e)
		}

		Log.d(TAG, "Adding resume controls $desc")
		mediaDataManager.addResumptionControls(currentUserId, desc, resumeAction, token,
		appName.toString(), appIntent, component.packageName)
		Log.d(TAG, "Adding resume controls for ${browser.userId}: $desc")
		mediaDataManager.addResumptionControls(
		browser.userId,
		desc,
		resumeAction,
		token,
		appName.toString(),
		appIntent,
		component.packageName
		)
		}
		}

		@@ -158,7 +165,11 @@ class MediaResumeListener @Inject constructor(
		}
		resumeComponents.add(component to lastPlayed)
		}
		Log.d(TAG, "loaded resume components ${resumeComponents.toArray().contentToString()}")
		Log.d(
		TAG,
		"loaded resume components for $currentUserId: " +
		"${resumeComponents.toArray().contentToString()}"
		)

		if (needsUpdate) {
		// Save any missing times that we had to fill in
		@@ -174,11 +185,21 @@ class MediaResumeListener @Inject constructor(
		return
		}

		val pm = context.packageManager
		val now = systemClock.currentTimeMillis()
		resumeComponents.forEach {
		if (now.minus(it.second) <= RESUME_MEDIA_TIMEOUT) {
		val browser = mediaBrowserFactory.create(mediaBrowserCallback, it.first)
		// Verify that the service exists for this user
		val intent = Intent(MediaBrowserService.SERVICE_INTERFACE)
		intent.component = it.first
		val inf = pm.resolveServiceAsUser(intent, 0, currentUserId)
		if (inf != null) {
		val browser =
		mediaBrowserFactory.create(mediaBrowserCallback, it.first, currentUserId)
		browser.findRecentMedia()
		} else {
		Log.d(TAG, "User $currentUserId does not have component ${it.first}")
		}
		}
		}
		}
		@@ -202,7 +223,7 @@ class MediaResumeListener @Inject constructor(
		Log.d(TAG, "Checking for service component for " + data.packageName)
		val pm = context.packageManager
		val serviceIntent = Intent(MediaBrowserService.SERVICE_INTERFACE)
		val resumeInfo = pm.queryIntentServices(serviceIntent, 0)
		val resumeInfo = pm.queryIntentServicesAsUser(serviceIntent, 0, currentUserId)

		val inf = resumeInfo?.filter {
		it.serviceInfo.packageName == data.packageName
		@@ -244,13 +265,18 @@ class MediaResumeListener @Inject constructor(
		browser: ResumeMediaBrowser
		) {
		// Since this is a test, just save the component for later
		Log.d(TAG, "Can get resumable media from $componentName")
		Log.d(
		TAG,
		"Can get resumable media for ${browser.userId} from $componentName"
		)
		mediaDataManager.setResumeAction(key, getResumeAction(componentName))
		updateResumptionList(componentName)
		mediaBrowser = null
		}
		},
		componentName)
		componentName,
		currentUserId
		)
		mediaBrowser?.testConnection()
		}

		@@ -290,7 +316,7 @@ class MediaResumeListener @Inject constructor(
		*/
		private fun getResumeAction(componentName: ComponentName): Runnable {
		return Runnable {
		mediaBrowser = mediaBrowserFactory.create(null, componentName)
		mediaBrowser = mediaBrowserFactory.create(null, componentName, currentUserId)
		mediaBrowser?.restart()
		}
		}

packages/SystemUI/src/com/android/systemui/media/ResumeMediaBrowser.java

+14 −1

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		package com.android.systemui.media;

		import android.annotation.Nullable;
		import android.annotation.UserIdInt;
		import android.app.PendingIntent;
		import android.content.ComponentName;
		import android.content.Context;
		@@ -53,6 +54,7 @@ public class ResumeMediaBrowser {
		private final ResumeMediaBrowserLogger mLogger;
		private final ComponentName mComponentName;
		private final MediaController.Callback mMediaControllerCallback = new SessionDestroyCallback();
		@UserIdInt private final int mUserId;

		private MediaBrowser mMediaBrowser;
		@Nullable private MediaController mMediaController;
		@@ -62,18 +64,21 @@ public class ResumeMediaBrowser {
		* @param context the context
		* @param callback used to report media items found
		* @param componentName Component name of the MediaBrowserService this browser will connect to
		* @param userId ID of the current user
		*/
		public ResumeMediaBrowser(
		Context context,
		@Nullable Callback callback,
		ComponentName componentName,
		MediaBrowserFactory browserFactory,
		ResumeMediaBrowserLogger logger) {
		ResumeMediaBrowserLogger logger,
		@UserIdInt int userId) {
		mContext = context;
		mCallback = callback;
		mComponentName = componentName;
		mBrowserFactory = browserFactory;
		mLogger = logger;
		mUserId = userId;
		}

		/**
		@@ -275,6 +280,14 @@ public class ResumeMediaBrowser {
		return new MediaController(mContext, token);
		}

		/**
		* Get the ID of the user associated with this broswer
		* @return the user ID
		*/
		public @UserIdInt int getUserId() {
		return mUserId;
		}

		/**
		* Get the media session token
		* @return the token, or null if the MediaBrowser is null or disconnected

packages/SystemUI/src/com/android/systemui/media/ResumeMediaBrowserFactory.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.systemui.media;

		import android.annotation.UserIdInt;
		import android.content.ComponentName;
		import android.content.Context;

		@@ -42,10 +43,12 @@ public class ResumeMediaBrowserFactory {
		*
		* @param callback will be called on connection or error, and addTrack when media item found
		* @param componentName component to browse
		* @param userId ID of the current user
		* @return
		*/
		public ResumeMediaBrowser create(ResumeMediaBrowser.Callback callback,
		ComponentName componentName) {
		return new ResumeMediaBrowser(mContext, callback, componentName, mBrowserFactory, mLogger);
		ComponentName componentName, @UserIdInt int userId) {
		return new ResumeMediaBrowser(mContext, callback, componentName, mBrowserFactory, mLogger,
		userId);
		}
		}