Merge "Ignore null action in VcnManagementService$VcnBroadcastReceiver" into main

1 files changed, 3 insertions, 0 deletions

diff --git a/services/core/java/com/android/server/VcnManagementService.java b/services/core/java/com/android/server/VcnManagementService.java
index dc7749cb02ef..06e6c8b1ec53 100644
--- a/services/core/java/com/android/server/VcnManagementService.java
+++ b/services/core/java/com/android/server/VcnManagementService.java
@@ -525,6 +525,9 @@ public class VcnManagementService extends IVcnManagementService.Stub {
         @Override
         public void onReceive(Context context, Intent intent) {
             final String action = intent.getAction();
+            if (action == null) {
+                return;
+            }
 
             switch (action) {
                 case Intent.ACTION_PACKAGE_ADDED: // Fallthrough