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

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

Merge changes from topic "wifi_mainline_apex" 

* changes:
  Revert "Add a new wifi protection level"
  Revert "Mainline wifi stack module"
  Revert "WifiManager: Retrieve IWifiManager service lazily"
  Revert "Sysui/WifiTracker: Changes to support late starting wifi service"
parents 8312525f f7ea8f9d

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -1843,7 +1843,6 @@ package android.content.pm { 
    field public static final int PROTECTION_FLAG_SYSTEM_TEXT_CLASSIFIER = 65536; // 0x10000

    field public static final int PROTECTION_FLAG_TELEPHONY = 4194304; // 0x400000

    field public static final int PROTECTION_FLAG_WELLBEING = 131072; // 0x20000

    field public static final int PROTECTION_FLAG_WIFI = 8388608; // 0x800000

    field @Nullable public final String backgroundPermission;

    field @StringRes public int requestRes;

  }

api/test-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -812,7 +812,6 @@ package android.content.pm { 
    field public static final int PROTECTION_FLAG_TELEPHONY = 4194304; // 0x400000

    field public static final int PROTECTION_FLAG_VENDOR_PRIVILEGED = 32768; // 0x8000

    field public static final int PROTECTION_FLAG_WELLBEING = 131072; // 0x20000

    field public static final int PROTECTION_FLAG_WIFI = 8388608; // 0x800000

    field @Nullable public final String backgroundPermission;

  }

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

core/java/android/content/pm/PermissionInfo.java

+0 −15
Original line number Diff line number Diff line
@@ -248,17 +248,6 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { 
    @TestApi

    public static final int PROTECTION_FLAG_TELEPHONY = 0x400000;



    /**

     * Additional flag for {@link #protectionLevel}, corresponding

     * to the <code>wifi</code> value of

     * {@link android.R.attr#protectionLevel}.

     *

     * @hide

     */

    @SystemApi

    @TestApi

    public static final int PROTECTION_FLAG_WIFI = 0x800000;



    /** @hide */

    @IntDef(flag = true, prefix = { "PROTECTION_FLAG_" }, value = {

            PROTECTION_FLAG_PRIVILEGED,
@@ -281,7 +270,6 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { 
            PROTECTION_FLAG_INCIDENT_REPORT_APPROVER,

            PROTECTION_FLAG_APP_PREDICTOR,

            PROTECTION_FLAG_TELEPHONY,

            PROTECTION_FLAG_WIFI,

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface ProtectionFlags {}
@@ -528,9 +516,6 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable { 
        if ((level & PermissionInfo.PROTECTION_FLAG_TELEPHONY) != 0) {

            protLevel += "|telephony";

        }

        if ((level & PermissionInfo.PROTECTION_FLAG_WIFI) != 0) {

            protLevel += "|wifi";

        }

        return protLevel;

    }

core/res/AndroidManifest.xml

+3 −3
Original line number Diff line number Diff line
@@ -2269,7 +2269,7 @@ 
         types of interactions

         @hide -->

    <permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL"

        android:protectionLevel="signature|installer|telephony|wifi" />

        android:protectionLevel="signature|installer|telephony" />



    <!-- @SystemApi Allows an application to start its own activities, but on a different profile

         associated with the user. For example, an application running on the main profile of a user
@@ -2951,7 +2951,7 @@ 
         @hide

    -->

    <permission android:name="android.permission.INTERNAL_SYSTEM_WINDOW"

        android:protectionLevel="signature|telephony|wifi" />

        android:protectionLevel="signature|telephony" />



    <!-- @SystemApi Allows an application to use

         {@link android.view.WindowManager.LayoutsParams#SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS}
@@ -3542,7 +3542,7 @@ 
    <!-- Allows an application to manage the companion devices.

         @hide -->

    <permission android:name="android.permission.MANAGE_COMPANION_DEVICES"

                android:protectionLevel="signature|wifi" />

                android:protectionLevel="signature" />



    <!-- @SystemApi Allows an application to use SurfaceFlinger's low level features.

         <p>Not for use by third-party applications.