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

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

Revert "Mainline wifi stack module" 

This reverts commit 6f5338dd.

Reason for revert: Wifi services no longer plan to be a separate
APK/process for mainline. Will instead become a jar loaded from Apex.

Bug: 144722612
Test: Device boots up & connects to wifi networks.
Change-Id: I293e36973c4bdbd8bf9db2fcd78e61e6c38b39f4
parent d1260cf9

core/java/android/content/Context.java

+0 −8
Original line number Diff line number Diff line
@@ -3863,14 +3863,6 @@ 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

+0 −18
Original line number Diff line number Diff line
@@ -367,22 +367,4 @@ applications that come with the platform 
        <permission name="android.permission.REBOOT"/>

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

    </privapp-permissions>



    <privapp-permissions package="com.android.wifi">

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

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

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

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

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

        <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_DEVICE_CONFIG"/>

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

services/Android.bp

+0 −2
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ filegroup { 
        ":services.usage-sources",

        ":services.usb-sources",

        ":services.voiceinteraction-sources",

        ":services.wifi-sources",

    ],

    visibility: ["//visibility:private"],

}
@@ -68,7 +67,6 @@ java_library { 
        "services.usage",

        "services.usb",

        "services.voiceinteraction",

        "services.wifi",

        "android.hidl.base-V1.0-java",

    ],

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

+34 −9
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ import android.database.sqlite.SQLiteGlobal; 
import android.hardware.display.DisplayManagerInternal;

import android.net.ConnectivityModuleConnector;

import android.net.NetworkStackClient;

import android.net.wifi.WifiStackClient;

import android.os.BaseBundle;

import android.os.Binder;

import android.os.Build;
@@ -1359,6 +1358,40 @@ public final class SystemServer { 
            }

            t.traceEnd();



            if (context.getPackageManager().hasSystemFeature(

                    PackageManager.FEATURE_WIFI)) {

                // Wifi Service must be started first for wifi-related services.

                t.traceBegin("StartWifi");

                mSystemServiceManager.startService(WIFI_SERVICE_CLASS);

                t.traceEnd();

                t.traceBegin("StartWifiScanning");

                mSystemServiceManager.startService(

                        "com.android.server.wifi.scanner.WifiScanningService");

                t.traceEnd();

            }



            if (context.getPackageManager().hasSystemFeature(

                    PackageManager.FEATURE_WIFI_RTT)) {

                t.traceBegin("StartRttService");

                mSystemServiceManager.startService(

                        "com.android.server.wifi.rtt.RttService");

                t.traceEnd();

            }



            if (context.getPackageManager().hasSystemFeature(

                    PackageManager.FEATURE_WIFI_AWARE)) {

                t.traceBegin("StartWifiAware");

                mSystemServiceManager.startService(WIFI_AWARE_SERVICE_CLASS);

                t.traceEnd();

            }



            if (context.getPackageManager().hasSystemFeature(

                    PackageManager.FEATURE_WIFI_DIRECT)) {

                t.traceBegin("StartWifiP2P");

                mSystemServiceManager.startService(WIFI_P2P_SERVICE_CLASS);

                t.traceEnd();

            }



            if (context.getPackageManager().hasSystemFeature(

                    PackageManager.FEATURE_LOWPAN)) {

                t.traceBegin("StartLowpan");
@@ -2171,14 +2204,6 @@ public final class SystemServer { 
            }

            t.traceEnd();



            t.traceBegin("StartWifiStack");

            try {

                WifiStackClient.getInstance().start();

            } catch (Throwable e) {

                reportWtf("starting Wifi Stack", e);

            }

            t.traceEnd();



            t.traceBegin("MakeCountryDetectionServiceReady");

            try {

                if (countryDetectorF != null) {

services/wifi/Android.bp

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
filegroup {

    name: "services.wifi-sources",

    srcs: [

        "java/**/*.java",

        "java/**/*.aidl",

    ],

    path: "java",

    visibility: ["//frameworks/base/services"],

}



// Interfaces between the core system and the wifi mainline module.

java_library_static {

    name: "services.wifi",

    srcs: [":services.wifi-sources"],

    libs: ["services.net"],

}