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

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

Merge "Give Shell the NOTIFY_PENDING_SYSTEM_UPDATE permission" into sc-dev am:... 

Merge "Give Shell the NOTIFY_PENDING_SYSTEM_UPDATE permission" into sc-dev am: 69a09397 am: 79f30197

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

Change-Id: Ie54a82c16b0d836ce56ef8d0c2469266275f00be
parents cf062532 79f30197

data/etc/privapp-permissions-platform.xml

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

        <!-- Permission required for CTS test - CtsAlarmManagerTestCases -->

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

        <!-- Permission required for GTS test - PendingSystemUpdateTest -->

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

    </privapp-permissions>



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

packages/Shell/AndroidManifest.xml

+3 −0
Original line number Diff line number Diff line
@@ -567,6 +567,9 @@ 
    <!-- Permission required for CTS test - GlobalSearchSessionPlatformCtsTests -->

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



    <!-- Permission required for GTS test - PendingSystemUpdateTest -->

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



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

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

                android:defaultToDeviceProtectedStorage="true"