| commit | 240ae0adcdce36237c21fe3f7a38c85159487ca1 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Thu Oct 31 01:57:46 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 31 01:57:46 2024 +0000 |
| tree | 54b440c37a1a406803896dac291ff3e722ca9f74 | |
| parent | 4a1cf44ac1bb70cf59ed8afac69af65b817fe7c8 [diff] | |
| parent | c78dd4fc5bb3c078569370a5612c9aa7576aa3f1 [diff] |
Merge "Ignore null action in VcnManagementService$VcnBroadcastReceiver" into main am: c78dd4fc5b Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3324495 Change-Id: Ifbd2435a6276da3edec982b75172e46959495242 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/core/java/com/android/server/VcnManagementService.java b/services/core/java/com/android/server/VcnManagementService.java index dc7749c..06e6c8b 100644 --- a/services/core/java/com/android/server/VcnManagementService.java +++ b/services/core/java/com/android/server/VcnManagementService.java
@@ -525,6 +525,9 @@ @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