Merge "[DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting" into qt-dev

2022-10-05 00:12:20 +00:00
parent 8a2baf4e16 4d13148a3f
commit 4727daddff
1 changed files with 3 additions and 0 deletions
--- 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) {