commit 56b26cfc950a802aef8dcda6510a4e3c8176fbd1
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Oct 29 05:50:58 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 29 05:50:58 2024 +0000
tree f2bc4340067ceb75fd68ee9bc311ab62bfac0fd6
parent 06c052d9e79d9c544e10be0cae06700972b6f7e2
parent c0081e5add62948c2a817e260773960ffa2df7a8

Merge "Ignore null action in AppRestrictionController." into main

services/core/java/com/android/server/am/AppRestrictionController.java

diff --git a/services/core/java/com/android/server/am/AppRestrictionController.java b/services/core/java/com/android/server/am/AppRestrictionController.java
index 4c87e1c..c036605 100644
--- a/services/core/java/com/android/server/am/AppRestrictionController.java
+++ b/services/core/java/com/android/server/am/AppRestrictionController.java
@@ -373,7 +373,10 @@
         @Override
         public void onReceive(Context context, Intent intent) {
             final String action = intent.getAction();
-            switch (intent.getAction()) {
+            if (action == null) {
+                return;
+            }
+            switch (action) {
                 case Intent.ACTION_PACKAGE_ADDED: {
                     if (!intent.getBooleanExtra(Intent.EXTRA_REPLACING, false)) {
                         final int uid = intent.getIntExtra(Intent.EXTRA_UID, -1);