Commit 858e7734 authored by Marcin Wiacek's avatar Marcin Wiacek Committed by Commit Bot

Fix for status for Camera & Microphone with disabled permissions

When system permissions are disabled for Camera / Microphone,
Chrome displays "Ask first" in Settings/Site Settings.

Patch is changing it to "Blocked" + doing one micro-optimization
as small bonus.

BUG=882698

Change-Id: Ie061803b0de805c7fbc3c11c698afcceeda082fe
Reviewed-on: https://chromium-review.googlesource.com/1218142
Commit-Queue: Marcin Wiącek <marcin@mwiacek.com>
Reviewed-by: default avatarFinnur Thorarinsson <finnur@chromium.org>
Cr-Commit-Position: refs/heads/master@{#590473}
parent 53999bf4
......@@ -54,9 +54,9 @@ public class SiteSettingsPreferences extends PreferenceFragment
mProtectedContentMenuAvailable = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
String category = "";
if (getArguments() != null) {
category = getArguments().getString(SingleCategoryPreferences.EXTRA_CATEGORY, "");
String category =
getArguments().getString(SingleCategoryPreferences.EXTRA_CATEGORY, "");
if (MEDIA_KEY.equals(category)) {
mMediaSubMenu = true;
getActivity().setTitle(findPreference(MEDIA_KEY).getTitle().toString());
......@@ -191,9 +191,15 @@ public class SiteSettingsPreferences extends PreferenceFragment
p.setTitle(ContentSettingsResources.getTitle(contentType));
p.setOnPreferenceClickListener(this);
// Disable autoplay preference if Data Saver is ON.
if (SiteSettingsCategory.Type.AUTOPLAY == prefCategory
if ((SiteSettingsCategory.Type.CAMERA == prefCategory
|| SiteSettingsCategory.Type.MICROPHONE == prefCategory)
&& SiteSettingsCategory.createFromType(prefCategory)
.showPermissionBlockedMessage(getActivity())) {
// Show 'disabled' message when permission is not granted in Android.
p.setSummary(ContentSettingsResources.getCategorySummary(contentType, false));
} else if (SiteSettingsCategory.Type.AUTOPLAY == prefCategory
&& DataReductionProxySettings.getInstance().isDataReductionProxyEnabled()) {
// Disable autoplay preference if Data Saver is ON.
p.setSummary(ContentSettingsResources.getAutoplayDisabledByDataSaverSummary());
p.setEnabled(false);
} else if (SiteSettingsCategory.Type.COOKIES == prefCategory && checked
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment