commit 61f8d76a12defc04cf43db36d7e53738bb78d229
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Nov 01 16:46:53 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Nov 01 16:46:53 2024 +0000
tree 00ffa84faf95dbfebef35c560213d68c94e6be93
parent 0b497fae7f4813e1e830f9199cad0e828a19052a
parent ddd102153cc313b7c2b78d3cc9c2f1d72d2ddf37

Merge "Ignore null action in WebViewUpdateService." into main am: 749f16456c am: ddd102153c

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

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

services/core/java/com/android/server/webkit/WebViewUpdateService.java

diff --git a/services/core/java/com/android/server/webkit/WebViewUpdateService.java b/services/core/java/com/android/server/webkit/WebViewUpdateService.java
index 744c3da6..e1fa884 100644
--- a/services/core/java/com/android/server/webkit/WebViewUpdateService.java
+++ b/services/core/java/com/android/server/webkit/WebViewUpdateService.java
@@ -78,8 +78,13 @@
         mWebViewUpdatedReceiver = new BroadcastReceiver() {
                 @Override
                 public void onReceive(Context context, Intent intent) {
+                    final String action = intent.getAction();
+                    if (action == null) {
+                        return;
+                    }
+
                     int userId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, UserHandle.USER_NULL);
-                    switch (intent.getAction()) {
+                    switch (action) {
                         case Intent.ACTION_PACKAGE_REMOVED:
                             // When a package is replaced we will receive two intents, one
                             // representing the removal of the old package and one representing the