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

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

Revert "Do not use DeviceConfig.getAllProperties()." 

This reverts commit 1c7918d7.

Reason for revert: creates a bug in device_config list output

Change-Id: I31b51695c49f615d9ce7a782096926d5688e9bea
parent 1c7918d7

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

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


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

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

        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);

        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));

            }

        } catch (RemoteException e) {

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

        }



        return allFlags;

      }