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

Commit f6e38704 authored by Roshan Pius's avatar Roshan Pius
Browse files

UwbManager: Change initialization mechanism for uwb service 

Needed since UWB is going to be delivered via apex.

Bug: 194906542
Test: Compiles
Change-Id: I78e5b41601d665fb8fd2b96d9b86429404bd2ce0
parent 6c580dd4

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -2354,6 +2354,7 @@ package android.content { 
    field public static final String TETHERING_SERVICE = "tethering";

    field public static final String TRANSLATION_MANAGER_SERVICE = "translation";

    field public static final String UI_TRANSLATION_SERVICE = "ui_translation";

    field public static final String UWB_SERVICE = "uwb";

    field public static final String VR_SERVICE = "vrmanager";

    field public static final String WIFI_NL80211_SERVICE = "wifinl80211";

    field @Deprecated public static final String WIFI_RTT_SERVICE = "rttmanager";

core/java/android/app/SystemServiceRegistry.java

+2 −9
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ import android.telephony.TelephonyRegistryManager; 
import android.util.ArrayMap;

import android.util.Log;

import android.util.Slog;

import android.uwb.UwbManager;

import android.uwb.UwbFrameworkInitializer;

import android.view.ContextThemeWrapper;

import android.view.LayoutInflater;

import android.view.WindowManager;
@@ -728,14 +728,6 @@ public final class SystemServiceRegistry { 
                return new SerialManager(ctx, ISerialManager.Stub.asInterface(b));

            }});



        registerService(Context.UWB_SERVICE, UwbManager.class,

                new CachedServiceFetcher<UwbManager>() {

                    @Override

                    public UwbManager createService(ContextImpl ctx) {

                        return UwbManager.getInstance(ctx);

                    }

                });



        registerService(Context.VIBRATOR_MANAGER_SERVICE, VibratorManager.class,

                new CachedServiceFetcher<VibratorManager>() {

                    @Override
@@ -1486,6 +1478,7 @@ public final class SystemServiceRegistry { 
            MediaFrameworkInitializer.registerServiceWrappers();

            RoleFrameworkInitializer.registerServiceWrappers();

            SchedulingFrameworkInitializer.registerServiceWrappers();

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

core/java/android/content/Context.java

+1 −0
Original line number Diff line number Diff line
@@ -5606,6 +5606,7 @@ public abstract class Context { 
     * @see #getSystemService(String)

     * @hide

     */

    @SystemApi

    public static final String UWB_SERVICE = "uwb";



    /**