Merge "Cleanup two headless_single_user_* flags" into main (7d0d5d08) · Commits · e / os / android_frameworks_base

core/java/android/app/admin/DeviceAdminInfo.java

+4 −13

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@ package android.app.admin;

		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.app.admin.flags.Flags;
		import android.compat.annotation.UnsupportedAppUsage;
		import android.content.ComponentName;
		import android.content.Context;
		@@ -388,11 +387,8 @@ public final class DeviceAdminInfo implements Parcelable {
		}
		mSupportsTransferOwnership = true;
		} else if (tagName.equals("headless-system-user")) {
		String deviceOwnerModeStringValue = null;
		if (Flags.headlessSingleUserCompatibilityFix()) {
		deviceOwnerModeStringValue = parser.getAttributeValue(
		String deviceOwnerModeStringValue = parser.getAttributeValue(
		null, "headless-device-owner-mode");
		}
		if (deviceOwnerModeStringValue == null) {
		deviceOwnerModeStringValue =
		parser.getAttributeValue(null, "device-owner-mode");
		@@ -405,13 +401,8 @@ public final class DeviceAdminInfo implements Parcelable {
		} else if ("single_user".equalsIgnoreCase(deviceOwnerModeStringValue)) {
		mHeadlessDeviceOwnerMode = HEADLESS_DEVICE_OWNER_MODE_SINGLE_USER;
		} else {
		if (Flags.headlessSingleUserCompatibilityFix()) {
		Log.e(TAG, "Unknown headless-system-user mode: "
		+ deviceOwnerModeStringValue);
		} else {
		throw new XmlPullParserException(
		"headless-system-user mode must be valid");
		}
		}
		}
		}

+0 −20

Original line number	Diff line number	Diff line
		@@ -255,16 +255,6 @@ flag {
		bug: "319084618"
		}

		flag {
		name: "headless_single_user_bad_device_admin_state_fix"
		namespace: "enterprise"
		description: "Fix the bad state in DPMS caused by an earlier bug related to the headless single user change"
		bug: "332477138"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "onboarding_bugreport_storage_bug_fix"
		namespace: "enterprise"
		@@ -292,16 +282,6 @@ flag {
		bug: "175067666"
		}

		flag {
		name: "headless_single_user_compatibility_fix"
		namespace: "enterprise"
		description: "Fix for compatibility issue introduced from using single_user mode on pre-Android V builds"
		bug: "338050276"
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "headless_single_min_target_sdk"
		namespace: "enterprise"