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

Merge "Add null checks for ConcurrentHashmap queries" into sc-v2-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-09-20 15:34:08 +00:00
committed by Android (Google) Code Review
parent abd63e9310 227595f050
commit 66889d3212
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/compat/CompatChange.java
View File

@@ -183,14 +183,15 @@ public final class CompatChange extends CompatibilityChangeInfo {
*/ */
synchronized boolean recheckOverride(String packageName, OverrideAllowedState allowedState, synchronized boolean recheckOverride(String packageName, OverrideAllowedState allowedState,
@Nullable Long versionCode) { @Nullable Long versionCode) {
if (packageName == null) {
return false;
}
boolean allowed = (allowedState.state == OverrideAllowedState.ALLOWED); boolean allowed = (allowedState.state == OverrideAllowedState.ALLOWED);
// If the app is not installed or no longer has raw overrides, evaluate to false // If the app is not installed or no longer has raw overrides, evaluate to false
if (versionCode == null || !mRawOverrides.containsKey(packageName) || !allowed) { if (versionCode == null || !mRawOverrides.containsKey(packageName) || !allowed) {
removePackageOverrideInternal(packageName); removePackageOverrideInternal(packageName);
return false; return false;
} }
// Evaluate the override based on its version // Evaluate the override based on its version
int overrideValue = mRawOverrides.get(packageName).evaluate(versionCode); int overrideValue = mRawOverrides.get(packageName).evaluate(versionCode);
switch (overrideValue) { switch (overrideValue) {
@@ -266,6 +267,9 @@ public final class CompatChange extends CompatibilityChangeInfo {
* @return {@code true} if the change should be enabled for the package. * @return {@code true} if the change should be enabled for the package.
*/ */
boolean willBeEnabled(String packageName) { boolean willBeEnabled(String packageName) {
if (packageName == null) {
return defaultValue();
}
final PackageOverride override = mRawOverrides.get(packageName); final PackageOverride override = mRawOverrides.get(packageName);
if (override != null) { if (override != null) {
switch (override.evaluateForAllVersions()) { switch (override.evaluateForAllVersions()) {