diff options
| -rw-r--r-- | core/java/android/app/SystemServiceRegistry.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java index bd26db55052b..c6b8f3baecf6 100644 --- a/core/java/android/app/SystemServiceRegistry.java +++ b/core/java/android/app/SystemServiceRegistry.java @@ -1750,10 +1750,13 @@ public final class SystemServiceRegistry { @Override public AdvancedProtectionManager createService(ContextImpl ctx) throws ServiceNotFoundException { - IBinder iBinder = ServiceManager.getServiceOrThrow( + IBinder iBinder = ServiceManager.getService( Context.ADVANCED_PROTECTION_SERVICE); IAdvancedProtectionService service = IAdvancedProtectionService.Stub.asInterface(iBinder); + if (service == null) { + return null; + } return new AdvancedProtectionManager(service); } }); |