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

Commit d042c3f4 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by android-build-merger
Browse files

Merge "Make CONNECTIVITY_USE_RESTRICTED_NETWORKS @SystemApi." am: a1e206a3 

am: 37afaac7

Change-Id: Id576f61f3ac7d1de828c870ffaf4d6ab3e1e2568
parents 2a3c633d 37afaac7

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ package android { 
    field public static final java.lang.String CLEAR_APP_CACHE = "android.permission.CLEAR_APP_CACHE";

    field public static final java.lang.String CLEAR_APP_USER_DATA = "android.permission.CLEAR_APP_USER_DATA";

    field public static final java.lang.String CONNECTIVITY_INTERNAL = "android.permission.CONNECTIVITY_INTERNAL";

    field public static final java.lang.String CONNECTIVITY_USE_RESTRICTED_NETWORKS = "android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS";

    field public static final java.lang.String CONTROL_INCALL_EXPERIENCE = "android.permission.CONTROL_INCALL_EXPERIENCE";

    field public static final java.lang.String CONTROL_LOCATION_UPDATES = "android.permission.CONTROL_LOCATION_UPDATES";

    field public static final java.lang.String CONTROL_VPN = "android.permission.CONTROL_VPN";

core/res/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -1305,7 +1305,7 @@ 
    <permission android:name="android.permission.CONNECTIVITY_INTERNAL"

        android:protectionLevel="signature|privileged" />



    <!-- Allows an internal user to use restricted Networks.

    <!-- @SystemApi Allows an internal user to use restricted Networks.

         @hide -->

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

        android:protectionLevel="signature|privileged" />