Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "(1/2) Add AdServices related permissions to manifest." into tm-dev

Browse Source
This commit is contained in:
Neha Pattan
2022-03-07 18:27:21 +00:00
committed by Android (Google) Code Review
parent bf06e42c20 26e4f85a3a
commit f0d3c47fe6
3 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/api/current.txt
View File

@@ -8,6 +8,9 @@ package android {
public static final class Manifest.permission {
ctor public Manifest.permission();
field public static final String ACCEPT_HANDOVER = "android.permission.ACCEPT_HANDOVER";
field public static final String ACCESS_ADSERVICES_ATTRIBUTION = "android.permission.ACCESS_ADSERVICES_ATTRIBUTION";
field public static final String ACCESS_ADSERVICES_CUSTOM_AUDIENCES = "android.permission.ACCESS_ADSERVICES_CUSTOM_AUDIENCES";
field public static final String ACCESS_ADSERVICES_TOPICS = "android.permission.ACCESS_ADSERVICES_TOPICS";
field public static final String ACCESS_BACKGROUND_LOCATION = "android.permission.ACCESS_BACKGROUND_LOCATION";
field public static final String ACCESS_BLOBS_ACROSS_USERS = "android.permission.ACCESS_BLOBS_ACROSS_USERS";
field public static final String ACCESS_CHECKIN_PROPERTIES = "android.permission.ACCESS_CHECKIN_PROPERTIES";
@@ -17,7 +20,6 @@ package android {
field public static final String ACCESS_MEDIA_LOCATION = "android.permission.ACCESS_MEDIA_LOCATION";
field public static final String ACCESS_NETWORK_STATE = "android.permission.ACCESS_NETWORK_STATE";
field public static final String ACCESS_NOTIFICATION_POLICY = "android.permission.ACCESS_NOTIFICATION_POLICY";
field public static final String ACCESS_SUPPLEMENTAL_APIS = "android.permission.ACCESS_SUPPLEMENTAL_APIS";
field public static final String ACCESS_WIFI_STATE = "android.permission.ACCESS_WIFI_STATE";
field public static final String ACCOUNT_MANAGER = "android.permission.ACCOUNT_MANAGER";
field public static final String ACTIVITY_RECOGNITION = "android.permission.ACTIVITY_RECOGNITION";

23
core/res/AndroidManifest.xml
View File

@@ -3718,15 +3718,26 @@
android:protectionLevel="signature|privileged" />
<!-- ========================================= -->
<!-- Permissions for SupplementalApi -->
<!-- Permissions for AdServices -->
<!-- ========================================= -->
<eat-comment />
<!-- TODO(b/213488783): Update with correct names. -->
<!-- Allows an application to access SupplementalApis. -->
<permission android:name="android.permission.ACCESS_SUPPLEMENTAL_APIS"
android:label="@string/permlab_accessSupplementalApi"
android:description="@string/permdesc_accessSupplementalApi"
<!-- Allows an application to access AdServices Topics API. -->
<permission android:name="android.permission.ACCESS_ADSERVICES_TOPICS"
android:label="@string/permlab_accessAdServicesTopics"
android:description="@string/permdesc_accessAdServicesTopics"
android:protectionLevel="normal" />
<!-- Allows an application to access AdServices Attribution APIs. -->
<permission android:name="android.permission.ACCESS_ADSERVICES_ATTRIBUTION"
android:label="@string/permlab_accessAdServicesAttribution"
android:description="@string/permdesc_accessAdServicesAttribution"
android:protectionLevel="normal" />
<!-- Allows an application to access AdServices Custom Audiences APIs. -->
<permission android:name="android.permission.ACCESS_ADSERVICES_CUSTOM_AUDIENCES"
android:label="@string/permlab_accessAdServicesCustomAudiences"
android:description="@string/permdesc_accessAdServicesCustomAudiences"
android:protectionLevel="normal" />
<!-- ==================================== -->

18
core/res/res/values/strings.xml
View File

@@ -4095,10 +4095,20 @@
<!-- Description of an application permission that lets it query all other packages. [CHAR LIMIT=NONE] -->
<string name="permdesc_queryAllPackages">Allows an app to see all installed packages.</string>
<!-- Title of an application permission that lets it access SupplementalApis. [CHAR LIMIT=NONE] -->
<string name="permlab_accessSupplementalApi">access SupplementalApis</string>
<!-- Description of an application permission that lets it access SupplementalApis. [CHAR LIMIT=NONE]-->
<string name="permdesc_accessSupplementalApi">Allows an application to access SupplementalApis.</string>
<!-- Title of an application permission that lets it access AdServices Topics API. [CHAR LIMIT=NONE] -->
<string name="permlab_accessAdServicesTopics">access AdServices Topics API</string>
<!-- Description of an application permission that lets it access AdServices Topics API. [CHAR LIMIT=NONE]-->
<string name="permdesc_accessAdServicesTopics">Allows an application to access AdServices Topics API.</string>
<!-- Title of an application permission that lets it access AdServices Attribution APIs. [CHAR LIMIT=NONE] -->
<string name="permlab_accessAdServicesAttribution">access AdServices Attribution APIs</string>
<!-- Description of an application permission that lets it access AdServices Attribution APIs. [CHAR LIMIT=NONE]-->
<string name="permdesc_accessAdServicesAttribution">Allows an application to access AdServices Attribution APIs.</string>
<!-- Title of an application permission that lets it access AdServices Custom Audiences API. [CHAR LIMIT=NONE] -->
<string name="permlab_accessAdServicesCustomAudiences">access AdServices Custom Audiences API</string>
<!-- Description of an application permission that lets it access AdServices Custom Audiences API. [CHAR LIMIT=NONE]-->
<string name="permdesc_accessAdServicesCustomAudiences">Allows an application to access AdServices Custom Audiences API.</string>
<!-- Shown in the tutorial for tap twice for zoom control. -->
<string name="tutorial_double_tap_to_zoom_message_short">Tap twice for zoom control</string>