summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRhed Jao <rhedjao@google.com>2022-10-05 00:43:40 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-10-05 00:43:40 +0000
commitcd6e9585b90f0731253484fc53dcff1dd7bf9554 (patch)
tree2c3882b5b4eed454a3632b8094d1e67e58189855
parentde5113eebd2496591947884b6abc489965940394 (diff)
parent4d13148a3fa5f6bc1b7038fae7d1f1adda163a9f (diff)
downloadbase-cd6e9585b90f0731253484fc53dcff1dd7bf9554.tar.gz
[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting am: 4d13148a3f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20061305 Change-Id: I717dc0210b91048ac79afb2ef0d22dc9a266802f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/core/java/com/android/server/pm/PackageManagerService.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 0472985affaa..a856697a0e10 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -21545,6 +21545,9 @@ public class PackageManagerService extends IPackageManager.Stub
} else {
Slog.w(TAG, "Failed setComponentEnabledSetting: component class "
+ className + " does not exist in " + packageName);
+ // Safetynet logging for b/240936919
+ EventLog.writeEvent(0x534e4554, "240936919", callingUid);
+ return;
}
}
switch (newState) {