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

Commit 7a3481c3 authored by Neil Fuller's avatar Neil Fuller Committed by Automerger Merge Worker
Browse files

Merge "Add a new permission in AOSP" am: 4b22e7c2 am: 1f728aca am: 8a0ce641 am: 75ae324f 

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

Change-Id: Id9f67ecab2beabe967660b5a4407ef0f20d8efad
parents 32f7c492 75ae324f

core/res/AndroidManifest.xml

+8 −0
Original line number Original line Diff line number Diff line
@@ -2682,6 +2682,14 @@ 
    <permission android:name="android.permission.SUGGEST_MANUAL_TIME_AND_ZONE"

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

        android:protectionLevel="signature" />

        android:protectionLevel="signature" />





    <!-- Allows applications like settings to manage configuration associated with automatic time

         and time zone detection.

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

         @hide

    -->

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

        android:protectionLevel="signature|privileged" />



    <!-- ==================================================== -->

    <!-- ==================================================== -->

    <!-- Permissions related to changing status bar   -->

    <!-- Permissions related to changing status bar   -->

    <!-- ==================================================== -->

    <!-- ==================================================== -->

data/etc/privapp-permissions-platform.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -433,6 +433,8 @@ applications that come with the platform 
        <permission name="android.permission.CAPTURE_AUDIO_OUTPUT" />

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

        <!-- Permissions required for CTS test - AdbManagerTest -->

        <!-- Permissions required for CTS test - AdbManagerTest -->

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

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

        <!-- Permissions required for CTS test - TimeManagerTest -->

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

    </privapp-permissions>

    </privapp-permissions>





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

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

packages/Shell/AndroidManifest.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -326,6 +326,9 @@ 
    <!-- Permission needed for CTS test - DisplayTest -->

    <!-- Permission needed for CTS test - DisplayTest -->

    <uses-permission android:name="android.permission.OVERRIDE_DISPLAY_MODE_REQUESTS" />

    <uses-permission android:name="android.permission.OVERRIDE_DISPLAY_MODE_REQUESTS" />





    <!-- Permission needed for CTS test - TimeManagerTest -->

    <uses-permission android:name="android.permission.MANAGE_TIME_AND_ZONE_DETECTION" />



    <application android:label="@string/app_label"

    <application android:label="@string/app_label"

                android:theme="@android:style/Theme.DeviceDefault.DayNight"

                android:theme="@android:style/Theme.DeviceDefault.DayNight"

                android:defaultToDeviceProtectedStorage="true"

                android:defaultToDeviceProtectedStorage="true"