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

Merge "Re-order early return when targetPkg is null" into sc-dev am: 7a3193ae7a am: e41e3fe792

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15461803

Change-Id: I09699a0fd2df07ecf29d96aad5125722f542a7bf
This commit is contained in:
TreeHugger Robot
2021-08-05 17:29:52 +00:00
committed by Automerger Merge Worker
parent 36e0e2eeed e41e3fe792
commit 8db3ed417d
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
services/core/java/com/android/server/pm/AppsFilter.java
View File

@@ -1287,20 +1287,6 @@ public class AppsFilter implements Watchable, Snappable {
} }
} }
// This package isn't technically installed and won't be written to settings, so we can
// treat it as filtered until it's available again.
final AndroidPackage targetPkg = targetPkgSetting.pkg;
if (targetPkg == null) {
if (DEBUG_LOGGING) {
Slog.wtf(TAG, "shouldFilterApplication: " + "targetPkg is null");
}
return true;
}
if (targetPkg.isStaticSharedLibrary()) {
// not an app, this filtering takes place at a higher level
return false;
}
final String targetName = targetPkg.getPackageName();
if (DEBUG_TRACING) { if (DEBUG_TRACING) {
Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "getAppId"); Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "getAppId");
} }
@@ -1343,6 +1329,21 @@ public class AppsFilter implements Watchable, Snappable {
Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER); Trace.traceEnd(TRACE_TAG_PACKAGE_MANAGER);
} }
} }
// This package isn't technically installed and won't be written to settings, so we can
// treat it as filtered until it's available again.
final AndroidPackage targetPkg = targetPkgSetting.pkg;
if (targetPkg == null) {
if (DEBUG_LOGGING) {
Slog.wtf(TAG, "shouldFilterApplication: " + "targetPkg is null");
}
return true;
}
if (targetPkg.isStaticSharedLibrary()) {
// not an app, this filtering takes place at a higher level
return false;
}
try { try {
if (DEBUG_TRACING) { if (DEBUG_TRACING) {
Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "mForceQueryable"); Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "mForceQueryable");
@@ -1415,6 +1416,7 @@ public class AppsFilter implements Watchable, Snappable {
if (DEBUG_TRACING) { if (DEBUG_TRACING) {
Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "mOverlayReferenceMapper"); Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "mOverlayReferenceMapper");
} }
final String targetName = targetPkg.getPackageName();
if (callingSharedPkgSettings != null) { if (callingSharedPkgSettings != null) {
int size = callingSharedPkgSettings.size(); int size = callingSharedPkgSettings.size();
for (int index = 0; index < size; index++) { for (int index = 0; index < size; index++) {