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

Commit 04cca7db authored by Cassie Wang's avatar Cassie Wang Committed by Automerger Merge Worker
Browse files

Merge "Define new AppSearch global query permission." into sc-dev am: 07121903 

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

Change-Id: I75cf8df22e8f7aa321da81c8576305cdb0a329c0
parents 527588a0 07121903

core/api/system-current.txt

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

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

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

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

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

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

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

core/res/AndroidManifest.xml

+5 −0
Original line number Diff line number Diff line
@@ -5782,6 +5782,11 @@ 
    <permission android:name="android.permission.CAPTURE_BLACKOUT_CONTENT"

        android:protectionLevel="signature" />



      <!-- @SystemApi Allows an application to query over global data in AppSearch.

           @hide -->

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

                android:protectionLevel="internal|role" />



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

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

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