Merge cherrypicks of ['googleplex-android-review.googlesource.com/20321691',... (593ee4d7) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityManager.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -3934,6 +3934,9 @@ public class ActivityManager {
		* processes to reclaim memory; the system will take care of restarting
		* these processes in the future as needed.
		*
		* <p class="note">Third party applications can only use this API to kill their own processes.
		* </p>
		*
		* @param packageName The name of the package whose processes are to
		* be killed.
		*/

+6 −0

Original line number	Diff line number	Diff line
		@@ -2807,6 +2807,10 @@ public class Notification implements Parcelable
		* @hide
		*/
		public void visitUris(@NonNull Consumer<Uri> visitor) {
		if (publicVersion != null) {
		publicVersion.visitUris(visitor);
		}

		visitor.accept(sound);

		if (tickerView != null) tickerView.visitUris(visitor);
		@@ -2892,6 +2896,8 @@ public class Notification implements Parcelable
		}
		}
		}

		visitIconUri(visitor, extras.getParcelable(EXTRA_CONVERSATION_ICON));
		}

		if (isStyle(CallStyle.class) & extras != null) {

+2 −1

Original line number	Diff line number	Diff line
		@@ -12373,7 +12373,8 @@ public class DevicePolicyManager {

		/**
		* Called by a device admin to set the long support message. This will be displayed to the user
		* in the device administators settings screen.
		* in the device administrators settings screen. If the message is longer than 20000 characters
		* it may be truncated.
		* <p>
		* If the long support message needs to be localized, it is the responsibility of the
		* {@link DeviceAdminReceiver} to listen to the {@link Intent#ACTION_LOCALE_CHANGED} broadcast

+19 −1

Original line number	Diff line number	Diff line
		@@ -728,6 +728,11 @@ public class RemoteViews implements Parcelable, Filter {
		mActions.get(i).visitUris(visitor);
		}
		}
		if (mSizedRemoteViews != null) {
		for (int i = 0; i < mSizedRemoteViews.size(); i++) {
		mSizedRemoteViews.get(i).visitUris(visitor);
		}
		}
		if (mLandscape != null) {
		mLandscape.visitUris(visitor);
		}
		@@ -1837,7 +1842,7 @@ public class RemoteViews implements Parcelable, Filter {
		}

		@Override
		public final void visitUris(@NonNull Consumer<Uri> visitor) {
		public void visitUris(@NonNull Consumer<Uri> visitor) {
		switch (this.type) {
		case URI:
		final Uri uri = (Uri) getParameterValue(null);
		@@ -2300,6 +2305,14 @@ public class RemoteViews implements Parcelable, Filter {
		public int getActionTag() {
		return NIGHT_MODE_REFLECTION_ACTION_TAG;
		}

		@Override
		public void visitUris(@NonNull Consumer<Uri> visitor) {
		if (this.type == ICON) {
		visitIconUri((Icon) mDarkValue, visitor);
		visitIconUri((Icon) mLightValue, visitor);
		}
		}
		}

		/**
		@@ -2598,6 +2611,11 @@ public class RemoteViews implements Parcelable, Filter {
		public int getActionTag() {
		return VIEW_GROUP_ACTION_ADD_TAG;
		}

		@Override
		public final void visitUris(@NonNull Consumer<Uri> visitor) {
		mNestedViews.visitUris(visitor);
		}
		}

		/**

+5 −1

Original line number	Diff line number	Diff line
		@@ -3124,6 +3124,10 @@

		<!-- Allows an application to call
		{@link android.app.ActivityManager#killBackgroundProcesses}.

		<p class="note">Third party applications can only use this API to kill their own
		processes.</p>

		<p>Protection level: normal
		-->
		<permission android:name="android.permission.KILL_BACKGROUND_PROCESSES"