commit cd6e9585b90f0731253484fc53dcff1dd7bf9554
author Rhed Jao <rhedjao@google.com> Wed Oct 05 00:43:40 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Oct 05 00:43:40 2022 +0000
tree 2c3882b5b4eed454a3632b8094d1e67e58189855
parent de5113eebd2496591947884b6abc489965940394
parent 4d13148a3fa5f6bc1b7038fae7d1f1adda163a9f

[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>

services/core/java/com/android/server/pm/PackageManagerService.java

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 0472985..a856697 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 @@
                     } 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) {