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

Commit cbc8fed0 authored by Xinyi Zhou's avatar Xinyi Zhou
Browse files

Register NearbyManager in SystemServiceRegistry 

Bug: 214495869
Test: Built and read the log
Change-Id: Idbf977a2c34949594657d881c413fcccc1657dd0
parent 45ed6b9c

core/java/android/app/SystemServiceRegistry.java

+2 −0
Original line number Diff line number Diff line
@@ -130,6 +130,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;
@@ -1554,6 +1555,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...