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

Commit 07820f85 authored by Roshan Pius's avatar Roshan Pius Committed by Android (Google) Code Review
Browse files

Merge changes from topic "wifi_mainline_apk_separation" 

* changes:
  Sysui/WifiTracker: Changes to support late starting wifi service
  WifiManager: Retrieve IWifiManager service lazily
  WifiStackClient: Register wifi API services from system_server
  Mainline wifi stack module
  NetworkStackClient: Refactor network stack process interaction
parents f6ac4bfc e01f30b6

core/java/android/app/SystemServiceRegistry.java

+2 −5
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ import android.net.lowpan.ILowpanManager; 
import android.net.lowpan.LowpanManager;

import android.net.nsd.INsdManager;

import android.net.nsd.NsdManager;

import android.net.wifi.IWifiManager;

import android.net.wifi.IWifiScanner;

import android.net.wifi.RttManager;

import android.net.wifi.WifiManager;
@@ -730,10 +729,8 @@ public final class SystemServiceRegistry { 
        registerService(Context.WIFI_SERVICE, WifiManager.class,

                new CachedServiceFetcher<WifiManager>() {

            @Override

            public WifiManager createService(ContextImpl ctx) throws ServiceNotFoundException {

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

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

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

            public WifiManager createService(ContextImpl ctx) {

                return new WifiManager(ctx.getOuterContext(),

                        ConnectivityThread.getInstanceLooper());

            }});

core/java/android/content/Context.java

+8 −0
Original line number Diff line number Diff line
@@ -3734,6 +3734,14 @@ public abstract class Context { 
     */

    public static final String NETWORK_STACK_SERVICE = "network_stack";



    /**

     * Use with {@link android.os.ServiceManager.getService()} to retrieve a

     * {@link android.net.WifiStackClient} IBinder for communicating with the network stack

     * @hide

     * @see android.net.WifiStackClient

     */

    public static final String WIFI_STACK_SERVICE = "wifi_stack";



    /**

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

     * {@link android.net.IpSecManager} for encrypting Sockets or Networks with

data/etc/privapp-permissions-platform.xml

+15 −0
Original line number Diff line number Diff line
@@ -350,4 +350,19 @@ applications that come with the platform 
        <permission name="android.permission.MANAGE_DYNAMIC_SYSTEM"/>

    </privapp-permissions>



    <privapp-permissions package="com.android.server.wifistack">

        <permission name="android.permission.CHANGE_CONFIGURATION"/>

        <permission name="android.permission.CONNECTIVITY_INTERNAL"/>

        <permission name="android.permission.DUMP"/>

        <permission name="android.permission.INTERACT_ACROSS_USERS"/>

        <permission name="android.permission.LOCAL_MAC_ADDRESS"/>

        <permission name="android.permission.MANAGE_USERS"/>

        <permission name="android.permission.PACKAGE_USAGE_STATS"/>

        <permission name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>

        <permission name="android.permission.REQUEST_NETWORK_SCORES"/>

        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>

        <permission name="android.permission.UPDATE_DEVICE_STATS"/>

        <permission name="android.permission.UPDATE_APP_OPS_STATS"/>

        <permission name="android.permission.LOCATION_HARDWARE"/>

    </privapp-permissions>

</permissions>

packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java

+3 −1
Original line number Diff line number Diff line
@@ -224,7 +224,9 @@ public class WifiTracker implements LifecycleObserver, OnStart, OnStop, OnDestro 
        mConnectivityManager = connectivityManager;



        // check if verbose logging developer option has been turned on or off

        sVerboseLogging = mWifiManager != null && (mWifiManager.getVerboseLoggingLevel() > 0);

        sVerboseLogging = Settings.Global.getInt(

                mContext.getContentResolver(),

                Settings.Global.WIFI_VERBOSE_LOGGING_ENABLED, 0) > 0;



        mFilter = filter;

packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ public class HotspotTile extends QSTileImpl<BooleanState> { 
        if (listening) {

            refreshState();

        }

        mHotspotController.handleSetListening(listening);

    }



    @Override