summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-10-29 18:52:51 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-10-29 18:52:51 +0000
commitfcf824954b91edeba013bb46f3e2b95ef9975dd3 (patch)
treeab7ed28c594e834b36794a9f125a1e7858bf5453
parent4a04f694bfc9eade9b2882b10ef4e157a8616c40 (diff)
parent243116677701abcdc70fea6d42d73c95ca051502 (diff)
Merge "Ignore null action in AppWidgetServiceImpl." into main am: cf4fd8c4b5 am: 2431166777
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3322499 Change-Id: Icd825c3303b929170d8bd327cc1e6f46cc94c77e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
index f6ac706c4985..f9abd8558ca8 100644
--- a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
+++ b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java
@@ -237,6 +237,10 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku
@Override
public void onReceive(Context context, Intent intent) {
final String action = intent.getAction();
+ if (action == null) {
+ return;
+ }
+
final int userId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, UserHandle.USER_NULL);
if (DEBUG) {