diff options
| author | 2024-09-26 23:10:42 +0000 | |
|---|---|---|
| committer | 2024-09-26 23:10:42 +0000 | |
| commit | 47f8c0dfcebf085adfad63c7ea530aae01fd64d7 (patch) | |
| tree | 26f39c5ef42a859257dbaf8d8cabe2a3d3a9ef41 | |
| parent | 0d02bf7714d1fa2116be6494a9b0105374a760bf (diff) | |
| parent | cd682f630c70f3d3424a3ad8d7ffb0634554a821 (diff) | |
Merge "Ignore null action in AlarmManagerService$UninstallReceiver." into main am: cd682f630c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3275932
Change-Id: Id1f6db3ff48fd974ae4b0d29f85bde1a773e2bbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java | 6 |
1 files changed, 5 insertions, 1 deletions
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 b982d1253e21..d1f1ac3c1c92 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 @@ public class AlarmManagerService extends SystemService { @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) { |