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

Commit 737a20fd authored by Scott Main's avatar Scott Main Committed by Android (Google) Code Review
Browse files

Merge "docs: explain implicit permissions applied by sdk versions bug: 7453055" into jb-mr1-dev

parents fca8d258 2681faaf

core/res/AndroidManifest.xml

+58 −5
Original line number Diff line number Diff line
@@ -290,7 +290,16 @@ 
        android:permissionGroup="android.permission-group.PERSONAL_INFO"

        android:protectionLevel="signature|system" />



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

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

         <p class="note"><strong>Note:</strong> If your app uses the

         {@link #READ_CONTACTS} permission and <em>both</em> your <a

         href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#min">{@code

         minSdkVersion}</a> and <a

         href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#target">{@code

         targetSdkVersion}</a> values are set to 15 or lower, the system implicitly

         grants your app this permission. If you don't need this permission, be sure your <a

         href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#target">{@code

         targetSdkVersion}</a> is 16 or higher.</p> -->

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

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

        android:protectionLevel="dangerous"
@@ -298,7 +307,16 @@ 
        android:description="@string/permdesc_readCallLog" />



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

         contacts data. -->

         contacts data.

         <p class="note"><strong>Note:</strong> If your app uses the

         {@link #WRITE_CONTACTS} permission and <em>both</em> your <a

         href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#min">{@code

         minSdkVersion}</a> and <a

         href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#target">{@code

         targetSdkVersion}</a> values are set to 15 or lower, the system implicitly

         grants your app this permission. If you don't need this permission, be sure your <a

         href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#target">{@code

         targetSdkVersion}</a> is 16 or higher.</p>  -->

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

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

        android:protectionLevel="dangerous"
@@ -888,7 +906,15 @@ 
        android:label="@string/permlab_modifyPhoneState"

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



    <!-- Allows read only access to phone state. -->

    <!-- Allows read only access to phone state.

         <p class="note"><strong>Note:</strong> If <em>both</em> your <a

         href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#min">{@code

         minSdkVersion}</a> and <a

         href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#target">{@code

         targetSdkVersion}</a> values are set to 3 or lower, the system implicitly

         grants your app this permission. If you don't need this permission, be sure your <a

         href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#target">{@code

         targetSdkVersion}</a> is 4 or higher. -->

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

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

        android:protectionLevel="dangerous"
@@ -931,14 +957,41 @@ 
        android:permissionGroupFlags="personalInfo"

        android:priority="240" />



    <!-- Allows an application to read from external storage -->

    <!-- Allows an application to read from external storage.

         <p>Any app that declares the {@link #WRITE_EXTERNAL_STORAGE} permission is implicitly

         granted this permission.</p>

         <p>Currently, this permission is not enforced and all apps still have access to read from

         external storage without this permission. That will change in a future release and apps

         will require this permission to read from external storage. So if your

         app reads from the external storage, you should add this permission to your app now

         to ensure that it continues to work on future versions of Android.</p>

         <p>You can test your app with the permission enforced by either running your app on the

         Android Emulator when running Android 4.1 or higher, or enabling <em>Protect USB

         storage</em> under Developer options in the Settings app on a device running Android 4.1 or

         higher.</p>

         <p class="note"><strong>Note:</strong> If <em>both</em> your <a

         href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#min">{@code

         minSdkVersion}</a> and <a

         href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#target">{@code

         targetSdkVersion}</a> values are set to 3 or lower, the system implicitly

         grants your app this permission. If you don't need this permission, be sure your <a

         href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#target">{@code

         targetSdkVersion}</a> is 4 or higher.-->

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

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

        android:label="@string/permlab_sdcardRead"

        android:description="@string/permdesc_sdcardRead"

        android:protectionLevel="normal" />



    <!-- Allows an application to write to external storage -->

    <!-- Allows an application to write to external storage.

         <p class="note"><strong>Note:</strong> If <em>both</em> your <a

         href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#min">{@code

         minSdkVersion}</a> and <a

         href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#target">{@code

         targetSdkVersion}</a> values are set to 3 or lower, the system implicitly

         grants your app this permission. If you don't need this permission, be sure your <a

         href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#target">{@code

         targetSdkVersion}</a> is 4 or higher. -->

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

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

        android:label="@string/permlab_sdcardWrite"