diff options
| -rw-r--r-- | services/core/java/com/android/server/compat/PlatformCompat.java | 22 | ||||
| -rw-r--r-- | services/core/java/com/android/server/pm/AppsFilter.java | 3 |
2 files changed, 16 insertions, 9 deletions
diff --git a/services/core/java/com/android/server/compat/PlatformCompat.java b/services/core/java/com/android/server/compat/PlatformCompat.java index 2c19a2d2855c..77d5411f5f7f 100644 --- a/services/core/java/com/android/server/compat/PlatformCompat.java +++ b/services/core/java/com/android/server/compat/PlatformCompat.java @@ -107,17 +107,23 @@ public class PlatformCompat extends IPlatformCompat.Stub { } /** - * Internal version of the above method. Does not perform costly permission check. + * Internal version of the above method, without logging. Does not perform costly permission + * check. + * TODO(b/167551701): Remove this method and add 'loggability' as a changeid property. + */ + public boolean isChangeEnabledInternalNoLogging(long changeId, ApplicationInfo appInfo) { + return mCompatConfig.isChangeEnabled(changeId, appInfo); + } + + /** + * Internal version of {@link #isChangeEnabled(long, ApplicationInfo)}. Does not perform costly + * permission check. */ public boolean isChangeEnabledInternal(long changeId, ApplicationInfo appInfo) { - if (mCompatConfig.isChangeEnabled(changeId, appInfo)) { - reportChange(changeId, appInfo.uid, - ChangeReporter.STATE_ENABLED); - return true; - } + boolean value = isChangeEnabledInternalNoLogging(changeId, appInfo); reportChange(changeId, appInfo.uid, - ChangeReporter.STATE_DISABLED); - return false; + value ? ChangeReporter.STATE_ENABLED : ChangeReporter.STATE_DISABLED); + return value; } @Override diff --git a/services/core/java/com/android/server/pm/AppsFilter.java b/services/core/java/com/android/server/pm/AppsFilter.java index 069a00f03a1d..f221802768da 100644 --- a/services/core/java/com/android/server/pm/AppsFilter.java +++ b/services/core/java/com/android/server/pm/AppsFilter.java @@ -290,7 +290,8 @@ public class AppsFilter { private void updateEnabledState(@NonNull AndroidPackage pkg) { // TODO(b/135203078): Do not use toAppInfo - final boolean enabled = mInjector.getCompatibility().isChangeEnabledInternal( + // TODO(b/167551701): Make changeId non-logging + final boolean enabled = mInjector.getCompatibility().isChangeEnabledInternalNoLogging( PackageManager.FILTER_APPLICATION_QUERY, pkg.toAppInfoWithoutState()); if (enabled) { mDisabledPackages.remove(pkg.getPackageName()); |