Snap for 11710546 from fffdbd18a1ed6faebabfe8db4431723ecc9acbca to 24Q3-release (581f2139) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+7 −0

Original line number	Diff line number	Diff line
		@@ -1243,6 +1243,13 @@ java_aconfig_library {
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		java_aconfig_library {
		name: "android.crashrecovery.flags-aconfig-java-host",
		aconfig_declarations: "android.crashrecovery.flags-aconfig",
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		host_supported: true,
		}

		// Backup
		java_aconfig_library {
		name: "backup_flags_lib",

core/api/test-current.txt

+4 −3

Original line number	Diff line number	Diff line
		@@ -1769,14 +1769,16 @@ package android.hardware.input {
		}

		public final class InputManager {
		method public void addUniqueIdAssociation(@NonNull String, @NonNull String);
		method @FlaggedApi("com.android.input.flags.device_associations") @RequiresPermission("android.permission.ASSOCIATE_INPUT_DEVICE_TO_DISPLAY") public void addUniqueIdAssociationByDescriptor(@NonNull String, @NonNull String);
		method @FlaggedApi("com.android.input.flags.device_associations") @RequiresPermission("android.permission.ASSOCIATE_INPUT_DEVICE_TO_DISPLAY") public void addUniqueIdAssociationByPort(@NonNull String, @NonNull String);
		method @RequiresPermission(android.Manifest.permission.REMAP_MODIFIER_KEYS) public void clearAllModifierKeyRemappings();
		method @NonNull public java.util.List<java.lang.String> getKeyboardLayoutDescriptors();
		method @NonNull public String getKeyboardLayoutTypeForLayoutDescriptor(@NonNull String);
		method @NonNull @RequiresPermission(android.Manifest.permission.REMAP_MODIFIER_KEYS) public java.util.Map<java.lang.Integer,java.lang.Integer> getModifierKeyRemapping();
		method public int getMousePointerSpeed();
		method @RequiresPermission(android.Manifest.permission.REMAP_MODIFIER_KEYS) public void remapModifierKey(int, int);
		method public void removeUniqueIdAssociation(@NonNull String);
		method @FlaggedApi("com.android.input.flags.device_associations") @RequiresPermission("android.permission.ASSOCIATE_INPUT_DEVICE_TO_DISPLAY") public void removeUniqueIdAssociationByDescriptor(@NonNull String);
		method @FlaggedApi("com.android.input.flags.device_associations") @RequiresPermission("android.permission.ASSOCIATE_INPUT_DEVICE_TO_DISPLAY") public void removeUniqueIdAssociationByPort(@NonNull String);
		field public static final long BLOCK_UNTRUSTED_TOUCHES = 158002302L; // 0x96aec7eL
		}

		@@ -4135,7 +4137,6 @@ package android.window {
		method @NonNull public static String typeToString(int);
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.window.BackNavigationInfo> CREATOR;
		field public static final String KEY_TRIGGER_BACK = "TriggerBack";
		field public static final int TYPE_CALLBACK = 4; // 0x4
		field public static final int TYPE_CROSS_ACTIVITY = 2; // 0x2
		field public static final int TYPE_CROSS_TASK = 3; // 0x3

core/api/test-lint-baseline.txt

+8 −0

Original line number	Diff line number	Diff line
		@@ -977,8 +977,16 @@ RequiresPermission: android.hardware.hdmi.HdmiControlManager#setHdmiCecVersion(i
		Method 'setHdmiCecVersion' documentation mentions permissions already declared by @RequiresPermission
		RequiresPermission: android.hardware.input.InputManager#addUniqueIdAssociation(String, String):
		Method 'addUniqueIdAssociation' documentation mentions permissions without declaring @RequiresPermission
		RequiresPermission: android.hardware.input.InputManager#addUniqueIdAssociationByDescriptor(String, String):
		Method 'addUniqueIdAssociationByDescriptor' documentation mentions permissions already declared by @RequiresPermission
		RequiresPermission: android.hardware.input.InputManager#addUniqueIdAssociationByPort(String, String):
		Method 'addUniqueIdAssociationByPort' documentation mentions permissions already declared by @RequiresPermission
		RequiresPermission: android.hardware.input.InputManager#removeUniqueIdAssociation(String):
		Method 'removeUniqueIdAssociation' documentation mentions permissions without declaring @RequiresPermission
		RequiresPermission: android.hardware.input.InputManager#removeUniqueIdAssociationByDescriptor(String):
		Method 'removeUniqueIdAssociationByDescriptor' documentation mentions permissions already declared by @RequiresPermission
		RequiresPermission: android.hardware.input.InputManager#removeUniqueIdAssociationByPort(String):
		Method 'removeUniqueIdAssociationByPort' documentation mentions permissions already declared by @RequiresPermission
		RequiresPermission: android.hardware.location.GeofenceHardware#addGeofence(int, int, android.hardware.location.GeofenceHardwareRequest, android.hardware.location.GeofenceHardwareCallback):
		Method 'addGeofence' documentation mentions permissions without declaring @RequiresPermission
		RequiresPermission: android.hardware.location.GeofenceHardware#getMonitoringTypes():

core/java/android/app/Notification.java

+9 −6

Original line number	Diff line number	Diff line
		@@ -2583,6 +2583,7 @@ public class Notification implements Parcelable
		this.when = System.currentTimeMillis();
		if (updateRankingTime()) {
		creationTime = when;
		extras.putBoolean(EXTRA_SHOW_WHEN, true);
		} else {
		this.creationTime = System.currentTimeMillis();
		}
		@@ -2598,6 +2599,7 @@ public class Notification implements Parcelable
		{
		if (updateRankingTime()) {
		creationTime = when;
		extras.putBoolean(EXTRA_SHOW_WHEN, true);
		}
		new Builder(context)
		.setWhen(when)
		@@ -2630,6 +2632,7 @@ public class Notification implements Parcelable
		this.when = when;
		if (updateRankingTime()) {
		creationTime = when;
		extras.putBoolean(EXTRA_SHOW_WHEN, true);
		} else {
		this.creationTime = System.currentTimeMillis();
		}
		@@ -4382,14 +4385,16 @@ public class Notification implements Parcelable
		/**
		* Add a timestamp pertaining to the notification (usually the time the event occurred).
		*
		* For apps targeting {@link android.os.Build.VERSION_CODES#N} and above, this time is not
		* shown anymore by default and must be opted into by using
		* {@link android.app.Notification.Builder#setShowWhen(boolean)}
		*
		* @see Notification#when
		*/
		@NonNull
		public Builder setWhen(long when) {
		if (updateRankingTime()) {
		// don't show a timestamp that's decades old
		if (mN.extras.getBoolean(EXTRA_SHOW_WHEN, true) && when == 0) {
		return this;
		}
		}
		mN.when = when;
		return this;
		}
		@@ -4397,8 +4402,6 @@ public class Notification implements Parcelable
		/**
		* Control whether the timestamp set with {@link #setWhen(long) setWhen} is shown
		* in the content view.
		* For apps targeting {@link android.os.Build.VERSION_CODES#N} and above, this defaults to
		* {@code false}. For earlier apps, the default is {@code true}.
		*/
		@NonNull
		public Builder setShowWhen(boolean show) {

core/java/android/app/admin/DeviceAdminReceiver.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -244,6 +244,10 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
		* {@link android.app.admin.DevicePolicyManager#isProfileOwnerApp}. You will generally handle
		* this in {@link DeviceAdminReceiver#onProfileProvisioningComplete}.
		*
		* <p>The intent for this action may include the following extras:
		* <ul>
		* <li>{@link DevicePolicyManager#EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE}
		*
		* @see DevicePolicyManager#ACTION_PROVISIONING_SUCCESSFUL
		*/
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		@@ -801,6 +805,9 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
		* {@link DevicePolicyManager#ACTION_PROVISIONING_SUCCESSFUL} will also be sent to the same
		* application.
		*
		* <p>The {@code Intent} may include any of the extras specified for
		* {@link #ACTION_PROFILE_PROVISIONING_COMPLETE}.
		*
		* @param context The running context as per {@link #onReceive}.
		* @param intent The received intent as per {@link #onReceive}.
		*/