Temp fix for permission issues

I want to unblock QA. So I'm writing this small fix, while
the full fix is still in review.

Bug: 22066742
Bug: 21791169
Change-Id: I8d422ae7d3c8f189c9c7f697d8a9f4c1ec1d5785

1 files changed, 10 insertions, 21 deletions

diff --git a/src/com/android/contacts/common/activity/RequestPermissionsActivity.java b/src/com/android/contacts/common/activity/RequestPermissionsActivity.java
index addcc7ff..1b18e10f 100644
--- a/src/com/android/contacts/common/activity/RequestPermissionsActivity.java
+++ b/src/com/android/contacts/common/activity/RequestPermissionsActivity.java
@@ -41,26 +41,12 @@ public class RequestPermissionsActivity extends Activity {
 
     private static final int PERMISSIONS_REQUEST_ALL_PERMISSIONS = 1;
     private static String[] permissions = new String[]{
-            permission.CALL_PHONE,
-            permission.READ_CONTACTS,
-            permission.WRITE_CONTACTS,
-            permission.GET_ACCOUNTS,
-            permission.ACCESS_FINE_LOCATION,
-            permission.ACCESS_COARSE_LOCATION,
-            permission.INTERNET,
-            permission.NFC,
-            permission.READ_PHONE_STATE,
-            permission.WAKE_LOCK,
-            permission.WRITE_EXTERNAL_STORAGE,
-            permission.WRITE_SETTINGS,
-            permission.VIBRATE,
-            permission.READ_SYNC_SETTINGS,
-            permission.INSTALL_SHORTCUT,
-            permission.READ_CALL_LOG,
-            permission.READ_SMS,
-            permission.READ_CALENDAR,
-            // This following permission can't be requested as a runtime permission.
-            //permission.READ_VOICEMAIL
+            permission.ACCESS_FINE_LOCATION, // Location Group
+            permission.READ_CONTACTS, // Contacts group
+            permission.READ_CALL_LOG, // Permission group phone
+            permission.READ_CALENDAR, // Calendar group
+            permission.READ_SMS, // SMS group
+            permission.WRITE_EXTERNAL_STORAGE, // Storage group
     };
 
     private Intent mPreviousActivityIntent;
@@ -69,7 +55,10 @@ public class RequestPermissionsActivity extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mPreviousActivityIntent = (Intent) getIntent().getExtras().get(PREVIOUS_ACTIVITY_INTENT);
-        requestPermissions();
+
+        if (savedInstanceState == null) {
+            requestPermissions();
+        }
     }
 
     /**