summaryrefslogtreecommitdiffstats
path: root/policy/src
diff options
context:
space:
mode:
authorBryce Lee <brycelee@google.com>2015-03-19 21:30:43 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-19 21:30:43 +0000
commitb45d3926f327948c486c92ddc7fdb97dbc98e401 (patch)
tree0cffdf6877c2556f3906b10ced5ce89c63f43317 /policy/src
parent33e84c167863745514b56b97c391f8d8913ca05e (diff)
parent8320cf2de357265179c3007256394b0cbb69d949 (diff)
downloadframeworks_base-b45d3926f327948c486c92ddc7fdb97dbc98e401.zip
frameworks_base-b45d3926f327948c486c92ddc7fdb97dbc98e401.tar.gz
frameworks_base-b45d3926f327948c486c92ddc7fdb97dbc98e401.tar.bz2
am 8320cf2d: Merge "Fix wrong intent being passed in PhoneWindowManager." into lmp-mr1-modular-dev
* commit '8320cf2de357265179c3007256394b0cbb69d949': Fix wrong intent being passed in PhoneWindowManager.
Diffstat (limited to 'policy/src')
-rw-r--r--policy/src/com/android/internal/policy/impl/PhoneWindowManager.java2
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 0e3d7ae..13647cf 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -5944,7 +5944,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
intent = mHomeIntent;
}
- startActivityAsUser(mHomeIntent, UserHandle.CURRENT);
+ startActivityAsUser(intent, UserHandle.CURRENT);
}
/**