commit e94b365d41c645724e6d272d39976ba23e463f6b
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Sep 26 23:42:24 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Sep 26 23:42:24 2024 +0000
tree 5f908560c57dbaa740a4268c7cfbe07175aba66f
parent a0811c0e93b9ec1ad1874a18789ea0dd5d0508ee
parent 47f8c0dfcebf085adfad63c7ea530aae01fd64d7

Merge "Ignore null action in AlarmManagerService$UninstallReceiver." into main am: cd682f630c am: 47f8c0dfce

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3275932

Change-Id: If02e8746c312282acc95e5045085ba771255ec3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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 0f3b1c3..033da2d 100644
--- a/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java
+++ b/apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java
@@ -4944,10 +4944,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) {