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

Commit 547964fc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "SystemServer: Support for LowpanService"

parents 2b8286d2 87a7104a

core/java/android/app/SystemServiceRegistry.java

+12 −0
Original line number Diff line number Diff line
@@ -83,6 +83,8 @@ import android.net.NetworkPolicyManager; 
import android.net.NetworkScoreManager;

import android.net.nsd.INsdManager;

import android.net.nsd.NsdManager;

import android.net.lowpan.ILowpanManager;

import android.net.lowpan.LowpanManager;

import android.net.wifi.IRttManager;

import android.net.wifi.IWifiManager;

import android.net.wifi.IWifiScanner;
@@ -540,6 +542,16 @@ final class SystemServiceRegistry { 
                        ctx.mMainThread.getHandler());

            }});



        registerService(Context.LOWPAN_SERVICE, LowpanManager.class,

                new CachedServiceFetcher<LowpanManager>() {

            @Override

            public LowpanManager createService(ContextImpl ctx) throws ServiceNotFoundException {

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

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

                return new LowpanManager(ctx.getOuterContext(), service,

                        ConnectivityThread.getInstanceLooper());

            }});



        registerService(Context.WIFI_SERVICE, WifiManager.class,

                new CachedServiceFetcher<WifiManager>() {

            @Override

core/java/android/content/Context.java

+13 −0
Original line number Diff line number Diff line
@@ -2900,6 +2900,7 @@ public abstract class Context { 
            WIFI_AWARE_SERVICE,

            WIFI_P2P_SERVICE,

            WIFI_SCANNING_SERVICE,

            //@hide: LOWPAN_SERVICE,

            //@hide: WIFI_RTT_SERVICE,

            //@hide: ETHERNET_SERVICE,

            WIFI_RTT_SERVICE,
@@ -3427,6 +3428,18 @@ public abstract class Context { 
    @SystemApi

    public static final String WIFI_RTT_SERVICE = "rttmanager";



    /**

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

     * android.net.lowpan.LowpanManager} for handling management of

     * LoWPAN access.

     *

     * @see #getSystemService

     * @see android.net.lowpan.LowpanManager

     *

     * @hide

     */

    public static final String LOWPAN_SERVICE = "lowpan";



    /**

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

     * android.net.EthernetManager} for handling management of

core/java/android/content/pm/PackageManager.java

+8 −0
Original line number Diff line number Diff line
@@ -2292,6 +2292,14 @@ public abstract class PackageManager { 
    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_WIFI_PASSPOINT = "android.hardware.wifi.passpoint";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: The device supports LoWPAN networking.

     * @hide

     */

    @SdkConstant(SdkConstantType.FEATURE)

    public static final String FEATURE_LOWPAN = "android.hardware.lowpan";



    /**

     * Feature for {@link #getSystemAvailableFeatures} and

     * {@link #hasSystemFeature}: This is a device dedicated to showing UI

core/java/com/android/internal/util/Protocol.java

+1 −0
Original line number Diff line number Diff line
@@ -65,5 +65,6 @@ public class Protocol { 
    public static final int BASE_NETWORK_MONITOR                                    = 0x00082000;

    public static final int BASE_NETWORK_FACTORY                                    = 0x00083000;

    public static final int BASE_ETHERNET                                           = 0x00084000;

    public static final int BASE_LOWPAN                                             = 0x00085000;

    //TODO: define all used protocols

}

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

+9 −0
Original line number Diff line number Diff line
@@ -171,6 +171,8 @@ public final class SystemServer { 
            "com.android.server.wifi.aware.WifiAwareService";

    private static final String WIFI_P2P_SERVICE_CLASS =

            "com.android.server.wifi.p2p.WifiP2pService";

    private static final String LOWPAN_SERVICE_CLASS =

            "com.android.server.lowpan.LowpanService";

    private static final String ETHERNET_SERVICE_CLASS =

            "com.android.server.ethernet.EthernetService";

    private static final String JOB_SCHEDULER_SERVICE_CLASS =
@@ -1089,6 +1091,13 @@ public final class SystemServer { 
                    traceEnd();

                }



                if (context.getPackageManager().hasSystemFeature(

                        PackageManager.FEATURE_LOWPAN)) {

                    traceBeginAndSlog("StartLowpan");

                    mSystemServiceManager.startService(LOWPAN_SERVICE_CLASS);

                    traceEnd();

                }



                if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_ETHERNET) ||

                    mPackageManager.hasSystemFeature(PackageManager.FEATURE_USB_HOST)) {

                    traceBeginAndSlog("StartEthernet");