Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6bd8cf2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove bulk compare code" into main am: 299bfc58 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3452889



Change-Id: Icf3b1ab9d48cfe4fb2fb691ff7c7cb7a5a3d7816
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bd62dab2 299bfc58

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

+0 −64
Original line number Diff line number Diff line
@@ -408,72 +408,8 @@ final class SettingsState { 
                        Slog.w(LOG_TAG, "Bulk sync request to acongid failed.");

                    }

                }

                // TOBO(b/312444587): remove the comparison logic after Test Mission 2.

                if (requests == null) {

                    Map<String, AconfigdFlagInfo> aconfigdFlagMap =

                            AconfigdJavaUtils.listFlagsValueInNewStorage(localSocket);

                    compareFlagValueInNewStorage(

                            mAconfigDefaultFlags,

                            aconfigdFlagMap);

                }

            }

        }

    }



    // TOBO(b/312444587): remove the comparison logic after Test Mission 2.

    public int compareFlagValueInNewStorage(

            Map<String, AconfigdFlagInfo> defaultFlagMap,

            Map<String, AconfigdFlagInfo> aconfigdFlagMap) {



        // Get all defaults from the default map. The mSettings may not contain

        // all flags, since it only contains updated flags.

        int diffNum = 0;

        for (Map.Entry<String, AconfigdFlagInfo> entry : defaultFlagMap.entrySet()) {

            String key = entry.getKey();

            AconfigdFlagInfo flag = entry.getValue();



            AconfigdFlagInfo aconfigdFlag = aconfigdFlagMap.get(key);

            if (aconfigdFlag == null) {

                Slog.w(LOG_TAG, String.format("Flag %s is missing from aconfigd", key));

                diffNum++;

                continue;

            }

            String diff = flag.dumpDiff(aconfigdFlag);

            if (!diff.isEmpty()) {

                Slog.w(

                        LOG_TAG,

                        String.format(

                                "Flag %s is different in Settings and aconfig: %s", key, diff));

                diffNum++;

            }

        }



        for (String key : aconfigdFlagMap.keySet()) {

            if (defaultFlagMap.containsKey(key)) continue;

            Slog.w(LOG_TAG, String.format("Flag %s is missing from Settings", key));

            diffNum++;

        }



        String compareMarkerName = "aconfigd_marker/compare_diff_num";

        synchronized (mLock) {

            Setting markerSetting = mSettings.get(compareMarkerName);

            if (markerSetting == null) {

                markerSetting =

                        new Setting(

                                compareMarkerName,

                                String.valueOf(diffNum),

                                false,

                                "aconfig",

                                "aconfig");

                mSettings.put(compareMarkerName, markerSetting);

            }

            markerSetting.value = String.valueOf(diffNum);

        }



        if (diffNum == 0) {

            Slog.w(LOG_TAG, "Settings and new storage have same flags.");

        }

        return diffNum;

    }



    @GuardedBy("mLock")

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

+0 −80
Original line number Diff line number Diff line
@@ -1302,84 +1302,4 @@ public class SettingsStateTest { 
        assertFalse(flag3.getHasServerOverride());

        assertFalse(flag3.getHasLocalOverride());

    }



    @Test

    public void testCompareFlagValueInNewStorage() {

                int configKey = SettingsState.makeKey(SettingsState.SETTINGS_TYPE_CONFIG, 0);

        Object lock = new Object();

        SettingsState settingsState =

                new SettingsState(

                        InstrumentationRegistry.getContext(),

                        lock,

                        mSettingsFile,

                        configKey,

                        SettingsState.MAX_BYTES_PER_APP_PACKAGE_UNLIMITED,

                        Looper.getMainLooper());



        AconfigdFlagInfo defaultFlag1 =

                AconfigdFlagInfo.newBuilder()

                        .setPackageName("com.android.flags")

                        .setFlagName("flag1")

                        .setDefaultFlagValue("false")

                        .setServerFlagValue("true")

                        .setHasServerOverride(true)

                        .setIsReadWrite(true)

                        .build();



        AconfigdFlagInfo expectedFlag1 =

                AconfigdFlagInfo.newBuilder()

                        .setPackageName("com.android.flags")

                        .setFlagName("flag1")

                        .setServerFlagValue("true")

                        .setDefaultFlagValue("false")

                        .setHasServerOverride(true)

                        .setIsReadWrite(true)

                        .build();



        Map<String, AconfigdFlagInfo> aconfigdMap = new HashMap<>();

        Map<String, AconfigdFlagInfo> defaultMap = new HashMap<>();



        defaultMap.put("com.android.flags.flag1", defaultFlag1);

        aconfigdMap.put("com.android.flags.flag1", expectedFlag1);



        int ret = settingsState.compareFlagValueInNewStorage(defaultMap, aconfigdMap);

        assertEquals(0, ret);



        String value =

                settingsState.getSettingLocked("aconfigd_marker/compare_diff_num").getValue();

        assertEquals("0", value);



        AconfigdFlagInfo defaultFlag2 =

                AconfigdFlagInfo.newBuilder()

                        .setPackageName("com.android.flags")

                        .setFlagName("flag2")

                        .setDefaultFlagValue("false")

                        .build();

        defaultMap.put("com.android.flags.flag2", defaultFlag2);



        ret = settingsState.compareFlagValueInNewStorage(defaultMap, aconfigdMap);

        // missing from new storage

        assertEquals(1, ret);

        value =

                settingsState.getSettingLocked("aconfigd_marker/compare_diff_num").getValue();

        assertEquals("1", value);



        AconfigdFlagInfo expectedFlag2 =

        AconfigdFlagInfo.newBuilder()

                .setPackageName("com.android.flags")

                .setFlagName("flag2")

                .setServerFlagValue("true")

                .setLocalFlagValue("true")

                .setDefaultFlagValue("false")

                .setHasServerOverride(true)

                .setHasLocalOverride(true)

                .build();

        aconfigdMap.put("com.android.flags.flag2", expectedFlag2);

        ret = settingsState.compareFlagValueInNewStorage(defaultMap, aconfigdMap);

        // skip the server and local value comparison when the flag is read_only

        assertEquals(0, ret);

        value =

                settingsState.getSettingLocked("aconfigd_marker/compare_diff_num").getValue();

        assertEquals("0", value);

    }

}