From b97df269b5c44dc6aed70bdff156cd70ee394fbb Mon Sep 17 00:00:00 2001
From: Brian Attwell <brianattwell@google.com>
Date: Wed, 27 May 2015 15:26:41 -0700
Subject: [PATCH] Deprecate {READ,WRITE}_PROFILE permission

Now that *_PROFILE permissions are in the same permission
group as *_CONTACTS, these permissions have no visible
impact on the user. However, they complicate developer's
lives and prevent us from using Context#grantUriRequest().

Bug: 21090207
Change-Id: I31e6ae7b0f49c3589071f6a95f8d69a9456c144d
---
 api/current.txt              | 4 ++--
 api/system-current.txt       | 4 ++--
 core/res/AndroidManifest.xml | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index bbdb878b288f9..35c5b6947f854 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -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";
@@ -154,7 +154,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";
diff --git a/api/system-current.txt b/api/system-current.txt
index 1a3673d8548eb..0702962cbf43a 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -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";
@@ -227,7 +227,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";
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 4f451c742af50..5933fc9f3ecb9 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -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"