summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Frank Wang <xueyiwang@google.com> 2022-03-14 19:36:53 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-03-14 19:36:53 +0000
commitcfe0ef548d25bda388c41ed8b8324f52d2efe0f2 (patch)
tree108612cd7d8351026bb1fed26f3a9b476ca1be5d
parent8909727b974445a9336008dfae97b33f31ab4932 (diff)
parent81cdede07d157969e8af739e2f6471739560e644 (diff)
Merge "Add OnDevicePersonalization system service." into tm-dev
-rw-r--r--core/java/android/app/SystemServiceRegistry.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java
index bf6f63414574..6615374f71ec 100644
--- a/core/java/android/app/SystemServiceRegistry.java
+++ b/core/java/android/app/SystemServiceRegistry.java
@@ -154,6 +154,7 @@ import android.net.vcn.VcnManager;
import android.net.wifi.WifiFrameworkInitializer;
import android.net.wifi.nl80211.WifiNl80211Manager;
import android.nfc.NfcManager;
+import android.ondevicepersonalization.OnDevicePersonalizationFrameworkInitializer;
import android.os.BatteryManager;
import android.os.BatteryStats;
import android.os.BatteryStatsManager;
@@ -1560,6 +1561,7 @@ public final class SystemServiceRegistry {
SafetyCenterFrameworkInitializer.registerServiceWrappers();
ConnectivityFrameworkInitializerTiramisu.registerServiceWrappers();
NearbyFrameworkInitializer.registerServiceWrappers();
+ OnDevicePersonalizationFrameworkInitializer.registerServiceWrappers();
} finally {
// If any of the above code throws, we're in a pretty bad shape and the process
// will likely crash, but we'll reset it just in case there's an exception handler...