Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 601be0f5 authored by Frank Wang's avatar Frank Wang Committed by Automerger Merge Worker
Browse files

Merge "Add OnDevicePersonalization system service." into tm-dev am: cfe0ef54 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17147715

Change-Id: Ia6eadd7588f958c9a62b7c242932524ee63689be
parents ad92166f cfe0ef54

core/java/android/app/SystemServiceRegistry.java

+2 −0
Original line number Diff line number Diff line
@@ -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...