diff options
| author | Bryce Lee <brycelee@google.com> | 2015-03-19 13:27:26 -0700 |
|---|---|---|
| committer | Bryce Lee <brycelee@google.com> | 2015-03-19 13:27:26 -0700 |
| commit | 9cd2e62612033dbe6817f2cbb3e76c6dce191e6b (patch) | |
| tree | 0e11dcb732a3ec1923650b4b5686714d536fe5f8 /policy | |
| parent | 3f782ad156d337c7c6c542696ddc67ae82fa7a84 (diff) | |
| download | frameworks_base-9cd2e62612033dbe6817f2cbb3e76c6dce191e6b.zip frameworks_base-9cd2e62612033dbe6817f2cbb3e76c6dce191e6b.tar.gz frameworks_base-9cd2e62612033dbe6817f2cbb3e76c6dce191e6b.tar.bz2 | |
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
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
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); } /** |