Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Assist app is not launched when long-pressing on Home key"

Browse Source 
am: 1e41bb4887

Change-Id: I3d88e9116c45cec013c4b7a3bb3f53480f0f2af6
This commit is contained in:
Adrian Roos
2016-12-16 00:01:24 +00:00
committed by android-build-merger
parent e67395a97a 1e41bb4887
commit d81fde40ef
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/assist/AssistManager.java
View File

@@ -31,6 +31,7 @@ import android.widget.ImageView;
import com.android.internal.app.AssistUtils; import com.android.internal.app.AssistUtils;
import com.android.internal.app.IVoiceInteractionSessionListener; import com.android.internal.app.IVoiceInteractionSessionListener;
import com.android.internal.app.IVoiceInteractionSessionShowCallback; import com.android.internal.app.IVoiceInteractionSessionShowCallback;
import com.android.keyguard.KeyguardUpdateMonitor;
import com.android.systemui.R; import com.android.systemui.R;
import com.android.systemui.statusbar.BaseStatusBar; import com.android.systemui.statusbar.BaseStatusBar;
import com.android.systemui.statusbar.CommandQueue; import com.android.systemui.statusbar.CommandQueue;
@@ -282,7 +283,7 @@ public class AssistManager {
@Nullable @Nullable
private ComponentName getAssistInfo() { private ComponentName getAssistInfo() {
return mAssistUtils.getAssistComponentForUser(UserHandle.USER_CURRENT); return mAssistUtils.getAssistComponentForUser(KeyguardUpdateMonitor.getCurrentUser());
} }
public void showDisclosure() { public void showDisclosure() {