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

Commit 574c725a authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use correct flag check in SettingsProvider" into main

parents 7ca08a0c 5287189f

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;

    }