commit 188e0810aa58c25d83aeed91bd6637b60b7f93c6
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Sat Nov 02 18:41:14 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Nov 02 18:41:14 2024 +0000
tree cab8b3e84d4443b806dc31f8cd43eae0dd1632b1
parent 5991319aa29214ad5f5b395e42088763769e83ba
parent 4407d43c694b3717f4f7d0ec222b002e5909ecaf

Merge "Ignore null action in ActivityManagerService." into main

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

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index d11abf8..4a4a1b4 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -5239,6 +5239,11 @@
         mContext.registerReceiver(new BroadcastReceiver() {
             @Override
             public void onReceive(Context context, Intent intent) {
+                final String action = intent.getAction();
+                if (action == null) {
+                    return;
+                }
+
                 String[] pkgs = intent.getStringArrayExtra(Intent.EXTRA_PACKAGES);
                 if (pkgs != null) {
                     for (String pkg : pkgs) {