Snap for 10132225 from a9186013787503a94b94b163d7099a92a975d526 to udc-qpr1-release (14b21471) · Commits · e / os / android_frameworks_base

core/java/android/hardware/devicestate/IDeviceStateManager.aidl

+8 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,14 @@ import android.hardware.devicestate.IDeviceStateManagerCallback;

		/** @hide */
		interface IDeviceStateManager {
		/** Returns the current device state info. */
		/**
		* Returns the current device state info. This {@link DeviceStateInfo} object will always
		* include the list of supported states. If there has been no base state or committed state
		* provided yet to the system server, this {@link DeviceStateInfo} object will include
		* {@link DeviceStateManager#INVALID_DEVICE_STATE} for each respectively.
		*
		* This method should not be used to notify callback clients.
		*/
		DeviceStateInfo getDeviceStateInfo();

		/**

core/java/android/view/autofill/AutofillFeatureFlags.java

+23 −7

Original line number	Diff line number	Diff line
		@@ -275,6 +275,14 @@ public class AutofillFeatureFlags {
		public static final boolean DEFAULT_AUTOFILL_PCC_CLASSIFICATION_ENABLED = false;
		// END AUTOFILL PCC CLASSIFICATION FLAGS DEFAULTS

		// AUTOFILL FOR ALL APPS DEFAULTS
		private static final boolean DEFAULT_AFAA_ON_UNIMPORTANT_VIEW_ENABLED = true;
		private static final boolean DEFAULT_AFAA_ON_IMPORTANT_VIEW_ENABLED = true;
		private static final String DEFAULT_AFAA_DENYLIST = "";
		private static final String DEFAULT_AFAA_ALLOWLIST = "";
		private static final String DEFAULT_AFAA_NON_AUTOFILLABLE_IME_ACTIONS = "2,3,4";
		private static final boolean DEFAULT_AFAA_SHOULD_ENABLE_AUTOFILL_ON_ALL_VIEW_TYPES = true;
		private static final boolean DEFAULT_AFAA_SHOULD_ENABLE_MULTILINE_FILTER = true;

		private AutofillFeatureFlags() {};

		@@ -330,7 +338,8 @@ public class AutofillFeatureFlags {
		public static boolean isTriggerFillRequestOnUnimportantViewEnabled() {
		return DeviceConfig.getBoolean(
		DeviceConfig.NAMESPACE_AUTOFILL,
		DEVICE_CONFIG_TRIGGER_FILL_REQUEST_ON_UNIMPORTANT_VIEW, false);
		DEVICE_CONFIG_TRIGGER_FILL_REQUEST_ON_UNIMPORTANT_VIEW,
		DEFAULT_AFAA_ON_UNIMPORTANT_VIEW_ENABLED);
		}

		/**
		@@ -341,7 +350,8 @@ public class AutofillFeatureFlags {
		public static boolean isTriggerFillRequestOnFilteredImportantViewsEnabled() {
		return DeviceConfig.getBoolean(
		DeviceConfig.NAMESPACE_AUTOFILL,
		DEVICE_CONFIG_TRIGGER_FILL_REQUEST_ON_FILTERED_IMPORTANT_VIEWS, false);
		DEVICE_CONFIG_TRIGGER_FILL_REQUEST_ON_FILTERED_IMPORTANT_VIEWS,
		DEFAULT_AFAA_ON_IMPORTANT_VIEW_ENABLED);
		}

		/**
		@@ -352,7 +362,8 @@ public class AutofillFeatureFlags {
		public static boolean shouldEnableAutofillOnAllViewTypes(){
		return DeviceConfig.getBoolean(
		DeviceConfig.NAMESPACE_AUTOFILL,
		DEVICE_CONFIG_SHOULD_ENABLE_AUTOFILL_ON_ALL_VIEW_TYPES, false);
		DEVICE_CONFIG_SHOULD_ENABLE_AUTOFILL_ON_ALL_VIEW_TYPES,
		DEFAULT_AFAA_SHOULD_ENABLE_AUTOFILL_ON_ALL_VIEW_TYPES);
		}

		/**
		@@ -363,7 +374,9 @@ public class AutofillFeatureFlags {
		*/
		public static Set<String> getNonAutofillableImeActionIdSetFromFlag() {
		final String mNonAutofillableImeActions = DeviceConfig.getString(
		DeviceConfig.NAMESPACE_AUTOFILL, DEVICE_CONFIG_NON_AUTOFILLABLE_IME_ACTION_IDS, "");
		DeviceConfig.NAMESPACE_AUTOFILL,
		DEVICE_CONFIG_NON_AUTOFILLABLE_IME_ACTION_IDS,
		DEFAULT_AFAA_NON_AUTOFILLABLE_IME_ACTIONS);
		return new ArraySet<>(Arrays.asList(mNonAutofillableImeActions.split(",")));
		}

		@@ -378,7 +391,8 @@ public class AutofillFeatureFlags {
		public static String getDenylistStringFromFlag() {
		return DeviceConfig.getString(
		DeviceConfig.NAMESPACE_AUTOFILL,
		DEVICE_CONFIG_PACKAGE_DENYLIST_FOR_UNIMPORTANT_VIEW, "");
		DEVICE_CONFIG_PACKAGE_DENYLIST_FOR_UNIMPORTANT_VIEW,
		DEFAULT_AFAA_DENYLIST);
		}

		/**
		@@ -389,7 +403,8 @@ public class AutofillFeatureFlags {
		public static String getAllowlistStringFromFlag() {
		return DeviceConfig.getString(
		DeviceConfig.NAMESPACE_AUTOFILL,
		DEVICE_CONFIG_PACKAGE_AND_ACTIVITY_ALLOWLIST_FOR_TRIGGERING_FILL_REQUEST, "");
		DEVICE_CONFIG_PACKAGE_AND_ACTIVITY_ALLOWLIST_FOR_TRIGGERING_FILL_REQUEST,
		DEFAULT_AFAA_ALLOWLIST);
		}
		/**
		* Whether include all views that have autofill type not none in assist structure.
		@@ -422,7 +437,8 @@ public class AutofillFeatureFlags {
		public static boolean shouldEnableMultilineFilter() {
		return DeviceConfig.getBoolean(
		DeviceConfig.NAMESPACE_AUTOFILL,
		DEVICE_CONFIG_MULTILINE_FILTER_ENABLED, false);
		DEVICE_CONFIG_MULTILINE_FILTER_ENABLED,
		DEFAULT_AFAA_SHOULD_ENABLE_MULTILINE_FILTER);
		}

		// START AUTOFILL PCC CLASSIFICATION FUNCTIONS

core/java/android/view/autofill/AutofillManager.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -468,7 +468,8 @@ public final class AutofillManager {
		COMMIT_REASON_ACTIVITY_FINISHED,
		COMMIT_REASON_VIEW_COMMITTED,
		COMMIT_REASON_VIEW_CLICKED,
		COMMIT_REASON_VIEW_CHANGED
		COMMIT_REASON_VIEW_CHANGED,
		COMMIT_REASON_SESSION_DESTROYED
		})
		@Retention(RetentionPolicy.SOURCE)
		public @interface AutofillCommitReason {}
		@@ -507,6 +508,12 @@ public final class AutofillManager {
		* @hide
		*/
		public static final int COMMIT_REASON_VIEW_CHANGED = 4;
		/**
		* Autofill context was committed because of the session was destroyed.
		*
		* @hide
		*/
		public static final int COMMIT_REASON_SESSION_DESTROYED = 5;

		/**
		* Makes an authentication id from a request id and a dataset id.

core/proto/android/companion/telecom.proto

+3 −2

Original line number	Diff line number	Diff line
		@@ -42,6 +42,9 @@ message Telecom {
		ONGOING = 2;
		ON_HOLD = 3;
		RINGING_SILENCED = 4;
		AUDIO_PROCESSING = 5;
		RINGING_SIMULATED = 6;
		DISCONNECTED = 7;
		}
		Status status = 3;

		@@ -89,8 +92,6 @@ message Telecom {
		END = 6;
		PUT_ON_HOLD = 7;
		TAKE_OFF_HOLD = 8;
		REJECT_AND_BLOCK = 9;
		IGNORE = 10;
		}

		// The list of active calls.

libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitLayout.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -717,6 +717,10 @@ public final class SplitLayout implements DisplayInsetsController.OnInsetsChange
		return bounds.width() > bounds.height();
		}

		public boolean isDensityChanged(int densityDpi) {
		return mDensity != densityDpi;
		}

		/**
		* Return if this layout is landscape.
		*/