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

Commit abd9ff02 authored by Adrian Ludwig's avatar Adrian Ludwig Committed by Android Git Automerger
Browse files

am d070e3da: Merge "Revert "Make the protectionLevel of framework permissions... 

am d070e3da: Merge "Revert "Make the protectionLevel of framework permissions consistent and related to sensitive user data. Dangerous permissions are applied only where sensitive user data may be exposed."" into jb-dev

* commit 'd070e3da':
  Revert "Make the protectionLevel of framework permissions consistent and related to sensitive user data. Dangerous permissions are applied only where sensitive user data may be exposed."
parents 7cca871d d070e3da

core/res/AndroidManifest.xml

+273 −560

File changed.

Preview size limit exceeded, changes collapsed.

core/res/res/values/strings.xml

+9 −100
Original line number Diff line number Diff line
@@ -390,12 +390,11 @@ 
    <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permgrouplab_personalInfo">Your personal information</string>

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

    <string name="permgroupdesc_personalInfo">Direct access to information about you, stored in on your contact card.</string>



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

    <string name="permgrouplab_socialInfo">Your social information</string>

    <string name="permgroupdesc_personalInfo" product="tablet">Direct access to your contacts

        and calendar stored on the tablet.</string>

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

    <string name="permgroupdesc_socialInfo">Direct access to information about your contacts and social connections.</string>

    <string name="permgroupdesc_personalInfo" product="default">Direct access to your contacts

        and calendar stored on the phone.</string>



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

    <string name="permgrouplab_location">Your location</string>
@@ -407,91 +406,6 @@ 
    <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permgroupdesc_network">Access various network features.</string>



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

    <string name="permgrouplab_bluetoothNetwork">Bluetooth</string>

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

    <string name="permgroupdesc_bluetoothNetwork">Access devices and networks through Bluetooth.</string>



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

    <string name="permgrouplab_shortrangeNetwork">Short-range Networks</string>

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

    <string name="permgroupdesc_shortrangeNetwork">Access devices through short-range networks such as NFC.</string>



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

    <string name="permgrouplab_audioSettings">Audio Settings</string>

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

    <string name="permgroupdesc_audioSettings">Change audio settings.</string>



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

    <string name="permgrouplab_affectsBattery">Affects Battery</string>

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

    <string name="permgroupdesc_affectsBattery">Use features that can quickly drain battery.</string>



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

    <string name="permgrouplab_calendar">Calendar</string>

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

    <string name="permgroupdesc_calendar">Direct access to calendar and events.</string>



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

    <string name="permgrouplab_dictionary">Read User Dictionary</string>

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

    <string name="permgroupdesc_dictionary">Read words in user dictionary.</string>



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

    <string name="permgrouplab_writeDictionary">Write User Dictionary</string>

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

    <string name="permgroupdesc_writeDictionary">Add words to the user dictionary.</string>



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

    <string name="permgrouplab_bookmarks">Bookmarks and History</string>

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

    <string name="permgroupdesc_bookmarks">Direct access to bookmarks and browser history.</string>



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

    <string name="permgrouplab_deviceAlarms">Alarm</string>

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

    <string name="permgroupdesc_deviceAlarms">Set the alarm clock.</string>



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

    <string name="permgrouplab_voicemail">Voicemail</string>

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

    <string name="permgroupdesc_voicemail">Direct access to voicemail.</string>



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

    <string name="permgrouplab_microphone">Microphone</string>

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

    <string name="permgroupdesc_microphone">Direct access to the microphone to record audio.</string>



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

    <string name="permgrouplab_camera">Camera</string>

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

    <string name="permgroupdesc_camera">Direct access to camera for image or video capture.</string>



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

    <string name="permgrouplab_appInfo">Your applications information</string>

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

    <string name="permgroupdesc_appInfo">Ability to affect behavior of other applications on your device.</string>



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

    <string name="permgrouplab_wallpaper">Wallpaper</string>

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

    <string name="permgroupdesc_wallpaper">Change the device wallpaper settings.</string>



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

    <string name="permgrouplab_systemClock">Clock</string>

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

    <string name="permgroupdesc_systemClock">Change the device time or timezone.</string>



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

    <string name="permgrouplab_statusBar">Status Bar</string>

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

    <string name="permgroupdesc_statusBar">Change the device status bar settings.</string>



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

    <string name="permgrouplab_syncSettings">Sync Settings</string>

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

    <string name="permgroupdesc_syncSettings">Access to the sync settings.</string>



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

    <string name="permgrouplab_accounts">Your accounts</string>

    <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
@@ -517,11 +431,6 @@ 
    <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permgroupdesc_developmentTools">Features only needed for app developers.</string>



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

    <string name="permgrouplab_display">Other Application UI</string>

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

    <string name="permgroupdesc_display">Effect the UI of other applications.</string>



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

    <string name="permgrouplab_storage">Storage</string>

    <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this.   [CHAR LIMIT=30] -->