summaryrefslogtreecommitdiffstats
path: root/core/java/com
diff options
context:
space:
mode:
authorNicolas Prevot <nprevot@google.com>2015-01-22 10:32:30 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-22 10:32:30 +0000
commit2cb240e083ddf8e700d04cae6d243d2aab4d65e4 (patch)
treebdc34ef6f1dd029a0f56128114eba8bbf659381b /core/java/com
parent61b07b4016ebdbfe7215c0cc03fd65ddf55c6703 (diff)
parent3677117d2bc8b703ccad4eff5914a61508922dd6 (diff)
downloadframeworks_base-2cb240e083ddf8e700d04cae6d243d2aab4d65e4.zip
frameworks_base-2cb240e083ddf8e700d04cae6d243d2aab4d65e4.tar.gz
frameworks_base-2cb240e083ddf8e700d04cae6d243d2aab4d65e4.tar.bz2
am 3677117d: Merge "Never set "Work" or "Personal apps" as prefered activities." into lmp-mr1-dev automerge: ad44f74
* commit '3677117d2bc8b703ccad4eff5914a61508922dd6': Never set "Work" or "Personal apps" as prefered activities.
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();
}
});