From 2ac8a1a75e7296e67a5372b871d400870c952fac Mon Sep 17 00:00:00 2001 From: Nikita Ioffe Date: Thu, 1 Dec 2022 17:46:04 +0000 Subject: Don't WTF if getSystemService(VIRTUALIZATION_SERVICE) returns null On devices without AVF support it is expected for the Context.getSystemService(VIRTUALIZATION_SERVICE) to return null. Bug: 261012673 Test: atest CtsMicrodroidDisabledTestCases Change-Id: I4e0f0efe8e8a128dc79f22f39175a2cee7724251 Merged-In: I4e0f0efe8e8a128dc79f22f39175a2cee7724251 --- core/java/android/app/SystemServiceRegistry.java | 1 + 1 file changed, 1 insertion(+) diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java index 42eb0fecdb21..ea65727ad1ca 100644 --- a/core/java/android/app/SystemServiceRegistry.java +++ b/core/java/android/app/SystemServiceRegistry.java @@ -1587,6 +1587,7 @@ public final class SystemServiceRegistry { case Context.APP_PREDICTION_SERVICE: case Context.INCREMENTAL_SERVICE: case Context.ETHERNET_SERVICE: + case Context.VIRTUALIZATION_SERVICE: return null; } Slog.wtf(TAG, "Manager wrapper not available: " + name); -- cgit v1.2.3-59-g8ed1b