From 9cd2e62612033dbe6817f2cbb3e76c6dce191e6b Mon Sep 17 00:00:00 2001 From: Bryce Lee Date: Thu, 19 Mar 2015 13:27:26 -0700 Subject: Fix wrong intent being passed in PhoneWindowManager. When starting going home for Wear, the intent extra indicating the intent is coming from a button press must be set. This was lost during a merge conflict resolution. Bug: 19832892 Change-Id: I6b77757b34f99dd754194448fdea9165690fc90f --- policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'policy') diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index dfc5a77..4664aa3 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -5943,7 +5943,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { intent = mHomeIntent; } - startActivityAsUser(mHomeIntent, UserHandle.CURRENT); + startActivityAsUser(intent, UserHandle.CURRENT); } /** -- cgit v1.1