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

Commit 7a82746d authored by Evan Severson's avatar Evan Severson Committed by Automerger Merge Worker
Browse files

Merge "Remove the signature protection for sensor privacy permissions" into sc-dev am: f55d0c0d 

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

Change-Id: Id73b7f767ed88f31455e87df69c819cbdb9309bb
parents f440a0b1 f55d0c0d

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -380,6 +380,7 @@ package android { 
    field public static final int config_systemSpeechRecognizer;

    field public static final int config_systemTelevisionNotificationHandler;

    field public static final int config_systemTextIntelligence;

    field public static final int config_systemUi;

    field public static final int config_systemUiIntelligence;

    field public static final int config_systemVisualIntelligence;

    field public static final int config_systemWellbeing;

core/res/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -5578,12 +5578,12 @@ 
    <!-- @SystemApi Allows sensor privacy to be modified.

         @hide -->

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

                android:protectionLevel="signature" />

                android:protectionLevel="internal|role" />



    <!-- @SystemApi Allows sensor privacy changes to be observed.

         @hide -->

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

                android:protectionLevel="signature|installer" />

                android:protectionLevel="internal|role|installer" />



    <!-- @SystemApi Permission that protects the {@link Intent#ACTION_REVIEW_ACCESSIBILITY_SERVICES}

         intent.

core/res/res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -1951,6 +1951,8 @@ 
    <string name="config_systemTelevisionNotificationHandler" translatable="false"></string>

    <!-- The name of the package that will hold the system activity recognizer role. -->

    <string name="config_systemActivityRecognizer" translatable="false"></string>

    <!-- The name of the package that will hold the system ui role -->

    <string name="config_systemUi" translatable="false">com.android.systemui</string>



    <!-- The name of the package that will be allowed to change its components' label/icon. -->

    <string name="config_overrideComponentUiPackage" translatable="false">com.android.stk</string>

core/res/res/values/public.xml

+2 −0
Original line number Diff line number Diff line
@@ -3228,6 +3228,8 @@ 
    <public name="config_systemActivityRecognizer" />

    <!-- @hide @SystemApi -->

    <public name="config_systemCompanionDeviceProvider"/>

    <!-- @hide @SystemApi -->

    <public name="config_systemUi" />

  </staging-public-group>



  <staging-public-group type="id" first-id="0x01020055">

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

+8 −7
Original line number Diff line number Diff line
@@ -2751,13 +2751,6 @@ public final class SystemServer implements Dumpable { 
                t.traceEnd();

            }



            t.traceBegin("StartSystemUI");

            try {

                startSystemUi(context, windowManagerF);

            } catch (Throwable e) {

                reportWtf("starting System UI", e);

            }

            t.traceEnd();

            // Enable airplane mode in safe mode. setAirplaneMode() cannot be called

            // earlier as it sends broadcasts to other services.

            // TODO: This may actually be too late if radio firmware already started leaking
@@ -2959,6 +2952,14 @@ public final class SystemServer implements Dumpable { 
            }

        }, t);



        t.traceBegin("StartSystemUI");

        try {

            startSystemUi(context, windowManagerF);

        } catch (Throwable e) {

            reportWtf("starting System UI", e);

        }

        t.traceEnd();



        t.traceEnd(); // startOtherServices

    }