summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2010-10-11 17:26:51 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-11 17:26:51 -0700
commitf2e0681ada3ffe1de994a51dcebd6ef045d27434 (patch)
treec6f8e837d2091a890fb3d9d2882b3a534b190625 /core/java/android
parentd965724fdcc63a070657518542559a8b1a35a70d (diff)
parent1da8d4d1697cec871dea8c30dad67e90db10bde6 (diff)
am 1da8d4d1: Merge "Fix an event injection bug when the policy is bypassed." into gingerbread
Merge commit '1da8d4d1697cec871dea8c30dad67e90db10bde6' into gingerbread-plus-aosp * commit '1da8d4d1697cec871dea8c30dad67e90db10bde6': Fix an event injection bug when the policy is bypassed.
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/view/WindowManagerPolicy.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/view/WindowManagerPolicy.java b/core/java/android/view/WindowManagerPolicy.java
index ef7716e979ef..1fd31a3ac33e 100644
--- a/core/java/android/view/WindowManagerPolicy.java
+++ b/core/java/android/view/WindowManagerPolicy.java
@@ -77,6 +77,7 @@ public interface WindowManagerPolicy {
public final static int FLAG_VIRTUAL = 0x00000100;
public final static int FLAG_INJECTED = 0x01000000;
+ public final static int FLAG_TRUSTED = 0x02000000;
public final static int FLAG_WOKE_HERE = 0x10000000;
public final static int FLAG_BRIGHT_HERE = 0x20000000;