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

Commit b3d99bf4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add knownSigner to permissions needed by trusted OEM apps" into tm-dev am: 3c95a136 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16981108

Change-Id: Id3f0db3d7830ece3a256b7d339bdffe8664ea264
parents 7a557bb8 3c95a136

core/res/AndroidManifest.xml

+6 −3
Original line number Diff line number Diff line
@@ -1903,14 +1903,16 @@ 
         to improve wifi performance.

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

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

                android:protectionLevel="signature|privileged" />

                android:protectionLevel="signature|privileged|knownSigner"

                android:knownCerts="@array/wifi_known_signers" />



    <!-- Allows applications to get notified when a Wi-Fi interface request cannot

         be satisfied without tearing down one or more other interfaces, and provide a decision

         whether to approve the request or reject it.

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

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

                android:protectionLevel="signature|privileged" />

                android:protectionLevel="signature|privileged|knownSigner"

                android:knownCerts="@array/wifi_known_signers" />



    <!-- @SystemApi @hide Allows apps to create and manage IPsec tunnels.

         <p>Only granted to applications that are currently bound by the
@@ -1948,7 +1950,8 @@ 
     modifications.

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

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

        android:protectionLevel="signature|privileged" />

                android:protectionLevel="signature|privileged|knownSigner"

                android:knownCerts="@array/wifi_known_signers" />



    <!-- @deprecated Allows applications to act as network scorers. @hide @SystemApi-->

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

core/res/res/values/arrays.xml

+6 −0
Original line number Diff line number Diff line
@@ -185,6 +185,12 @@ 
        <item>@string/app_info</item>

    </string-array>



    <!-- Certificate digests for trusted apps that will be allowed to obtain the knownSigner Wi-Fi

         permissions. The digest should be computed over the DER encoding of the trusted certificate

         using the SHA-256 digest algorithm. -->

    <string-array name="wifi_known_signers">

    </string-array>



    <!-- Device-specific array of SIM slot indexes which are are embedded eUICCs.

         e.g. If a device has two physical slots with indexes 0, 1, and slot 1 is an

         eUICC, then the value of this array should be: