Snap for 7514518 from 71812c219c2717b69a6a2df4ec455720065b4227 to sc-d1-release (25de8abc) · Commits · e / os / android_frameworks_base

core/api/test-current.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -2724,12 +2724,12 @@ package android.view {
		public final class InputDevice implements android.os.Parcelable {
		method @RequiresPermission("android.permission.DISABLE_INPUT_DEVICE") public void disable();
		method @RequiresPermission("android.permission.DISABLE_INPUT_DEVICE") public void enable();
		field public static final int ACCESSIBILITY_DEVICE_ID = -2; // 0xfffffffe
		}

		public class KeyEvent extends android.view.InputEvent implements android.os.Parcelable {
		method public static String actionToString(int);
		method public final void setDisplayId(int);
		field public static final int FLAG_IS_ACCESSIBILITY_EVENT = 2048; // 0x800
		field public static final int LAST_KEYCODE = 288; // 0x120
		}

		@@ -2747,6 +2747,7 @@ package android.view {
		method public void setActionButton(int);
		method public void setButtonState(int);
		method public void setDisplayId(int);
		field public static final int FLAG_IS_ACCESSIBILITY_EVENT = 2048; // 0x800
		}

		@java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD}) public @interface RemotableViewMethod {

core/java/android/app/ActivityManagerInternal.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -640,4 +640,10 @@ public abstract class ActivityManagerInternal {
		* Returns the capability of the given uid
		*/
		public abstract @ProcessCapability int getUidCapability(int uid);

		/**
		* @return The PID list of the isolated process with packages matching the given uid.
		*/
		@Nullable
		public abstract List<Integer> getIsolatedProcesses(int uid);
		}

core/java/android/content/ClipData.java

+29 −3

Original line number	Diff line number	Diff line
		@@ -179,6 +179,10 @@ public class ClipData implements Parcelable {

		final ArrayList<Item> mItems;

		// This is false by default unless the ClipData is obtained via
		// {@link #copyForTransferWithActivityInfo}.
		private boolean mParcelItemActivityInfos;

		/**
		* Description of a single item in a ClipData.
		*
		@@ -204,9 +208,11 @@ public class ClipData implements Parcelable {
		final Intent mIntent;
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)
		Uri mUri;
		// Additional activity info resolved by the system
		ActivityInfo mActivityInfo;
		private TextLinks mTextLinks;
		// Additional activity info resolved by the system. This is only parceled with the ClipData
		// if the data is obtained from {@link #copyForTransferWithActivityInfo}
		private ActivityInfo mActivityInfo;


		/** @hide */
		public Item(Item other) {
		@@ -214,6 +220,8 @@ public class ClipData implements Parcelable {
		mHtmlText = other.mHtmlText;
		mIntent = other.mIntent;
		mUri = other.mUri;
		mActivityInfo = other.mActivityInfo;
		mTextLinks = other.mTextLinks;
		}

		/**
		@@ -816,6 +824,24 @@ public class ClipData implements Parcelable {
		mItems = new ArrayList<Item>(other.mItems);
		}

		/**
		* Returns a copy of the ClipData which will parcel the Item's activity infos.
		* @hide
		*/
		public ClipData copyForTransferWithActivityInfo() {
		ClipData copy = new ClipData(this);
		copy.mParcelItemActivityInfos = true;
		return copy;
		}

		/**
		* Returns whether this clip data will parcel the Item's activity infos.
		* @hide
		*/
		public boolean willParcelWithActivityInfo() {
		return mParcelItemActivityInfos;
		}

		/**
		* Create a new ClipData holding data of the type
		* {@link ClipDescription#MIMETYPE_TEXT_PLAIN}.
		@@ -1208,7 +1234,7 @@ public class ClipData implements Parcelable {
		dest.writeString8(item.mHtmlText);
		dest.writeTypedObject(item.mIntent, flags);
		dest.writeTypedObject(item.mUri, flags);
		dest.writeTypedObject(item.mActivityInfo, flags);
		dest.writeTypedObject(mParcelItemActivityInfos ? item.mActivityInfo : null, flags);
		dest.writeTypedObject(item.mTextLinks, flags);
		}
		}

core/java/android/hardware/display/DisplayManagerInternal.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -207,6 +207,8 @@ public abstract class DisplayManagerInternal {
		* has a preference.
		* @param requestedModeId The preferred mode id for the top-most visible window that has a
		* preference.
		* @param requestedMinRefreshRate The preferred lowest refresh rate for the top-most visible
		* window that has a preference.
		* @param requestedMaxRefreshRate The preferred highest refresh rate for the top-most visible
		* window that has a preference.
		* @param requestedMinimalPostProcessing The preferred minimal post processing setting for the
		@@ -216,8 +218,9 @@ public abstract class DisplayManagerInternal {
		* prior to call to performTraversalInTransactionFromWindowManager.
		*/
		public abstract void setDisplayProperties(int displayId, boolean hasContent,
		float requestedRefreshRate, int requestedModeId, float requestedMaxRefreshRate,
		boolean requestedMinimalPostProcessing, boolean inTraversal);
		float requestedRefreshRate, int requestedModeId, float requestedMinRefreshRate,
		float requestedMaxRefreshRate, boolean requestedMinimalPostProcessing,
		boolean inTraversal);

		/**
		* Applies an offset to the contents of a display, for example to avoid burn-in.

core/java/android/service/autofill/augmented/Helper.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -32,9 +32,12 @@ public final class Helper {
		*/
		public static void logResponse(int type, @NonNull String servicePackageName,
		@NonNull ComponentName componentName, int mSessionId, long durationMs) {
		// Remove activity name from logging
		final ComponentName sanitizedComponentName =
		new ComponentName(componentName.getPackageName(), "");
		final LogMaker log = new LogMaker(MetricsEvent.AUTOFILL_AUGMENTED_RESPONSE)
		.setType(type)
		.setComponentName(componentName)
		.setComponentName(sanitizedComponentName)
		.addTaggedData(MetricsEvent.FIELD_AUTOFILL_SESSION_ID, mSessionId)
		.addTaggedData(MetricsEvent.FIELD_AUTOFILL_SERVICE, servicePackageName)
		.addTaggedData(MetricsEvent.FIELD_AUTOFILL_DURATION, durationMs);