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

Commit f792a100 authored by Oli Lan's avatar Oli Lan Committed by Automerger Merge Worker
Browse files

Merge "Add SET_CLIP_SOURCE permission." into sc-dev am: f6ff2ea9 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib705f1b35d38183b844edae514fc595a8c97f9fb
parents c5c3918a f6ff2ea9

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -247,6 +247,7 @@ package android { 
    field public static final String SEND_SMS_NO_CONFIRMATION = "android.permission.SEND_SMS_NO_CONFIRMATION";

    field public static final String SERIAL_PORT = "android.permission.SERIAL_PORT";

    field public static final String SET_ACTIVITY_WATCHER = "android.permission.SET_ACTIVITY_WATCHER";

    field public static final String SET_CLIP_SOURCE = "android.permission.SET_CLIP_SOURCE";

    field public static final String SET_HARMFUL_APP_WARNINGS = "android.permission.SET_HARMFUL_APP_WARNINGS";

    field public static final String SET_MEDIA_KEY_LISTENER = "android.permission.SET_MEDIA_KEY_LISTENER";

    field public static final String SET_ORIENTATION = "android.permission.SET_ORIENTATION";

core/res/AndroidManifest.xml

+6 −0
Original line number Diff line number Diff line
@@ -5566,6 +5566,12 @@ 
    <permission android:name="android.permission.RENOUNCE_PERMISSIONS"

                android:protectionLevel="signature|privileged" />



    <!-- @SystemApi Allows the holder to set the source of the data when setting a clip on the

         clipboard.

         @hide -->

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

                android:protectionLevel="signature|recents" />



    <!-- Attribution for Geofencing service. -->

    <attribution android:tag="GeofencingService" android:label="@string/geofencing_service"/>

    <!-- Attribution for Country Detector. -->

data/etc/privapp-permissions-platform.xml

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

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

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

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

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

    </privapp-permissions>



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

packages/Shell/AndroidManifest.xml

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

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



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

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



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

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

                android:defaultToDeviceProtectedStorage="true"