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

Commit b8389b28 authored by Xinyi Zhou's avatar Xinyi Zhou Committed by Android (Google) Code Review
Browse files

Merge "Register NearbyManager in SystemServiceRegistry"

parents 2f473a97 cbc8fed0

core/java/android/app/SystemServiceRegistry.java

+2 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ import android.media.tv.interactive.ITvIAppManager; 
import android.media.tv.interactive.TvIAppManager;

import android.media.tv.tunerresourcemanager.ITunerResourceManager;

import android.media.tv.tunerresourcemanager.TunerResourceManager;

import android.nearby.NearbyFrameworkInitializer;

import android.net.ConnectivityFrameworkInitializer;

import android.net.ConnectivityFrameworkInitializerTiramisu;

import android.net.EthernetManager;
@@ -1537,6 +1538,7 @@ public final class SystemServiceRegistry { 
            UwbFrameworkInitializer.registerServiceWrappers();

            SafetyCenterFrameworkInitializer.registerServiceWrappers();

            ConnectivityFrameworkInitializerTiramisu.registerServiceWrappers();

            NearbyFrameworkInitializer.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...