summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorGilles Debunne <debunne@google.com>2011-01-25 13:07:22 -0800
committerGilles Debunne <debunne@google.com>2011-01-25 13:40:06 -0800
commitd9ed795ca51c57427ad27f246d5ec19f89ff508d (patch)
tree5393c0bd2125a3843bdd08cf6e8922ea0633a02d /core
parentaaa55d3f45744814907d0809befb49281ced462e (diff)
downloadframeworks_base-d9ed795ca51c57427ad27f246d5ec19f89ff508d.zip
frameworks_base-d9ed795ca51c57427ad27f246d5ec19f89ff508d.tar.gz
frameworks_base-d9ed795ca51c57427ad27f246d5ec19f89ff508d.tar.bz2
Fix for a call to startActivity from outside of an app.
Bug 3246715 Regression introduced by https://android-git.corp.google.com/g/#change,86174 Change-Id: Icba170746d196386bd9b0309582f724cb076d937
Diffstat (limited to 'core')
-rw-r--r--core/java/android/text/method/LinkMovementMethod.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/text/method/LinkMovementMethod.java b/core/java/android/text/method/LinkMovementMethod.java
index 9e73371..aff233d 100644
--- a/core/java/android/text/method/LinkMovementMethod.java
+++ b/core/java/android/text/method/LinkMovementMethod.java
@@ -42,9 +42,9 @@ public class LinkMovementMethod extends ScrollingMovementMethod {
case KeyEvent.KEYCODE_DPAD_CENTER:
case KeyEvent.KEYCODE_ENTER:
if (KeyEvent.metaStateHasNoModifiers(movementMetaState)) {
- if (event.getAction() == KeyEvent.ACTION_DOWN
- && event.getRepeatCount() == 0) {
- return action(CLICK, widget, buffer);
+ if (event.getAction() == KeyEvent.ACTION_DOWN &&
+ event.getRepeatCount() == 0 && action(CLICK, widget, buffer)) {
+ return true;
}
}
break;