diff options
Diffstat (limited to 'core/res/AndroidManifest.xml')
| -rw-r--r-- | core/res/AndroidManifest.xml | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 20cb34a..0498057 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -25,7 +25,7 @@ <!-- Permissions for things that cost money --> <!-- ====================================== --> <eat-comment /> - + <!-- Used for permissions that can be used to make the user spend money without their direct involvement. For example, this is the group for permissions that allow you to directly place phone calls, @@ -54,7 +54,7 @@ <!-- Permissions for accessing messages --> <!-- ================================== --> <eat-comment /> - + <!-- Used for permissions that allow an application to send messages on behalf of the user or intercept messages being received by the user. This is primarily intended for SMS/MMS messaging, such as @@ -104,7 +104,7 @@ <!-- Permissions for accessing personal info (contacts and calendar) --> <!-- =============================================================== --> <eat-comment /> - + <!-- Used for permissions that provide access to the user's private data, such as contacts, calendar events, e-mail messages, etc. This includes both reading and writing of this data (which should generally be @@ -158,8 +158,8 @@ android:description="@string/permdesc_writeCalendar" /> <!-- Allows an application to read the user dictionary. This should - really only be required by an IME, or a dictionary editor like - the Settings app. + really only be required by an IME, or a dictionary editor like + the Settings app. @hide Pending API council approval --> <permission android:name="android.permission.READ_USER_DICTIONARY" android:permissionGroup="android.permission-group.PERSONAL_INFO" @@ -179,7 +179,7 @@ <!-- Permissions for accessing location info --> <!-- ======================================= --> <eat-comment /> - + <!-- Used for permissions that allow access to the user's current location. --> <permission-group android:name="android.permission-group.LOCATION" @@ -224,7 +224,7 @@ <!-- Permissions for accessing networks --> <!-- ======================================= --> <eat-comment /> - + <!-- Used for permissions that provide access to networking services. The main permission here is internet access, but this is also an appropriate group for accessing or modifying any network configuration @@ -265,7 +265,7 @@ <!-- Permissions for accessing accounts --> <!-- ================================== --> <eat-comment /> - + <!-- Permissions for direct access to Google accounts. Note that while right now this is only used for Google accounts, we expect in the future to have a more general account management @@ -286,7 +286,7 @@ <!-- Permissions for accessing hardware --> <!-- ================================== --> <eat-comment /> - + <!-- Used for permissions that provide direct access to the hardware on the device. This includes audio, the camera, vibrator, etc. --> <permission-group android:name="android.permission-group.HARDWARE_CONTROLS" @@ -339,7 +339,7 @@ <!-- Permissions associated with telephony state --> <!-- =========================================== --> <eat-comment /> - + <!-- Used for permissions that are associated with accessing and modifyign telephony state: intercepting outgoing calls, reading and modifying the phone state. Note that @@ -393,7 +393,7 @@ <!-- Permissions for low-level system interaction --> <!-- ============================================ --> <eat-comment /> - + <!-- Group of permissions that are related to system APIs. Many of these are not permissions the user will be expected to understand, and such permissions should generally be marked as "normal" protection @@ -617,7 +617,7 @@ android:description="@string/permdesc_writeApnSettings" android:label="@string/permlab_writeApnSettings" /> - <!-- Allows an application to allow access the subscribed feeds + <!-- Allows an application to allow access the subscribed feeds ContentProvider. --> <permission android:name="android.permission.SUBSCRIBED_FEEDS_READ" android:permissionGroup="android.permission-group.SYSTEM_TOOLS" @@ -629,7 +629,7 @@ android:label="@string/permlab_subscribedFeedsWrite" android:description="@string/permdesc_subscribedFeedsWrite" android:protectionLevel="dangerous" /> - + <!-- Allows applications to change network connectivity state --> <permission android:name="android.permission.CHANGE_NETWORK_STATE" android:permissionGroup="android.permission-group.SYSTEM_TOOLS" @@ -680,7 +680,7 @@ <!-- Permissions for special development tools --> <!-- ========================================= --> <eat-comment /> - + <!-- Group of permissions that are related to development features. These are not permissions that should appear in normal applications; they protect APIs that are intended only to be used for development @@ -1036,6 +1036,11 @@ android:excludeFromRecents="true"> </activity> + <activity android:name="android.accounts.ChooseAccountActivity" + android:excludeFromRecents="true" + android:exported="true"> + </activity> + <service android:name="com.android.server.LoadAverageService" android:exported="true" /> @@ -1048,7 +1053,7 @@ <receiver android:name="com.android.server.MasterClearReceiver" android:permission="android.permission.MASTER_CLEAR" > <intent-filter> - <action android:name="android.intent.action.GTALK_DATA_MESSAGE_RECEIVED" /> + <action android:name="android.intent.action.REMOTE_INTENT" /> <category android:name="android.intent.category.MASTER_CLEAR" /> </intent-filter> </receiver> |