Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Simon Wingrove
2023-03-08 08:45:50 +00:00
committed by Android (Google) Code Review
parent 6bed003baa d16c8f3e13
commit df8c1f6495
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/app/AppOpsManager.java
View File

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