Snap for 11892734 from 0bd336747122d84310e0404cd5f42de4bf6f0351 to 24Q3-release (c9232ae5) · Commits · e / os / android_frameworks_base

core/java/android/app/admin/DevicePolicyManager.java

+20 −0

Original line number	Original line	Diff line number	Diff line
	@@ -5842,6 +5842,24 @@ public class DevicePolicyManager {
	* with {@link #PASSWORD_QUALITY_UNSPECIFIED} on that instance prior to setting complexity		* with {@link #PASSWORD_QUALITY_UNSPECIFIED} on that instance prior to setting complexity
	* requirement for the managed profile.		* requirement for the managed profile.
	*		*
			* Starting from {@link Build.VERSION_CODES#VANILLA_ICE_CREAM}, after the password
			* requirement has been set, {@link PolicyUpdateReceiver#onPolicySetResult(Context, String,
			* Bundle, TargetUser, PolicyUpdateResult)} will notify the admin on whether the policy was
			* successfully set or not. This callback will contain:
			* <ul>
			* <li> The policy identifier {@link DevicePolicyIdentifiers#PASSWORD_COMPLEXITY_POLICY}
			* <li> The {@link TargetUser} that this policy relates to
			* <li> The {@link PolicyUpdateResult}, which will be
			* {@link PolicyUpdateResult#RESULT_POLICY_SET} if the policy was successfully set or the
			* reason the policy failed to be set
			* e.g. {@link PolicyUpdateResult#RESULT_FAILURE_CONFLICTING_ADMIN_POLICY})
			* </ul>
			* If there has been a change to the policy,
			* {@link PolicyUpdateReceiver#onPolicyChanged(Context, String, Bundle, TargetUser,
			* PolicyUpdateResult)} will notify the admin of this change. This callback will contain the
			* same parameters as PolicyUpdateReceiver#onPolicySetResult and the {@link PolicyUpdateResult}
			* will contain the reason why the policy changed.
			*
	* @throws SecurityException if the calling application is not a device owner or a profile		* @throws SecurityException if the calling application is not a device owner or a profile
	* owner.		* owner.
	* @throws IllegalArgumentException if the complexity level is not one of the four above.		* @throws IllegalArgumentException if the complexity level is not one of the four above.
	@@ -5849,6 +5867,7 @@ public class DevicePolicyManager {
	* are password requirements specified using {@link #setPasswordQuality(ComponentName, int)}		* are password requirements specified using {@link #setPasswordQuality(ComponentName, int)}
	* on the parent {@code DevicePolicyManager} instance.		* on the parent {@code DevicePolicyManager} instance.
	*/		*/
			@SupportsCoexistence
	@RequiresPermission(value = MANAGE_DEVICE_POLICY_LOCK_CREDENTIALS, conditional = true)		@RequiresPermission(value = MANAGE_DEVICE_POLICY_LOCK_CREDENTIALS, conditional = true)
	public void setRequiredPasswordComplexity(@PasswordComplexity int passwordComplexity) {		public void setRequiredPasswordComplexity(@PasswordComplexity int passwordComplexity) {
	if (mService == null) {		if (mService == null) {
	@@ -5880,6 +5899,7 @@ public class DevicePolicyManager {
	* owner.		* owner.
	*/		*/
	@PasswordComplexity		@PasswordComplexity
			@SupportsCoexistence
	@RequiresPermission(value = MANAGE_DEVICE_POLICY_LOCK_CREDENTIALS, conditional = true)		@RequiresPermission(value = MANAGE_DEVICE_POLICY_LOCK_CREDENTIALS, conditional = true)
	public int getRequiredPasswordComplexity() {		public int getRequiredPasswordComplexity() {
	if (mService == null) {		if (mService == null) {

core/java/android/app/admin/flags/flags.aconfig

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -327,6 +327,16 @@ flag {
	}		}
	}		}

			flag {
			name: "unmanaged_mode_migration"
			namespace: "enterprise"
			description: "Migrate APIs for unmanaged mode"
			bug: "335624297"
			metadata {
			purpose: PURPOSE_BUGFIX
			}
			}

	flag {		flag {
	name: "headless_single_user_fixes"		name: "headless_single_user_fixes"
	namespace: "enterprise"		namespace: "enterprise"

packages/SystemUI/res/drawable/hearing_devices_preset_spinner_background.xml

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -30,8 +30,8 @@
	android:end="20dp"		android:end="20dp"
	android:gravity="end\|center_vertical">		android:gravity="end\|center_vertical">
	<vector		<vector
	android:width="@dimen/screenrecord_spinner_arrow_size"		android:width="@dimen/hearing_devices_preset_spinner_arrow_size"
	android:height="@dimen/screenrecord_spinner_arrow_size"		android:height="@dimen/hearing_devices_preset_spinner_arrow_size"
	android:viewportWidth="24"		android:viewportWidth="24"
	android:viewportHeight="24"		android:viewportHeight="24"
	android:tint="?androidprv:attr/colorControlNormal">		android:tint="?androidprv:attr/colorControlNormal">

packages/SystemUI/res/layout/hearing_devices_preset_dropdown_item.xml

0 → 100644

+25 −0

Original line number	Original line	Diff line number	Diff line
			<!--
			Copyright (C) 2024 The Android Open Source Project

			Licensed under the Apache License, Version 2.0 (the "License");
			you may not use this file except in compliance with the License.
			You may obtain a copy of the License at

			http://www.apache.org/licenses/LICENSE-2.0

			Unless required by applicable law or agreed to in writing, software
			distributed under the License is distributed on an "AS IS" BASIS,
			WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			See the License for the specific language governing permissions and
			limitations under the License.
			-->

			<TextView xmlns:android="http://schemas.android.com/apk/res/android"
			android:id="@+id/hearing_devices_preset_option_text"
			style="?android:attr/spinnerDropDownItemStyle"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:minHeight="@dimen/hearing_devices_preset_spinner_height"
			android:paddingStart="@dimen/hearing_devices_preset_spinner_text_padding_start"
			android:gravity="center_vertical"
			android:ellipsize="end" />
			No newline at end of file

packages/SystemUI/res/layout/hearing_devices_preset_spinner_selected.xml

0 → 100644

+46 −0

Original line number	Original line	Diff line number	Diff line
			<!--
			Copyright (C) 2024 The Android Open Source Project

			Licensed under the Apache License, Version 2.0 (the "License");
			you may not use this file except in compliance with the License.
			You may obtain a copy of the License at

			http://www.apache.org/licenses/LICENSE-2.0

			Unless required by applicable law or agreed to in writing, software
			distributed under the License is distributed on an "AS IS" BASIS,
			WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			See the License for the specific language governing permissions and
			limitations under the License.
			-->

			<LinearLayout
			xmlns:android="http://schemas.android.com/apk/res/android"
			android:layout_width="match_parent"
			android:layout_height="wrap_content"
			android:minHeight="@dimen/hearing_devices_preset_spinner_height"
			android:paddingStart="@dimen/hearing_devices_preset_spinner_text_padding_start"
			android:paddingTop="@dimen/hearing_devices_preset_spinner_text_padding_vertical"
			android:paddingBottom="@dimen/hearing_devices_preset_spinner_text_padding_vertical"
			android:orientation="vertical">
			<TextView
			android:layout_width="match_parent"
			android:layout_height="0dp"
			android:textAppearance="@style/TextAppearance.Dialog.Title"
			android:lineSpacingExtra="6dp"
			android:text="@string/hearing_devices_preset_label"
			android:fontFamily="@*android:string/config_headlineFontFamilyMedium"
			android:textSize="14sp"
			android:gravity="center_vertical"
			android:layout_weight="1" />
			<TextView
			android:id="@+id/hearing_devices_preset_option_text"
			android:layout_width="match_parent"
			android:layout_height="0dp"
			android:textAppearance="@style/TextAppearance.Dialog.Body"
			android:lineSpacingExtra="6dp"
			android:gravity="center_vertical"
			android:ellipsize="end"
			android:maxLines="1"
			android:layout_weight="1" />
			</LinearLayout>
			No newline at end of file