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

Commit 993845dd authored by Neha Pattan's avatar Neha Pattan
Browse files

Remove AdServices permissions from platform and introduce only in tm-mainline-prod. 

Test: build
Bug: 213488783
Reverted Changes:
Iaaa6ddfb9:(2/2) Add AdServices related permissions to manife...
I5c9b449bc:(1/2) Add AdServices related permissions to manife...

Change-Id: I563a228791f76b8b86db2d72e7d68d5a08a0c827
parent b8dcd0b8

core/api/current.txt

+0 −3
Original line number Diff line number Diff line
@@ -8,9 +8,6 @@ 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";

core/res/AndroidManifest.xml

+0 −23
Original line number Diff line number Diff line
@@ -3730,29 +3730,6 @@ 
    <permission android:name="android.permission.REQUEST_INCIDENT_REPORT_APPROVAL"

        android:protectionLevel="signature|privileged" />



    <!-- ========================================= -->

    <!-- Permissions for AdServices -->

    <!-- ========================================= -->

    <eat-comment />



    <!-- 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" />



    <!-- ==================================== -->

    <!-- Private permissions                  -->

    <!-- ==================================== -->

core/res/res/values/strings.xml

+0 −15
Original line number Diff line number Diff line
@@ -4094,21 +4094,6 @@ 
    <!-- 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 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>