summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Kevin Han <kevhan@google.com> 2021-02-24 00:32:44 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-02-24 00:32:44 +0000
commit0de60cd4e8c2899766567eafa93c6aaa19eb5aec (patch)
tree684797900a4f9cb682af3d94ed3f20dd72a24050
parent93798f22e88f7d58bfd138ca7399ac93c3c92d83 (diff)
parent44183743e0abd1fe7201e2fada496ca668ba78d3 (diff)
Merge "Register AppHibernationManager in service registry" am: 44183743e0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1572766 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibf8ac130fe7800af2d83b16f2ae90a7df5558c62
-rw-r--r--core/java/android/app/SystemServiceRegistry.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java
index d7eded201740..331a0b125ee2 100644
--- a/core/java/android/app/SystemServiceRegistry.java
+++ b/core/java/android/app/SystemServiceRegistry.java
@@ -43,6 +43,7 @@ import android.app.usage.IUsageStatsManager;
import android.app.usage.NetworkStatsManager;
import android.app.usage.StorageStatsManager;
import android.app.usage.UsageStatsManager;
+import android.apphibernation.AppHibernationManager;
import android.appwidget.AppWidgetManager;
import android.bluetooth.BluetoothManager;
import android.companion.CompanionDeviceManager;
@@ -1295,6 +1296,13 @@ public final class SystemServiceRegistry {
IBinder b = ServiceManager.getServiceOrThrow(Context.APP_INTEGRITY_SERVICE);
return new AppIntegrityManager(IAppIntegrityManager.Stub.asInterface(b));
}});
+ registerService(Context.APP_HIBERNATION_SERVICE, AppHibernationManager.class,
+ new CachedServiceFetcher<AppHibernationManager>() {
+ @Override
+ public AppHibernationManager createService(ContextImpl ctx) {
+ IBinder b = ServiceManager.getService(Context.APP_HIBERNATION_SERVICE);
+ return b == null ? null : new AppHibernationManager(ctx);
+ }});
registerService(Context.DREAM_SERVICE, DreamManager.class,
new CachedServiceFetcher<DreamManager>() {
@Override