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

Commit 53567a75 authored by Daniel Lehmann's avatar Daniel Lehmann Committed by Android (Google) Code Review
Browse files

Merge "Introduce READ_CALL_LOG and WRITE_CALL_LOG"

parents 278836e2 f06d9497

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ package android { 
    field public static final deprecated java.lang.String PERSISTENT_ACTIVITY = "android.permission.PERSISTENT_ACTIVITY";

    field public static final java.lang.String PROCESS_OUTGOING_CALLS = "android.permission.PROCESS_OUTGOING_CALLS";

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

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

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

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

    field public static final java.lang.String READ_FRAME_BUFFER = "android.permission.READ_FRAME_BUFFER";
@@ -121,6 +122,7 @@ package android { 
    field public static final java.lang.String WAKE_LOCK = "android.permission.WAKE_LOCK";

    field public static final java.lang.String WRITE_APN_SETTINGS = "android.permission.WRITE_APN_SETTINGS";

    field public static final java.lang.String WRITE_CALENDAR = "android.permission.WRITE_CALENDAR";

    field public static final java.lang.String WRITE_CALL_LOG = "android.permission.WRITE_CALL_LOG";

    field public static final java.lang.String WRITE_CONTACTS = "android.permission.WRITE_CONTACTS";

    field public static final java.lang.String WRITE_EXTERNAL_STORAGE = "android.permission.WRITE_EXTERNAL_STORAGE";

    field public static final java.lang.String WRITE_GSERVICES = "android.permission.WRITE_GSERVICES";

core/res/AndroidManifest.xml

+15 −0
Original line number Diff line number Diff line
@@ -248,6 +248,21 @@ 
        android:label="@string/permlab_writeContacts"

        android:description="@string/permdesc_writeContacts" />



    <!-- Allows an application to read the user's call log. -->

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

        android:permissionGroup="android.permission-group.PERSONAL_INFO"

        android:protectionLevel="dangerous"

        android:label="@string/permlab_readCallLog"

        android:description="@string/permdesc_readCallLog" />



    <!-- Allows an application to write (but not read) the user's

         contacts data. -->

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

        android:permissionGroup="android.permission-group.PERSONAL_INFO"

        android:protectionLevel="dangerous"

        android:label="@string/permlab_writeCallLog"

        android:description="@string/permdesc_writeCallLog" />





    <!-- Allows an application to read the user's personal profile data. -->

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

core/res/res/values/strings.xml

+20 −0
Original line number Diff line number Diff line
@@ -942,6 +942,26 @@ 
        contact (address) data stored on your phone. Malicious

        apps may use this to erase or modify your contact data.</string>





    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permlab_readCallLog">read call log</string>

    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permdesc_readCallLog" product="tablet">Allows the app to read your tablet\'s call log, including data about incoming and outgoing calls.

        Malicious apps may use this to send your data to other people.</string>

    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permdesc_readCallLog" product="default">Allows the app to read your phone\'s call log, including data about incoming and outgoing calls.

        Malicious apps may use this to send your data to other people.</string>



    <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permlab_writeCallLog">write call log</string>

    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permdesc_writeCallLog" product="tablet">Allows the app to modify your tablet\'s call log, including data about incoming and outgoing calls.

        Malicious apps may use this to erase or modify your call log.</string>

    <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permdesc_writeCallLog" product="default">Allows the app to modify your phone\'s call log, including data about incoming and outgoing calls.

        Malicious apps may use this to erase or modify your call log.</string>





    <!-- Title of the read profile permission, listed so the user can decide whether to allow the application to read the user's personal profile data. [CHAR LIMIT=30] -->

    <string name="permlab_readProfile">read your profile data</string>

    <!-- Description of the read profile permission, listed so the user can decide whether to allow the application to read the user's personal profile data. [CHAR LIMIT=NONE] -->