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

Commit df8c1f64 authored by Simon Wingrove's avatar Simon Wingrove Committed by Android (Google) Code Review
Browse files

Merge "Put development flag behind IS_ENG check" into udc-dev

parents 6bed003b d16c8f3e

core/java/android/app/AppOpsManager.java

+10 −4
Original line number Diff line number Diff line
@@ -7200,10 +7200,16 @@ public class AppOpsManager { 
        if (mContext != null) {

            final PackageManager pm = mContext.getPackageManager();

            try {

                if (pm != null && pm.checkPermission(Manifest.permission.READ_DEVICE_CONFIG,

                        mContext.getPackageName()) == PackageManager.PERMISSION_GRANTED) {

                    DeviceConfig.addOnPropertiesChangedListener(DeviceConfig.NAMESPACE_PRIVACY,

                            mContext.getMainExecutor(), properties -> {

                if (Build.IS_ENG

                        && pm != null

                        && pm.checkPermission(

                                        Manifest.permission.READ_DEVICE_CONFIG,

                                        mContext.getPackageName())

                                == PackageManager.PERMISSION_GRANTED) {

                    DeviceConfig.addOnPropertiesChangedListener(

                            DeviceConfig.NAMESPACE_PRIVACY,

                            mContext.getMainExecutor(),

                            properties -> {

                                if (properties.getKeyset().contains(FULL_LOG)) {

                                    sFullLog = properties.getBoolean(FULL_LOG, false);

                                }