summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRhed Jao <rhedjao@google.com>2022-10-05 00:12:20 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2022-10-05 00:12:20 +0000
commit4727daddffdcb0d6d1bdebf412650eafa934a456 (patch)
tree8416107af49b1615569441f3c5833b5cd28b882d
parent8a2baf4e16bc751c2fd4ff0e8219e8ffa4aeaae9 (diff)
parent4d13148a3fa5f6bc1b7038fae7d1f1adda163a9f (diff)
downloadbase-4727daddffdcb0d6d1bdebf412650eafa934a456.tar.gz
Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into qt-dev
-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 28f1d7900107..6b06de3da929 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -21485,6 +21485,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) {