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

Commit d16c8f3e authored by Simon Wingrove's avatar Simon Wingrove
Browse files

Put development flag behind IS_ENG check 

Per discussion, this flag was only ever needed for development
debugging.  Therefore for optimization (not having lots of apps register
an observer to DeviceConfig) and potentially reducing problems caused by
having multiple packages all reading from one namespace, put behind an
ENG build check

Test: manual
Bug: 265145724
Change-Id: Ia6f2ee781c431088cbb3417c1b6bac86cfce4c13
parent aa66f400

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

                                }