commit cd682f630c70f3d3424a3ad8d7ffb0634554a821
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Sep 26 22:57:25 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 26 22:57:25 2024 +0000
tree 82b3aee2119e7621cd9053ec84e47816125eb915
parent 6f7665370b368b3f4164cdce501ae224b3351c9b
parent 93247bb899e342d0f0ceeaa23133c91090d94526

Merge "Ignore null action in AlarmManagerService$UninstallReceiver." into main

apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java

diff --git a/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java b/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java
index b982d12..d1f1ac3 100644
--- a/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java
+++ b/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java
@@ -4935,10 +4935,14 @@
 
         @Override
         public void onReceive(Context context, Intent intent) {
+            final String action = intent.getAction();
+            if (action == null) {
+                return;
+            }
             final int uid = intent.getIntExtra(Intent.EXTRA_UID, -1);
             synchronized (mLock) {
                 String pkgList[] = null;
-                switch (intent.getAction()) {
+                switch (action) {
                     case Intent.ACTION_QUERY_PACKAGE_RESTART:
                         pkgList = intent.getStringArrayExtra(Intent.EXTRA_PACKAGES);
                         for (String packageName : pkgList) {