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

Commit 6df47c62 authored by Etan Cohen's avatar Etan Cohen Committed by Android (Google) Code Review
Browse files

Merge "[RTT2] Update RTT service name"

parents 392a9a2d 46efb481

core/java/android/app/SystemServiceRegistry.java

+3 −2
Original line number Diff line number Diff line
@@ -618,12 +618,13 @@ final class SystemServiceRegistry { 
                        ConnectivityThread.getInstanceLooper());

            }});



        registerService(Context.WIFI_RTT2_SERVICE, WifiRttManager.class,

        registerService(Context.WIFI_RTT_RANGING_SERVICE, WifiRttManager.class,

                new CachedServiceFetcher<WifiRttManager>() {

                    @Override

                    public WifiRttManager createService(ContextImpl ctx)

                            throws ServiceNotFoundException {

                        IBinder b = ServiceManager.getServiceOrThrow(Context.WIFI_RTT2_SERVICE);

                        IBinder b = ServiceManager.getServiceOrThrow(

                                Context.WIFI_RTT_RANGING_SERVICE);

                        IWifiRttManager service = IWifiRttManager.Stub.asInterface(b);

                        return new WifiRttManager(ctx.getOuterContext(), service);

                    }});

core/java/android/content/Context.java

+2 −2
Original line number Diff line number Diff line
@@ -2947,7 +2947,7 @@ public abstract class Context { 
            //@hide: LOWPAN_SERVICE,

            //@hide: WIFI_RTT_SERVICE,

            //@hide: ETHERNET_SERVICE,

            WIFI_RTT_SERVICE,

            WIFI_RTT_RANGING_SERVICE,

            NSD_SERVICE,

            AUDIO_SERVICE,

            FINGERPRINT_SERVICE,
@@ -3496,7 +3496,7 @@ public abstract class Context { 
     * @see android.net.wifi.rtt.WifiRttManager

     * @hide

     */

    public static final String WIFI_RTT2_SERVICE = "rttmanager2";

    public static final String WIFI_RTT_RANGING_SERVICE = "rttmanager2";



    /**

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

wifi/java/android/net/wifi/rtt/WifiRttManager.java

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ import java.util.List; 
 *

 * @hide RTT_API

 */

@SystemService(Context.WIFI_RTT2_SERVICE)

@SystemService(Context.WIFI_RTT_RANGING_SERVICE)

public class WifiRttManager {

    private static final String TAG = "WifiRttManager";

    private static final boolean VDBG = false;

wifi/java/android/net/wifi/rtt/package.html

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
<p>The primary entry point to Wi-Fi RTT capabilities is the

    {@link android.net.wifi.rtt.WifiRttManager} class, which is acquired by calling

    {@link android.content.Context#getSystemService(String)

    Context.getSystemService(Context.WIFI_RTT_SERVICE)}</p>

    Context.getSystemService(Context.WIFI_RTT_RANGING_SERVICE)}</p>



<p>Some APIs may require the following user permissions:</p>

<ul>