summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorNicolas Prevot <nprevot@google.com>2015-01-22 10:37:56 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-01-22 10:37:56 +0000
commit8b5daa6be2c74cdd9d1a0e8aee60eb82d66c3f99 (patch)
treee8f5e0d759b4096e32f25712df8d445b367d0e5c /core
parenta925f99678e7126f1659d030d590ad5fdccf3e3c (diff)
parent2cb240e083ddf8e700d04cae6d243d2aab4d65e4 (diff)
downloadframeworks_base-8b5daa6be2c74cdd9d1a0e8aee60eb82d66c3f99.zip
frameworks_base-8b5daa6be2c74cdd9d1a0e8aee60eb82d66c3f99.tar.gz
frameworks_base-8b5daa6be2c74cdd9d1a0e8aee60eb82d66c3f99.tar.bz2
am 3677117d: Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-mr1-dev automerge: ad44f74
automerge: 2cb240e * commit '2cb240e083ddf8e700d04cae6d243d2aab4d65e4': Never set "Work" or "Personal apps" as prefered activities.
Diffstat (limited to 'core')
-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();
}
});