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

Commit 87ec5838 authored by Ted Bauer's avatar Ted Bauer Committed by Android (Google) Code Review
Browse files

Revert "fix: show overrides in device_config list" 

This reverts commit 985053d4.

Reason for revert: creates a bug, local override is no longer shown in device_config list output

Change-Id: I3d07f7dd5ba98d623c3881a0e816c31aff8cad41
parent 985053d4

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

+14 −5
Original line number Diff line number Diff line
@@ -189,13 +189,22 @@ public final class DeviceConfigService extends Binder { 


      public static HashMap<String, String> getAllFlags(IContentProvider provider) {

        HashMap<String, String> allFlags = new HashMap<String, String>();

        for (DeviceConfig.Properties properties : DeviceConfig.getAllProperties()) {

            List<String> keys = new ArrayList<>(properties.getKeyset());

            for (String flagName : properties.getKeyset()) {

                String fullName = properties.getNamespace() + "/" + flagName;

                allFlags.put(fullName, properties.getString(flagName, null));

        try {

            Bundle args = new Bundle();

            args.putInt(Settings.CALL_METHOD_USER_KEY,

                ActivityManager.getService().getCurrentUser().id);

            Bundle b = provider.call(new AttributionSource(Process.myUid(),

                    resolveCallingPackage(), null), Settings.AUTHORITY,

                    Settings.CALL_METHOD_LIST_CONFIG, null, args);

            if (b != null) {

                Map<String, String> flagsToValues =

                    (HashMap) b.getSerializable(Settings.NameValueTable.VALUE);

                allFlags.putAll(flagsToValues);

            }

        } catch (RemoteException e) {

            throw new RuntimeException("Failed in IPC", e);

        }



        return allFlags;

      }