From cdf95e31024d235b51c7e6076ea2afc990f460cd Mon Sep 17 00:00:00 2001
From: Debashish Chatterjee <debashishc@google.com>
Date: Wed, 20 Jul 2011 19:01:15 +0100
Subject: Removed READ_WRITE_ALL_VOICEMAILS permission from framework.

This permission is meant to be a 'signature' permission and to be used
only by the contacts app. We recently moved it to framework/base as part
of opening up voicemail api into the SDK. However, the signature of
framework is different from contacts app. Consequently the contacts app
is not granted READ_WRITE_ALL_VOICEMAILS permission. This makes the
contacts app crash on start.

This fix removes the READ_WRITE_ALL_iVOICEMAILS from framework/base so
that the one defined in contacts provider is then used by the system.

Bug: 5054221

Change-Id: Iaa7a23fe95b0142978eff124e25fe2291dc7d212
---
 api/current.txt                 | 1 -
 core/res/AndroidManifest.xml    | 9 ---------
 core/res/res/values/strings.xml | 8 --------
 3 files changed, 18 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index 6984b078e1aa..284596eb6562 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -82,7 +82,6 @@ package android {
     field public static final java.lang.String READ_SMS = "android.permission.READ_SMS";
     field public static final java.lang.String READ_SYNC_SETTINGS = "android.permission.READ_SYNC_SETTINGS";
     field public static final java.lang.String READ_SYNC_STATS = "android.permission.READ_SYNC_STATS";
-    field public static final java.lang.String READ_WRITE_ALL_VOICEMAIL = "com.android.voicemail.permission.READ_WRITE_ALL_VOICEMAIL";
     field public static final java.lang.String READ_WRITE_OWN_VOICEMAIL = "com.android.voicemail.permission.READ_WRITE_OWN_VOICEMAIL";
     field public static final java.lang.String REBOOT = "android.permission.REBOOT";
     field public static final java.lang.String RECEIVE_BOOT_COMPLETED = "android.permission.RECEIVE_BOOT_COMPLETED";
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 290f0493a5d9..103a32691735 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -300,15 +300,6 @@
         android:label="@string/permlab_readWriteOwnVoicemail"
         android:description="@string/permdesc_readWriteOwnVoicemail" />
 
-   <!-- Allows an application to read/write all voicemails. In order to be able
-        access all voicemails, this permission is needed in *addition* to
-        READ_WRITE_OWN_VOICEMAIL. -->
-    <permission android:name="com.android.voicemail.permission.READ_WRITE_ALL_VOICEMAIL"
-        android:permissionGroup="android.permission-group.PERSONAL_INFO"
-        android:protectionLevel="signature"
-        android:label="@string/permlab_readWriteAllVoicemail"
-        android:description="@string/permdesc_readWriteAllVoicemail" />
-
     <!-- ======================================= -->
     <!-- Permissions for accessing location info -->
     <!-- ======================================= -->
diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml
index 64f731639124..419734aebcc1 100755
--- a/core/res/res/values/strings.xml
+++ b/core/res/res/values/strings.xml
@@ -2159,14 +2159,6 @@
     <string name="permdesc_readWriteOwnVoicemail">Allows the application to store and retrieve only
       voicemails that its associated service can access.</string>
 
-    <!-- Title of an application permission, listed so the user can choose whether
-        they want to allow the application to do this.  [CHAR LIMIT=NONE] -->
-    <string name="permlab_readWriteAllVoicemail">Access all voicemails</string>
-    <!-- Description of an application permission, listed so the user can choose whether
-        they want to allow the application to do this. [CHAR LIMIT=NONE] -->
-    <string name="permdesc_readWriteAllVoicemail">Allows the application to store and retrieve all
-      voicemails that this device can access.</string>
-
     <!-- Title of an application permission, listed so the user can choose whether
         they want to allow the application to do this. -->
     <string name="permlab_writeGeolocationPermissions">Modify Browser geolocation permissions</string>
-- 
cgit v1.2.3-59-g8ed1b