Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 8d38a8d8: Merge "Deprecate {READ,WRITE}_PROFILE permission" into mnc-dev

Browse Source 
* commit '8d38a8d84f3c6ee81db9e6aa38492a7ce7766206':
  Deprecate {READ,WRITE}_PROFILE permission
This commit is contained in:
Brian Attwell
2015-05-28 17:43:41 +00:00
committed by Android Git Automerger
parent e886ab11dc 8d38a8d84f
commit 701ea8b595
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/current.txt
View File

@@ -106,7 +106,7 @@ package android {
field public static final deprecated java.lang.String READ_INPUT_STATE = "android.permission.READ_INPUT_STATE";
field public static final java.lang.String READ_LOGS = "android.permission.READ_LOGS";
field public static final java.lang.String READ_PHONE_STATE = "android.permission.READ_PHONE_STATE";
field public static final java.lang.String READ_PROFILE = "android.permission.READ_PROFILE";
field public static final deprecated java.lang.String READ_PROFILE = "android.permission.READ_PROFILE";
field public static final java.lang.String READ_SMS = "android.permission.READ_SMS";
field public static final deprecated java.lang.String READ_SOCIAL_STREAM = "android.permission.READ_SOCIAL_STREAM";
field public static final java.lang.String READ_SYNC_SETTINGS = "android.permission.READ_SYNC_SETTINGS";
@@ -155,7 +155,7 @@ package android {
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";
field public static final java.lang.String WRITE_HISTORY_BOOKMARKS = "com.android.browser.permission.WRITE_HISTORY_BOOKMARKS";
field public static final java.lang.String WRITE_PROFILE = "android.permission.WRITE_PROFILE";
field public static final deprecated java.lang.String WRITE_PROFILE = "android.permission.WRITE_PROFILE";
field public static final java.lang.String WRITE_SECURE_SETTINGS = "android.permission.WRITE_SECURE_SETTINGS";
field public static final java.lang.String WRITE_SETTINGS = "android.permission.WRITE_SETTINGS";
field public static final deprecated java.lang.String WRITE_SOCIAL_STREAM = "android.permission.WRITE_SOCIAL_STREAM";

4
api/system-current.txt
View File

@@ -155,7 +155,7 @@ package android {
field public static final java.lang.String READ_NETWORK_USAGE_HISTORY = "android.permission.READ_NETWORK_USAGE_HISTORY";
field public static final java.lang.String READ_PHONE_STATE = "android.permission.READ_PHONE_STATE";
field public static final java.lang.String READ_PRIVILEGED_PHONE_STATE = "android.permission.READ_PRIVILEGED_PHONE_STATE";
field public static final java.lang.String READ_PROFILE = "android.permission.READ_PROFILE";
field public static final deprecated java.lang.String READ_PROFILE = "android.permission.READ_PROFILE";
field public static final java.lang.String READ_SEARCH_INDEXABLES = "android.permission.READ_SEARCH_INDEXABLES";
field public static final java.lang.String READ_SMS = "android.permission.READ_SMS";
field public static final deprecated java.lang.String READ_SOCIAL_STREAM = "android.permission.READ_SOCIAL_STREAM";
@@ -228,7 +228,7 @@ package android {
field public static final java.lang.String WRITE_GSERVICES = "android.permission.WRITE_GSERVICES";
field public static final java.lang.String WRITE_HISTORY_BOOKMARKS = "com.android.browser.permission.WRITE_HISTORY_BOOKMARKS";
field public static final java.lang.String WRITE_MEDIA_STORAGE = "android.permission.WRITE_MEDIA_STORAGE";
field public static final java.lang.String WRITE_PROFILE = "android.permission.WRITE_PROFILE";
field public static final deprecated java.lang.String WRITE_PROFILE = "android.permission.WRITE_PROFILE";
field public static final java.lang.String WRITE_SECURE_SETTINGS = "android.permission.WRITE_SECURE_SETTINGS";
field public static final java.lang.String WRITE_SETTINGS = "android.permission.WRITE_SETTINGS";
field public static final deprecated java.lang.String WRITE_SOCIAL_STREAM = "android.permission.WRITE_SOCIAL_STREAM";

4
core/res/AndroidManifest.xml
View File

@@ -349,14 +349,14 @@
android:description="@string/permdesc_writeContacts"
android:protectionLevel="dangerous" />
<!-- Allows an application to read the user's personal profile data. -->
<!-- @deprecated No longer enforced. This was last enforced in API version 22. -->
<permission android:name="android.permission.READ_PROFILE"
android:permissionGroup="android.permission-group.CONTACTS"
android:label="@string/permlab_readProfile"
android:description="@string/permdesc_readProfile"
android:protectionLevel="dangerous" />
<!-- Allows an application to write the user's personal profile data. -->
<!-- @deprecated No longer enforced. This was last enforced in API version 22. -->
<permission android:name="android.permission.WRITE_PROFILE"
android:permissionGroup="android.permission-group.CONTACTS"
android:label="@string/permlab_writeProfile"