diff options
Diffstat (limited to 'core/res/AndroidManifest.xml')
| -rw-r--r-- | core/res/AndroidManifest.xml | 35 |
1 files changed, 23 insertions, 12 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 50a4b38..84c3a9c 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -324,8 +324,11 @@ <protected-broadcast android:name="android.internal.policy.action.BURN_IN_PROTECTION" /> <protected-broadcast android:name="android.app.action.SYSTEM_UPDATE_POLICY_CHANGED" /> <protected-broadcast android:name="android.app.action.DEVICE_OWNER_CHANGED" /> - <protected-broadcast android:name="org.cyanogenmod.intent.action.THEME_CHANGED" /> - <protected-broadcast android:name="android.intent.action.THEME_RESOURCES_CACHED" /> + + <protected-broadcast android:name="org.cyanogenmod.intent.action.THEME_CHANGED" + android:permission="cyanogenmod.permission.SEND_PROTECTED_THEME_BROADCAST" /> + <protected-broadcast android:name="android.intent.action.THEME_RESOURCES_CACHED" + android:permission="cyanogenmod.permission.SEND_PROTECTED_THEME_BROADCAST" /> <protected-broadcast android:name="android.net.action.SHOW_NETWORK_POLICY_NOTIFICATION" /> @@ -1239,10 +1242,10 @@ <permission android:name="android.permission.NOTIFY_PENDING_SYSTEM_UPDATE" android:protectionLevel="signature|privileged" /> - <!-- Allows an application to override the power key action + <!-- Allows an application to override the system key actions @hide <p>Not for use by third-party applications. --> - <permission android:name="android.permission.PREVENT_POWER_KEY" + <permission android:name="android.permission.PREVENT_SYSTEM_KEYS" android:protectionLevel="signature|privileged" /> <!-- =========================================== --> @@ -1415,6 +1418,14 @@ <permission android:name="android.permission.MANAGE_USERS" android:protectionLevel="signature|privileged" /> + <!-- @hide Allows an application to create, remove users and get the list of + users on the device. Applications holding this permission can only create restricted, + guest, and managed users. For creating other kind of users, + {@link android.Manifest.permission#MANAGE_USERS} is needed. + This permission is not available to third party applications. --> + <permission android:name="android.permission.CREATE_USERS" + android:protectionLevel="signature" /> + <!-- @hide Allows an application to set the profile owners and the device owner. This permission is not available to third party applications.--> <permission android:name="android.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS" @@ -2815,7 +2826,7 @@ android:label="@string/managed_profile_label"> </activity-alias> <activity android:name="com.android.internal.app.HeavyWeightSwitcherActivity" - android:theme="@style/Theme.Material.Light.Dialog" + android:theme="@style/Theme.Material.Light.Dialog.HeavyWeightSwitcherActivity" android:label="@string/heavy_weight_switcher_title" android:finishOnCloseSystemDialogs="true" android:excludeFromRecents="true" @@ -2848,7 +2859,7 @@ <activity android:name="android.accounts.ChooseAccountActivity" android:excludeFromRecents="true" android:exported="true" - android:theme="@style/Theme.Material.Light.Dialog" + android:theme="@style/Theme.Material.Light.Dialog.ChooseAccountActivity" android:label="@string/choose_account_label" android:process=":ui"> </activity> @@ -2856,14 +2867,14 @@ <activity android:name="android.accounts.ChooseTypeAndAccountActivity" android:excludeFromRecents="true" android:exported="true" - android:theme="@style/Theme.Material.Light.Dialog" + android:theme="@style/Theme.Material.Light.Dialog.ChooseTypeAndAccountActivity" android:label="@string/choose_account_label" android:process=":ui"> </activity> <activity android:name="android.accounts.ChooseAccountTypeActivity" android:excludeFromRecents="true" - android:theme="@style/Theme.Material.Light.Dialog" + android:theme="@style/Theme.Material.Light.Dialog.ChooseAccountTypeActivity" android:label="@string/choose_account_label" android:process=":ui"> </activity> @@ -2871,19 +2882,19 @@ <activity android:name="android.accounts.CantAddAccountActivity" android:excludeFromRecents="true" android:exported="true" - android:theme="@style/Theme.Material.Light.Dialog.NoActionBar" + android:theme="@style/Theme.Material.Light.Dialog.NoActionBar.CantAddAccountActivity" android:process=":ui"> </activity> <activity android:name="android.accounts.GrantCredentialsPermissionActivity" android:excludeFromRecents="true" android:exported="true" - android:theme="@style/Theme.Material.Light.DialogWhenLarge" + android:theme="@style/Theme.Material.Light.DialogWhenLarge.GrantCredentialsPermissionActivity" android:process=":ui"> </activity> <activity android:name="android.content.SyncActivityTooManyDeletes" - android:theme="@style/Theme.Material.Light.Dialog" + android:theme="@style/Theme.Material.Light.Dialog.SyncActivityTooManyDeletes" android:label="@string/sync_too_many_deletes" android:process=":ui"> </activity> @@ -2903,7 +2914,7 @@ </activity> <activity android:name="com.android.internal.app.NetInitiatedActivity" - android:theme="@style/Theme.Material.Light.Dialog.Alert" + android:theme="@style/Theme.Material.Light.Dialog.Alert.NetInitiatedActivity" android:excludeFromRecents="true" android:process=":ui"> </activity> |