From ab2ec1d4316770e2ce8dc47dd1ae71430cd70e36 Mon Sep 17 00:00:00 2001
From: Yorke Lee <yorkelee@google.com>
Date: Wed, 25 Jun 2014 14:31:37 -0700
Subject: Add manage voicemail permission (2/4)

Update CallLogProvider and VoicemailProvider to provide read/write access to
voicemails based on their respective permissions.

Also update tests to reflect the new world.

Bug: 6948882

Change-Id: I26e960eae24dc1b8bd4a372420d4c42f242c88d3
---
 AndroidManifest.xml | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2fbc251..4cf0f60 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3,14 +3,6 @@
         android:sharedUserId="android.uid.shared"
         android:sharedUserLabel="@string/sharedUserLabel">
 
-    <permission
-            android:name="com.android.voicemail.permission.READ_WRITE_ALL_VOICEMAIL"
-            android:label="@string/read_write_all_voicemail_label"
-            android:description="@string/read_write_all_voicemail_description"
-            android:permissionGroup="android.permission-group.PERSONAL_INFO"
-            android:protectionLevel="system|signature"
-            />
-
     <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="android.permission.WRITE_CONTACTS" />
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
@@ -21,7 +13,8 @@
     <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
     <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
     <uses-permission android:name="com.android.voicemail.permission.ADD_VOICEMAIL" />
-    <uses-permission android:name="com.android.voicemail.permission.READ_WRITE_ALL_VOICEMAIL" />
+    <uses-permission android:name="com.android.voicemail.permission.READ_ALL_VOICEMAIL" />
+    <uses-permission android:name="com.android.voicemail.permission.MANAGE_VOICEMAIL" />
 
     <application android:process="android.process.acore"
         android:label="@string/app_label"
-- 
cgit v1.1