diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-08-12 18:06:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-12 18:06:04 +0000 |
| commit | 561eb21532fcdf7d5540cee5436ba8adf68c7277 (patch) | |
| tree | a7c0163bafa60b688dd9733274cded132d529349 | |
| parent | dbfaa67b24964ef66f7ab69d4956732781233ea5 (diff) | |
| parent | e62a5be8ca8f2dc1d51e54628597af00c6f29805 (diff) | |
| download | android_packages_apps_ContactsCommon-561eb21532fcdf7d5540cee5436ba8adf68c7277.tar.gz android_packages_apps_ContactsCommon-561eb21532fcdf7d5540cee5436ba8adf68c7277.tar.bz2 android_packages_apps_ContactsCommon-561eb21532fcdf7d5540cee5436ba8adf68c7277.zip | |
am e62a5be8: am e45cb5c8: am 12811fd1: Merge "Correctly handle empty permissions array in callback" into mnc-dev
* commit 'e62a5be8ca8f2dc1d51e54628597af00c6f29805':
Correctly handle empty permissions array in callback
| -rw-r--r-- | src/com/android/contacts/common/activity/RequestPermissionsActivityBase.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/contacts/common/activity/RequestPermissionsActivityBase.java b/src/com/android/contacts/common/activity/RequestPermissionsActivityBase.java index 3543c6c2..5f78ec79 100644 --- a/src/com/android/contacts/common/activity/RequestPermissionsActivityBase.java +++ b/src/com/android/contacts/common/activity/RequestPermissionsActivityBase.java @@ -96,7 +96,8 @@ public abstract class RequestPermissionsActivityBase extends Activity { @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(); |