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

Commit 5287189f authored by Biswarup Pal's avatar Biswarup Pal
Browse files

Use correct flag check in SettingsProvider 

Test: atest SettingsProviderTest
Bug: 371801645
Flag: android.companion.virtualdevice.flags.device_aware_settings_override
Change-Id: Ib30b87744cf6fb38fc4325564770436c2ba2965f
parent 5b163209

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

+1 −1
Original line number Diff line number Diff line
@@ -3190,7 +3190,7 @@ public class SettingsProvider extends ContentProvider { 
    }



    private int getDeviceId() {

        return android.permission.flags.Flags.deviceAwarePermissionApisEnabled()

        return android.companion.virtualdevice.flags.Flags.deviceAwareSettingsOverride()

                && canUidAccessDeviceAwareSettings(Binder.getCallingUid())

                ? getCallingDeviceId() : Context.DEVICE_ID_DEFAULT;

    }