commit 01d219595015cd7c320883f7b0b6d832bae752f7
author gang.huang <gang.huang@unisoc.com> Wed Oct 30 11:21:32 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Oct 30 11:21:32 2024 +0000
tree 78413606f06e36172b459f8556bcb565d5e73dca
parent a7c4d72fdc1f059f77c51993cb9a55b5c2c1664e
parent 8caebe609a2736152537e33129c0721635c00f0e

Ignore null action in VirtualizationSystemService$Receiver. am: 4d965f76a4 am: 8caebe609a

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3325613

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

libs/service-virtualization/src/com/android/system/virtualmachine/VirtualizationSystemService.java

diff --git a/libs/service-virtualization/src/com/android/system/virtualmachine/VirtualizationSystemService.java b/libs/service-virtualization/src/com/android/system/virtualmachine/VirtualizationSystemService.java
index 998389b..afa286c 100644
--- a/libs/service-virtualization/src/com/android/system/virtualmachine/VirtualizationSystemService.java
+++ b/libs/service-virtualization/src/com/android/system/virtualmachine/VirtualizationSystemService.java
@@ -120,7 +120,12 @@
 
         @Override
         public void onReceive(Context context, Intent intent) {
-            switch (intent.getAction()) {
+            final String action = intent.getAction();
+            if (action == null) {
+                return;
+            }
+
+            switch (action) {
                 case Intent.ACTION_USER_REMOVED:
                     onUserRemoved(intent);
                     break;
@@ -128,7 +133,7 @@
                     onPackageRemoved(intent);
                     break;
                 default:
-                    Log.e(TAG, "received unexpected intent: " + intent.getAction());
+                    Log.e(TAG, "received unexpected intent: " + intent);
                     break;
             }
         }