Commit 0d52e5b0 authored by Troy Hildebrandt's avatar Troy Hildebrandt Committed by Commit Bot

Fix issue with microphone button doing nothing in search widget.

The new LocationBarVoiceRecognitionHandler was using Tab's #getActivity
instead of using WindowAndroid's #getActivity. In the search widget,
Tab's getActivity returned null and exited #startVoiceRecognition
early.

This fix just gets the WindowAndroid from the Tab first and then uses
its activity and all is well.

Bug: 828309
Change-Id: I05b68b0228d1c5f962ee1ee2fa23675ccaa5b6db
Reviewed-on: https://chromium-review.googlesource.com/992992Reviewed-by: default avatarMaria Khomenko <mariakhomenko@chromium.org>
Commit-Queue: Troy Hildebrandt <thildebr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#547750}
parent 0fbc9c8e
...@@ -201,10 +201,11 @@ public class LocationBarVoiceRecognitionHandler { ...@@ -201,10 +201,11 @@ public class LocationBarVoiceRecognitionHandler {
public void startVoiceRecognition(@VoiceInteractionSource int source) { public void startVoiceRecognition(@VoiceInteractionSource int source) {
Tab tab = getCurrentTab(); Tab tab = getCurrentTab();
if (tab == null) return; if (tab == null) return;
Activity activity = tab.getActivity(); WindowAndroid windowAndroid = tab.getWindowAndroid();
if (windowAndroid == null) return;
Activity activity = windowAndroid.getActivity().get();
if (activity == null) return; if (activity == null) return;
WindowAndroid windowAndroid = tab.getWindowAndroid();
if (!windowAndroid.hasPermission(Manifest.permission.RECORD_AUDIO)) { if (!windowAndroid.hasPermission(Manifest.permission.RECORD_AUDIO)) {
if (windowAndroid.canRequestPermission(Manifest.permission.RECORD_AUDIO)) { if (windowAndroid.canRequestPermission(Manifest.permission.RECORD_AUDIO)) {
WindowAndroid.PermissionCallback callback = new WindowAndroid.PermissionCallback() { WindowAndroid.PermissionCallback callback = new WindowAndroid.PermissionCallback() {
......
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