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

Commit c206c7ed authored by Shreshta Manu's avatar Shreshta Manu Committed by Automerger Merge Worker
Browse files

Merge "[Ranging] Register ranging service" into main am: 65799698 

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



Change-Id: I5040ba9abdc45b454b3532c59894d3e6d9697317
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 72d97edb 65799698

AconfigFlags.bp

+8 −0
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ aconfig_declarations_group { 
        "com.android.media.flags.performance-aconfig-java",

        "com.android.media.flags.projection-aconfig-java",

        "com.android.net.thread.platform.flags-aconfig-java",

        "com.android.ranging.flags.ranging-aconfig-java",

        "com.android.server.contextualsearch.flags-java",

        "com.android.server.flags.services-aconfig-java",

        "com.android.text.flags-aconfig-java",
@@ -1462,6 +1463,13 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// Ranging

java_aconfig_library {

    name: "com.android.ranging.flags.ranging-aconfig-java",

    aconfig_declarations: "ranging_aconfig_flags",

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



// System Server

aconfig_declarations {

    name: "android.systemserver.flags-aconfig",

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -3802,6 +3802,7 @@ package android.content { 
    field @FlaggedApi("android.app.ondeviceintelligence.flags.enable_on_device_intelligence") public static final String ON_DEVICE_INTELLIGENCE_SERVICE = "on_device_intelligence";

    field public static final String PERMISSION_CONTROLLER_SERVICE = "permission_controller";

    field public static final String PERMISSION_SERVICE = "permission";

    field @FlaggedApi("com.android.ranging.flags.ranging_stack_enabled") public static final String RANGING_SERVICE = "ranging";

    field public static final String REBOOT_READINESS_SERVICE = "reboot_readiness";

    field public static final String ROLLBACK_SERVICE = "rollback";

    field public static final String SAFETY_CENTER_SERVICE = "safety_center";

core/java/android/content/Context.java

+12 −0
Original line number Diff line number Diff line
@@ -4309,6 +4309,7 @@ public abstract class Context { 
            SECURITY_STATE_SERVICE,

           //@hide: ECM_ENHANCED_CONFIRMATION_SERVICE,

            CONTACT_KEYS_SERVICE,

            RANGING_SERVICE,



    })

    @Retention(RetentionPolicy.SOURCE)
@@ -6374,6 +6375,17 @@ public abstract class Context { 
    @SystemApi

    public static final String UWB_SERVICE = "uwb";



    /**

     * Use with {@link #getSystemService(String)} to retrieve a

     * {@link android.ranging.RangingManager}.

     *

     * @see #getSystemService(String)

     * @hide

     */

    @FlaggedApi(com.android.ranging.flags.Flags.FLAG_RANGING_STACK_ENABLED)

    @SystemApi

    public static final String RANGING_SERVICE = "ranging";



    /**

     * Use with {@link #getSystemService(String)} to retrieve a

     * {@link android.app.DreamManager} for controlling Dream states.

services/java/com/android/server/SystemServer.java

+15 −0
Original line number Diff line number Diff line
@@ -428,6 +428,10 @@ public final class SystemServer implements Dumpable { 
    private static final String PROFILING_SERVICE_JAR_PATH =

            "/apex/com.android.profiling/javalib/service-profiling.jar";



    private static final String RANGING_APEX_SERVICE_JAR_PATH =

            "/apex/com.android.uwb/javalib/service-ranging.jar";

    private static final String RANGING_SERVICE_CLASS = "com.android.server.ranging.RangingService";



    private static final String TETHERING_CONNECTOR_CLASS = "android.net.ITetheringConnector";



    private static final String PERSISTENT_DATA_BLOCK_PROP = "ro.frp.pst";
@@ -2961,6 +2965,17 @@ public final class SystemServer implements Dumpable { 
            t.traceEnd();

        }



        if (com.android.ranging.flags.Flags.rangingStackEnabled()) {

            if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_UWB)

                    || context.getPackageManager().hasSystemFeature(

                            PackageManager.FEATURE_WIFI_RTT)) {

                t.traceBegin("RangingService");

                mSystemServiceManager.startServiceFromJar(RANGING_SERVICE_CLASS,

                        RANGING_APEX_SERVICE_JAR_PATH);

                t.traceEnd();

            }

        }



        t.traceBegin("StartBootPhaseDeviceSpecificServicesReady");

        mSystemServiceManager.startBootPhase(t, SystemService.PHASE_DEVICE_SPECIFIC_SERVICES_READY);

        t.traceEnd();