[sensors] Add Permission guard to the generic sensor apis.

chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleWebsitePreferences.java

 // Copyright 2015 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.preferences.website;
 
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.res.Resources;
 import android.net.Uri;
@@ skipping 59 matching lines @@
     public static final String PREF_RESET_SITE = "reset_site_button";
     // Website permissions (if adding new, see hasPermissionsPreferences and resetSite below):
     public static final String PREF_AUTOPLAY_PERMISSION = "autoplay_permission_list";
     public static final String PREF_BACKGROUND_SYNC_PERMISSION = "background_sync_permission_list";
     public static final String PREF_CAMERA_CAPTURE_PERMISSION = "camera_permission_list";
     public static final String PREF_COOKIES_PERMISSION = "cookies_permission_list";
     public static final String PREF_JAVASCRIPT_PERMISSION = "javascript_permission_list";
     public static final String PREF_LOCATION_ACCESS = "location_access_list";
     public static final String PREF_MIC_CAPTURE_PERMISSION = "microphone_permission_list";
     public static final String PREF_MIDI_SYSEX_PERMISSION = "midi_sysex_permission_list";
+    public static final String PREF_SENSORS_PERMISSION = "sensors_permission_list";
     public static final String PREF_NOTIFICATIONS_PERMISSION = "push_notifications_list";
     public static final String PREF_POPUP_PERMISSION = "popup_permission_list";
     public static final String PREF_PROTECTED_MEDIA_IDENTIFIER_PERMISSION =
             "protected_media_identifier_permission_list";
     public static final String PREF_SUBRESOURCE_FILTER_PERMISSION =
             "subresource_filter_permission_list";
 
     // All permissions from the permissions preference category must be listed here.
     // TODO(mvanouwerkerk): Use this array in more places to reduce verbosity.
     private static final String[] PERMISSION_PREFERENCE_KEYS = {
-            PREF_AUTOPLAY_PERMISSION,
-            PREF_BACKGROUND_SYNC_PERMISSION,
-            PREF_CAMERA_CAPTURE_PERMISSION,
-            PREF_COOKIES_PERMISSION,
-            PREF_JAVASCRIPT_PERMISSION,
-            PREF_LOCATION_ACCESS,
-            PREF_MIC_CAPTURE_PERMISSION,
-            PREF_MIDI_SYSEX_PERMISSION,
-            PREF_NOTIFICATIONS_PERMISSION,
-            PREF_POPUP_PERMISSION,
-            PREF_PROTECTED_MEDIA_IDENTIFIER_PERMISSION,
-            PREF_SUBRESOURCE_FILTER_PERMISSION,
+            PREF_AUTOPLAY_PERMISSION, PREF_BACKGROUND_SYNC_PERMISSION,
+            PREF_CAMERA_CAPTURE_PERMISSION, PREF_COOKIES_PERMISSION, PREF_JAVASCRIPT_PERMISSION,
+            PREF_LOCATION_ACCESS, PREF_MIC_CAPTURE_PERMISSION, PREF_MIDI_SYSEX_PERMISSION,
+            PREF_NOTIFICATIONS_PERMISSION, PREF_POPUP_PERMISSION,
+            PREF_PROTECTED_MEDIA_IDENTIFIER_PERMISSION, PREF_SUBRESOURCE_FILTER_PERMISSION,
+            PREF_SENSORS_PERMISSION,
     };
 
     // The website this page is displaying details about.
     private Website mSite;
 
     // The address of the site we want to display. Used only if EXTRA_ADDRESS is provided.
     private WebsiteAddress mSiteAddress;
 
     // The number of USB device permissions displayed.
     private int mUsbPermissionCount;
@@ skipping 89 matching lines @@
                 merged.setSubresourceFilterException(other.getSubresourceFilterException());
             }
             if (merged.getGeolocationInfo() == null && other.getGeolocationInfo() != null
                     && permissionInfoIsForTopLevelOrigin(other.getGeolocationInfo(), origin)) {
                 merged.setGeolocationInfo(other.getGeolocationInfo());
             }
             if (merged.getMidiInfo() == null && other.getMidiInfo() != null
                     && permissionInfoIsForTopLevelOrigin(other.getMidiInfo(), origin)) {
                 merged.setMidiInfo(other.getMidiInfo());
             }
+            if (merged.getSensorInfo() == null && other.getSensorInfo() != null
+                    && permissionInfoIsForTopLevelOrigin(other.getSensorInfo(), origin)) {
+                merged.setSensorInfo(other.getSensorInfo());
+            }
             if (merged.getProtectedMediaIdentifierInfo() == null
                     && other.getProtectedMediaIdentifierInfo() != null
                     && permissionInfoIsForTopLevelOrigin(
                                other.getProtectedMediaIdentifierInfo(), origin)) {
                 merged.setProtectedMediaIdentifierInfo(other.getProtectedMediaIdentifierInfo());
             }
             if (merged.getNotificationInfo() == null
                     && other.getNotificationInfo() != null
                     && permissionInfoIsForTopLevelOrigin(
                                other.getNotificationInfo(), origin)) {
@@ skipping 78 matching lines @@
             } else if (PREF_COOKIES_PERMISSION.equals(preference.getKey())) {
                 setUpListPreference(preference, mSite.getCookiePermission());
             } else if (PREF_JAVASCRIPT_PERMISSION.equals(preference.getKey())) {
                 setUpListPreference(preference, mSite.getJavaScriptPermission());
             } else if (PREF_LOCATION_ACCESS.equals(preference.getKey())) {
                 setUpLocationPreference(preference);
             } else if (PREF_MIC_CAPTURE_PERMISSION.equals(preference.getKey())) {
                 setUpListPreference(preference, mSite.getMicrophonePermission());
             } else if (PREF_MIDI_SYSEX_PERMISSION.equals(preference.getKey())) {
                 setUpListPreference(preference, mSite.getMidiPermission());
+            } else if (PREF_SENSORS_PERMISSION.equals(preference.getKey())) {
+                setUpListPreference(preference, mSite.getSensorsPermission());
             } else if (PREF_NOTIFICATIONS_PERMISSION.equals(preference.getKey())) {
                 setUpListPreference(preference, mSite.getNotificationPermission());
             } else if (PREF_POPUP_PERMISSION.equals(preference.getKey())) {
                 setUpListPreference(preference, mSite.getPopupPermission());
             } else if (PREF_PROTECTED_MEDIA_IDENTIFIER_PERMISSION.equals(preference.getKey())) {
                 setUpListPreference(preference, mSite.getProtectedMediaIdentifierPermission());
             } else if (PREF_SUBRESOURCE_FILTER_PERMISSION.equals(preference.getKey())) {
                 setUpListPreference(preference, mSite.getSubresourceFilterPermission());
             }
 
@@ skipping 248 matching lines @@
             case PREF_COOKIES_PERMISSION:
                 return ContentSettingsType.CONTENT_SETTINGS_TYPE_COOKIES;
             case PREF_JAVASCRIPT_PERMISSION:
                 return ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT;
             case PREF_LOCATION_ACCESS:
                 return ContentSettingsType.CONTENT_SETTINGS_TYPE_GEOLOCATION;
             case PREF_MIC_CAPTURE_PERMISSION:
                 return ContentSettingsType.CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC;
             case PREF_MIDI_SYSEX_PERMISSION:
                 return ContentSettingsType.CONTENT_SETTINGS_TYPE_MIDI_SYSEX;
+            case PREF_SENSORS_PERMISSION:
+                return ContentSettingsType.CONTENT_SETTINGS_TYPE_SENSORS;
             case PREF_NOTIFICATIONS_PERMISSION:
                 return ContentSettingsType.CONTENT_SETTINGS_TYPE_NOTIFICATIONS;
             case PREF_POPUP_PERMISSION:
                 return ContentSettingsType.CONTENT_SETTINGS_TYPE_POPUPS;
             case PREF_PROTECTED_MEDIA_IDENTIFIER_PERMISSION:
                 return ContentSettingsType.CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER;
             case PREF_SUBRESOURCE_FILTER_PERMISSION:
                 return ContentSettingsType.CONTENT_SETTINGS_TYPE_SUBRESOURCE_FILTER;
             default:
                 return 0;
@@ skipping 42 matching lines @@
         } else if (PREF_COOKIES_PERMISSION.equals(preference.getKey())) {
             mSite.setCookiePermission(permission);
         } else if (PREF_JAVASCRIPT_PERMISSION.equals(preference.getKey())) {
             mSite.setJavaScriptPermission(permission);
         } else if (PREF_LOCATION_ACCESS.equals(preference.getKey())) {
             mSite.setGeolocationPermission(permission);
         } else if (PREF_MIC_CAPTURE_PERMISSION.equals(preference.getKey())) {
             mSite.setMicrophonePermission(permission);
         } else if (PREF_MIDI_SYSEX_PERMISSION.equals(preference.getKey())) {
             mSite.setMidiPermission(permission);
+        } else if (PREF_SENSORS_PERMISSION.equals(preference.getKey())) {
+            mSite.setSensorsPermission(permission);
         } else if (PREF_NOTIFICATIONS_PERMISSION.equals(preference.getKey())) {
             mSite.setNotificationPermission(permission);
         } else if (PREF_POPUP_PERMISSION.equals(preference.getKey())) {
             mSite.setPopupPermission(permission);
         } else if (PREF_PROTECTED_MEDIA_IDENTIFIER_PERMISSION.equals(preference.getKey())) {
             mSite.setProtectedMediaIdentifierPermission(permission);
         } else if (PREF_SUBRESOURCE_FILTER_PERMISSION.equals(preference.getKey())) {
             mSite.setSubresourceFilterPermission(permission);
         }
 
@@ skipping 56 matching lines @@
 
         // Clear the permissions.
         mSite.setAutoplayPermission(ContentSetting.DEFAULT);
         mSite.setBackgroundSyncPermission(ContentSetting.DEFAULT);
         mSite.setCameraPermission(ContentSetting.DEFAULT);
         mSite.setCookiePermission(ContentSetting.DEFAULT);
         mSite.setGeolocationPermission(ContentSetting.DEFAULT);
         mSite.setJavaScriptPermission(ContentSetting.DEFAULT);
         mSite.setMicrophonePermission(ContentSetting.DEFAULT);
         mSite.setMidiPermission(ContentSetting.DEFAULT);
+        mSite.setSensorsPermission(ContentSetting.DEFAULT);
         mSite.setNotificationPermission(ContentSetting.DEFAULT);
         mSite.setPopupPermission(ContentSetting.DEFAULT);
         mSite.setProtectedMediaIdentifierPermission(ContentSetting.DEFAULT);
         mSite.setSubresourceFilterPermission(ContentSetting.DEFAULT);
 
         for (UsbInfo info : mSite.getUsbInfo()) info.revoke();
 
         // Clear the storage and finish the activity if necessary.
         if (mSite.getTotalUsage() > 0) {
             clearStoredData();
         } else {
             // Clearing stored data implies popping back to parent menu if there
             // is nothing left to show. Therefore, we only need to explicitly
             // close the activity if there's no stored data to begin with.
             getActivity().finish();
         }
     }
 }