OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3bab7c1
7d7808f
)
Merge changes Ia6fe9724,I682b9acb into lmp-dev
author
Craig Mautner
<cmautner@google.com>
Fri, 12 Sep 2014 01:45:27 +0000
(
01:45
+0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Fri, 12 Sep 2014 01:45:29 +0000
(
01:45
+0000)
* changes:
Show all windows from activity that hides keyguard
Make sure FLAG_DISMISS_KEYGUARD brings up bouncer
1
2
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/wm/WindowAnimator.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
Simple merge
diff --cc
services/core/java/com/android/server/wm/WindowAnimator.java
Simple merge
OSDN Git Service
