[Android] Explicitly request all needed runtime permissions.

chrome/android/java/src/org/chromium/chrome/browser/pageinfo/WebsiteSettingsPopup.java

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.pageinfo;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
@@ skipping 508 matching lines @@
      * Whether to show a 'Details' link to the connection info popup. The link is only shown for
      * HTTPS connections.
      */
     private boolean isConnectionDetailsLinkVisible() {
         return mContentPublisher == null && !isShowingOfflinePage() && mParsedUrl != null
                 && mParsedUrl.getScheme() != null
                         && mParsedUrl.getScheme().equals(UrlConstants.HTTPS_SCHEME);
     }
 
     private boolean hasAndroidPermission(int contentSettingType) {
-        String androidPermission = PrefServiceBridge.getAndroidPermissionForContentSetting(
-                contentSettingType);
-        return androidPermission == null || mWindowAndroid.hasPermission(androidPermission);
+        String[] androidPermissions =
+                PrefServiceBridge.getAndroidPermissionsForContentSetting(contentSettingType);
+        if (androidPermissions == null) return true;
+        for (int i = 0; i < androidPermissions.length; i++) {
+            if (!mWindowAndroid.hasPermission(androidPermissions[i])) {
+                return false;
+            }
+        }
+        return true;
     }
 
     /**
      * Adds a new row for the given permission.
      *
      * @param name The title of the permission to display to the user.
      * @param type The ContentSettingsType of the permission.
      * @param currentSettingValue The ContentSetting value of the currently selected setting.
      */
     @CalledByNative
@@ skipping 30 matching lines @@
             // permission_intent_override or permission_type.
             LocationUtils locationUtils = LocationUtils.getInstance();
             if (permission.type == ContentSettingsType.CONTENT_SETTINGS_TYPE_GEOLOCATION
                     && !locationUtils.isSystemLocationSettingEnabled()) {
                 warningTextResource = R.string.page_info_android_location_blocked;
                 permissionRow.setTag(R.id.permission_intent_override,
                         locationUtils.getSystemLocationSettingsIntent());
             } else if (!hasAndroidPermission(permission.type)) {
                 warningTextResource = R.string.page_info_android_permission_blocked;
                 permissionRow.setTag(R.id.permission_type,
-                        PrefServiceBridge.getAndroidPermissionForContentSetting(permission.type));
+                        PrefServiceBridge.getAndroidPermissionsForContentSetting(permission.type));
             }
 
             if (warningTextResource != 0) {
                 TextView permissionUnavailable = (TextView) permissionRow.findViewById(
                         R.id.website_settings_permission_unavailable_message);
                 permissionUnavailable.setVisibility(View.VISIBLE);
                 permissionUnavailable.setText(warningTextResource);
 
                 permissionIcon.setImageResource(R.drawable.exclamation_triangle);
                 permissionIcon.setColorFilter(ApiCompatibilityUtils.getColor(
@@ skipping 172 matching lines @@
                                 WebsiteSettingsAction.WEBSITE_SETTINGS_SECURITY_DETAILS_OPENED);
                         ConnectionInfoPopup.show(mContext, mTab.getWebContents());
                     }
                 }
             });
         } else if (view.getId() == R.id.website_settings_permission_row) {
             final Object intentOverride = view.getTag(R.id.permission_intent_override);
 
             if (intentOverride == null && mWindowAndroid != null) {
                 // Try and immediately request missing Android permissions where possible.
-                final String permissionType = (String) view.getTag(R.id.permission_type);
-                if (mWindowAndroid.canRequestPermission(permissionType)) {
-                    final String[] permissionRequest = new String[] {permissionType};
-                    mWindowAndroid.requestPermissions(permissionRequest, new PermissionCallback() {
+                final String[] permissionType = (String[]) view.getTag(R.id.permission_type);
+                for (int i = 0; i < permissionType.length; i++) {
+                    if (!mWindowAndroid.canRequestPermission(permissionType[i])) continue;
+
+                    // If any permissions can be requested, attempt to request them all.
+                    mWindowAndroid.requestPermissions(permissionType, new PermissionCallback() {
                         @Override
                         public void onRequestPermissionsResult(
                                 String[] permissions, int[] grantResults) {
-                            if (grantResults.length > 0
-                                    && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                                updatePermissionDisplay();
+                            boolean allGranted = true;
+                            for (int i = 0; i < grantResults.length; i++) {
+                                if (grantResults[i] != PackageManager.PERMISSION_GRANTED) {
+                                    allGranted = false;
+                                    break;
+                                }
                             }
+                            if (allGranted) updatePermissionDisplay();
                         }
                     });
                     return;
                 }
             }
 
             runAfterDismiss(new Runnable() {
                 @Override
                 public void run() {
                     Intent settingsIntent;
@@ skipping 164 matching lines @@
         new WebsiteSettingsPopup(activity, tab, offlinePageCreationDate, contentPublisher);
     }
 
     private static native long nativeInit(WebsiteSettingsPopup popup, WebContents webContents);
 
     private native void nativeDestroy(long nativeWebsiteSettingsPopupAndroid);
 
     private native void nativeRecordWebsiteSettingsAction(
             long nativeWebsiteSettingsPopupAndroid, int action);
 }