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

Commit d0a4dc88 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge changes I80f66d19,I68810035 into rvc-dev am: 8d974dc2 am: 0e2a7a1c am: f9e08db2 

Change-Id: Icc4bdfd78edcf335748daad5534b96badd104818
parents 200ab0fe f9e08db2

core/res/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -522,6 +522,7 @@ 
    <protected-broadcast android:name="com.android.server.telecom.intent.action.CALLS_ADD_ENTRY" />

    <protected-broadcast android:name="com.android.settings.location.MODE_CHANGING" />

    <protected-broadcast android:name="com.android.settings.bluetooth.ACTION_DISMISS_PAIRING" />

    <protected-broadcast android:name="com.android.settings.wifi.action.NETWORK_REQUEST" />



    <protected-broadcast android:name="NotificationManagerService.TIMEOUT" />

    <protected-broadcast android:name="ScheduleConditionProvider.EVALUATE" />

data/etc/privapp-permissions-platform.xml

+1 −0
Original line number Diff line number Diff line
@@ -334,6 +334,7 @@ applications that come with the platform 
        <!-- Needed for test only -->

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

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

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

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

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

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

packages/Shell/AndroidManifest.xml

+3 −0
Original line number Diff line number Diff line
@@ -270,6 +270,9 @@ 
    <!-- Permission needed to test mainline permission module rollback -->

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



    <!-- Permission needed to read wifi network credentials for CtsNetTestCases -->

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



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

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

                android:defaultToDeviceProtectedStorage="true"