commit 0b28759f33c23809ef0978e31fb5199768926dc5
author Yorke Lee <yorkelee@google.com> Tue Aug 11 18:02:18 2015 -0700
committer The Android Automerger <android-build@google.com> Wed Aug 12 15:03:16 2015 -0700
tree b7063d48d059d7be0b115ad56395d4858cba6824
parent 7f92059ae8ad59da244c0b5ffeef06d7150963d3

Correctly handle empty permissions array in callback

If permissions string array is empty, don't enter an infinite loop.

Bug: 22946608
Change-Id: I67056f33ad8835577bb68340676d72fbba7ac965

src/com/android/contacts/common/activity/RequestPermissionsActivityBase.java

diff --git a/src/com/android/contacts/common/activity/RequestPermissionsActivityBase.java b/src/com/android/contacts/common/activity/RequestPermissionsActivityBase.java
index 3543c6c..5f78ec7 100644
--- a/src/com/android/contacts/common/activity/RequestPermissionsActivityBase.java
+++ b/src/com/android/contacts/common/activity/RequestPermissionsActivityBase.java
@@ -96,7 +96,8 @@
     @Override
     public void onRequestPermissionsResult(int requestCode, String permissions[],
             int[] grantResults) {
-        if (isAllGranted(permissions, grantResults)) {
+        if (permissions != null && permissions.length > 0
+                && isAllGranted(permissions, grantResults)) {
             mPreviousActivityIntent.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
             startActivity(mPreviousActivityIntent);
             finish();