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

Commit 697cba5e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Define two new permissions to guard role-based access to AppSearch."

parents eadc950b 4e251482

core/api/current.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -125,11 +125,13 @@ package android { 
    field public static final String POST_NOTIFICATIONS = "android.permission.POST_NOTIFICATIONS";

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

    field @Deprecated public static final String PROCESS_OUTGOING_CALLS = "android.permission.PROCESS_OUTGOING_CALLS";

    field @Deprecated public static final String PROCESS_OUTGOING_CALLS = "android.permission.PROCESS_OUTGOING_CALLS";

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    field @Deprecated public static final String READ_INPUT_STATE = "android.permission.READ_INPUT_STATE";

    field @Deprecated public static final String READ_INPUT_STATE = "android.permission.READ_INPUT_STATE";

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

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

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

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

core/res/AndroidManifest.xml

+11 −1
Original line number Original line Diff line number Diff line
@@ -6110,6 +6110,16 @@ 
    <permission android:name="android.permission.READ_GLOBAL_APP_SEARCH_DATA"

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

                android:protectionLevel="internal|role" />

                android:protectionLevel="internal|role" />





    <!-- Allows an application to query over global data in AppSearch that's visible to the

         ASSISTANT role.  -->

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

        android:protectionLevel="internal|role" />



    <!-- Allows an application to query over global data in AppSearch that's visible to the

         HOME role.  -->

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

        android:protectionLevel="internal|role" />



    <!-- @SystemApi Allows an application to create virtual devices in VirtualDeviceManager.

    <!-- @SystemApi Allows an application to create virtual devices in VirtualDeviceManager.

         @hide -->

         @hide -->

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

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