summaryrefslogtreecommitdiffstats
path: root/core/java/com
diff options
context:
space:
mode:
authorNicolas Prevot <nprevot@google.com>2015-01-22 10:22:05 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-01-22 10:22:08 +0000
commitad44f7448f0b9aa672cad21300f436e369c8105d (patch)
tree5a00b48691d713df193e8ada25c8265d14579cd3 /core/java/com
parent147cf4b8c4345f2d086251313583888356317d2d (diff)
parentdaf92066db6b3934e71277b0290b7149740198de (diff)
downloadframeworks_base-ad44f7448f0b9aa672cad21300f436e369c8105d.zip
frameworks_base-ad44f7448f0b9aa672cad21300f436e369c8105d.tar.gz
frameworks_base-ad44f7448f0b9aa672cad21300f436e369c8105d.tar.bz2
Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-mr1-dev
Diffstat (limited to 'core/java/com')
-rw-r--r--core/java/com/android/internal/app/ResolverActivity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java
index 661acbe..649a59f 100644
--- a/core/java/com/android/internal/app/ResolverActivity.java
+++ b/core/java/com/android/internal/app/ResolverActivity.java
@@ -343,7 +343,7 @@ public class ResolverActivity extends Activity implements AdapterView.OnItemClic
}
final Intent intent = intentForDisplayResolveInfo(dri);
- onIntentSelected(dri.ri, intent, mAlwaysUseOption);
+ onIntentSelected(dri.ri, intent, false);
finish();
}
});