summaryrefslogtreecommitdiffstats
path: root/policy
diff options
context:
space:
mode:
authorVeeti Paananen <veeti.paananen@rojekti.fi>2013-06-20 20:46:37 +0300
committerGerrit Code Review <gerrit@cyanogenmod.org>2013-07-03 12:58:58 -0700
commit37a9afbc47903cd01e6cefe9512c03641c9fbfad (patch)
treefa35e791e95aead4ed2e5b87d76ee1e58ce4a790 /policy
parent8db50fec8162d71900547194e9333b5211498fb4 (diff)
downloadframeworks_base-37a9afbc47903cd01e6cefe9512c03641c9fbfad.zip
frameworks_base-37a9afbc47903cd01e6cefe9512c03641c9fbfad.tar.gz
frameworks_base-37a9afbc47903cd01e6cefe9512c03641c9fbfad.tar.bz2
Ignore null stylus gesture settings
If the user performs a stylus gesture that has not been configured in the settings at all, the gesture filter would incorrectly interpret the setting's null value as an app launch action. Change-Id: If7f600a688bb7b5e0a9a2e912c3d6183a9c9a69e
Diffstat (limited to 'policy')
-rw-r--r--policy/src/com/android/internal/policy/impl/PhoneWindow.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
index bde50e0..0fb1804 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java
@@ -2079,6 +2079,10 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
return;
}
+ if (setting == null) {
+ return;
+ }
+
try {
int value = Integer.valueOf(setting);
if (value == StylusGestureFilter.KEY_NO_ACTION) {