Merge cherrypicks of ['googleplex-android-review.googlesource.com/26514828',... (bb264849) · Commits · e / os / android_frameworks_base

core/java/android/hardware/devicestate/DeviceState.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -543,11 +543,13 @@ public final class DeviceState {
		int identifier = source.readInt();
		String name = source.readString8();
		ArraySet<@DeviceStateProperties Integer> systemProperties = new ArraySet<>();
		for (int i = 0; i < source.readInt(); i++) {
		int systemPropertySize = source.readInt();
		for (int i = 0; i < systemPropertySize; i++) {
		systemProperties.add(source.readInt());
		}
		ArraySet<@DeviceStateProperties Integer> physicalProperties = new ArraySet<>();
		for (int j = 0; j < source.readInt(); j++) {
		int physicalPropertySize = source.readInt();
		for (int j = 0; j < physicalPropertySize; j++) {
		physicalProperties.add(source.readInt());
		}
		return new DeviceState.Configuration(identifier, name, systemProperties,

core/tests/devicestatetests/src/android/hardware/devicestate/DeviceStateInfoTest.java

+24 −3

Original line number	Diff line number	Diff line
		@@ -16,6 +16,12 @@

		package android.hardware.devicestate;

		import static android.hardware.devicestate.DeviceState.PROPERTY_FOLDABLE_DISPLAY_CONFIGURATION_INNER_PRIMARY;
		import static android.hardware.devicestate.DeviceState.PROPERTY_FOLDABLE_DISPLAY_CONFIGURATION_OUTER_PRIMARY;
		import static android.hardware.devicestate.DeviceState.PROPERTY_FOLDABLE_HARDWARE_CONFIGURATION_FOLD_IN_CLOSED;
		import static android.hardware.devicestate.DeviceState.PROPERTY_FOLDABLE_HARDWARE_CONFIGURATION_FOLD_IN_HALF_OPEN;
		import static android.hardware.devicestate.DeviceState.PROPERTY_POLICY_CANCEL_OVERRIDE_REQUESTS;

		import static junit.framework.Assert.assertEquals;
		import static junit.framework.Assert.assertNotNull;

		@@ -33,6 +39,7 @@ import org.junit.runner.RunWith;
		import org.junit.runners.JUnit4;

		import java.util.List;
		import java.util.Set;

		/**
		* Unit tests for {@link DeviceStateInfo}.
		@@ -44,11 +51,25 @@ import java.util.List;
		public final class DeviceStateInfoTest {

		private static final DeviceState DEVICE_STATE_0 = new DeviceState(
		new DeviceState.Configuration.Builder(0, "STATE_0").build());
		new DeviceState.Configuration.Builder(0, "STATE_0")
		.setSystemProperties(
		Set.of(PROPERTY_POLICY_CANCEL_OVERRIDE_REQUESTS,
		PROPERTY_FOLDABLE_DISPLAY_CONFIGURATION_OUTER_PRIMARY))
		.setPhysicalProperties(
		Set.of(PROPERTY_FOLDABLE_HARDWARE_CONFIGURATION_FOLD_IN_CLOSED))
		.build());
		private static final DeviceState DEVICE_STATE_1 = new DeviceState(
		new DeviceState.Configuration.Builder(1, "STATE_1").build());
		new DeviceState.Configuration.Builder(1, "STATE_1")
		.setSystemProperties(
		Set.of(PROPERTY_FOLDABLE_DISPLAY_CONFIGURATION_INNER_PRIMARY))
		.setPhysicalProperties(
		Set.of(PROPERTY_FOLDABLE_HARDWARE_CONFIGURATION_FOLD_IN_HALF_OPEN))
		.build());
		private static final DeviceState DEVICE_STATE_2 = new DeviceState(
		new DeviceState.Configuration.Builder(2, "STATE_2").build());
		new DeviceState.Configuration.Builder(2, "STATE_2")
		.setSystemProperties(
		Set.of(PROPERTY_FOLDABLE_DISPLAY_CONFIGURATION_INNER_PRIMARY))
		.build());

		@Test
		public void create() {

core/tests/devicestatetests/src/android/hardware/devicestate/DeviceStateTest.java

+18 −0

Original line number	Diff line number	Diff line
		@@ -93,4 +93,22 @@ public final class DeviceStateTest {

		Assert.assertEquals(originalState, new DeviceState(stateConfiguration));
		}

		@Test
		public void writeToParcel_noPhysicalProperties() {
		final DeviceState originalState = new DeviceState(
		new DeviceState.Configuration.Builder(0, "TEST_STATE")
		.setSystemProperties(Set.of(PROPERTY_POLICY_CANCEL_OVERRIDE_REQUESTS,
		PROPERTY_POLICY_AVAILABLE_FOR_APP_REQUEST))
		.build());

		final Parcel parcel = Parcel.obtain();
		originalState.getConfiguration().writeToParcel(parcel, 0 /* flags */);
		parcel.setDataPosition(0);

		final DeviceState.Configuration stateConfiguration =
		DeviceState.Configuration.CREATOR.createFromParcel(parcel);

		Assert.assertEquals(originalState, new DeviceState(stateConfiguration));
		}
		}

packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java

+19 −6

Original line number	Diff line number	Diff line
		@@ -707,23 +707,36 @@ final class SettingsState {
		// Update/add new keys
		for (String key : keyValues.keySet()) {
		String value = keyValues.get(key);

		// Rename key if it's an aconfig flag.
		String flagName = key;
		if (Flags.stageAllAconfigFlags() && isConfigSettingsKey(mKey)) {
		int slashIndex = flagName.indexOf("/");
		boolean stageFlag = slashIndex > 0 && slashIndex != flagName.length();
		boolean isAconfig = trunkFlagMap != null && trunkFlagMap.containsKey(flagName);
		if (stageFlag && isAconfig) {
		String flagWithoutNamespace = flagName.substring(slashIndex + 1);
		flagName = "staged/" + namespace + "*" + flagWithoutNamespace;
		}
		}

		String oldValue = null;
		Setting state = mSettings.get(key);
		Setting state = mSettings.get(flagName);
		if (state == null) {
		state = new Setting(key, value, false, packageName, null);
		mSettings.put(key, state);
		changedKeys.add(key); // key was added
		state = new Setting(flagName, value, false, packageName, null);
		mSettings.put(flagName, state);
		changedKeys.add(flagName); // key was added
		} else if (state.value != value) {
		oldValue = state.value;
		state.update(value, false, packageName, null, true,
		/* overrideableByRestore */ false);
		changedKeys.add(key); // key was updated
		changedKeys.add(flagName); // key was updated
		} else {
		// this key/value already exists, no change and no logging necessary
		continue;
		}

		FrameworkStatsLog.write(FrameworkStatsLog.SETTING_CHANGED, key, value, state.value,
		FrameworkStatsLog.write(FrameworkStatsLog.SETTING_CHANGED, flagName, value, state.value,
		oldValue, /* tag / null, / make default */ false,
		getUserIdFromKey(mKey), FrameworkStatsLog.SETTING_CHANGED__REASON__UPDATED);
		addHistoricalOperationLocked(HISTORICAL_OPERATION_UPDATE, state);

packages/SettingsProvider/test/src/com/android/providers/settings/SettingsStateTest.java

+45 −0

Original line number	Diff line number	Diff line
		@@ -739,6 +739,51 @@ public class SettingsStateTest {
		}
		}

		@Test
		@RequiresFlagsEnabled(Flags.FLAG_STAGE_ALL_ACONFIG_FLAGS)
		public void testSetSettingsLockedStagesAconfigFlags() throws Exception {
		int configKey = SettingsState.makeKey(SettingsState.SETTINGS_TYPE_CONFIG, 0);

		SettingsState settingsState = new SettingsState(
		InstrumentationRegistry.getContext(), mLock, mSettingsFile, configKey,
		SettingsState.MAX_BYTES_PER_APP_PACKAGE_UNLIMITED, Looper.getMainLooper());

		String prefix = "test_namespace";
		String packageName = "com.android.flags";
		Map<String, String> keyValues =
		Map.of("test_namespace/com.android.flags.flag3", "true");

		parsed_flags flags = parsed_flags
		.newBuilder()
		.addParsedFlag(parsed_flag
		.newBuilder()
		.setPackage(packageName)
		.setName("flag3")
		.setNamespace(prefix)
		.setDescription("test flag")
		.addBug("12345678")
		.setState(Aconfig.flag_state.DISABLED)
		.setPermission(Aconfig.flag_permission.READ_WRITE))
		.build();

		synchronized (mLock) {
		settingsState.loadAconfigDefaultValues(
		flags.toByteArray(), settingsState.getAconfigDefaultValues());
		List<String> updates =
		settingsState.setSettingsLocked("test_namespace/", keyValues, packageName);
		assertEquals(1, updates.size());
		assertEquals(updates.get(0), "staged/test_namespace*com.android.flags.flag3");

		SettingsState.Setting s;

		s = settingsState.getSettingLocked("test_namespace/com.android.flags.flag3");
		assertNull(s.getValue());

		s = settingsState.getSettingLocked("staged/test_namespace*com.android.flags.flag3");
		assertEquals("true", s.getValue());
		}
		}

		@Test
		public void testsetSettingsLockedKeepTrunkDefault() throws Exception {
		final PrintStream os = new PrintStream(new FileOutputStream(mSettingsFile));