commit | 957cbe2c8cd488782ea3a2392aee13d5688ba181 | [log] [tgz] |
---|---|---|
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 13:19:07 2015 -0700 |
tree | 16702485725fe57d31b9015ffa3894cf93a65cc6 | |
parent | f57ab75994462a5612a37739622bc471bfbd8534 [diff] |
Correctly handle empty permissions array in callback If permissions string array is empty, don't enter an infinite loop. Bug: 22946608 Change-Id: I67056f33ad8835577bb68340676d72fbba7ac965
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();