summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorJoe Fernandez <joefernandez@google.com>2015-01-31 04:25:18 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-01-31 04:25:18 +0000
commit7a0e01d41a027235fe986c945441ff11b19176a3 (patch)
treee0bbf86a85e8c13cede6ecb1bae56858c12eeeed /docs
parentb4506586dc4374697220408a63b6a5b293cb89f4 (diff)
parent14437e4781fea9688b7c68ec6c3201e8a926ab04 (diff)
downloadframeworks_base-7a0e01d41a027235fe986c945441ff11b19176a3.zip
frameworks_base-7a0e01d41a027235fe986c945441ff11b19176a3.tar.gz
frameworks_base-7a0e01d41a027235fe986c945441ff11b19176a3.tar.bz2
am 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs automerge: f02a8d9 automerge: cacf7da automerge: 346a9a2 automerge: f4b2bd4
automerge: 14437e4 * commit '14437e4781fea9688b7c68ec6c3201e8a926ab04': docs: training intent doc error update
Diffstat (limited to 'docs')
-rw-r--r--docs/html/training/basics/intents/sending.jd3
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/html/training/basics/intents/sending.jd b/docs/html/training/basics/intents/sending.jd
index 4698ba1..b9463e4 100644
--- a/docs/html/training/basics/intents/sending.jd
+++ b/docs/html/training/basics/intents/sending.jd
@@ -153,7 +153,8 @@ java.util.List} is not empty, you can safely use the intent. For example:</p>
<pre>
PackageManager packageManager = {@link android.content.Context#getPackageManager()};
-List&lt;ResolveInfo> activities = packageManager.queryIntentActivities(intent, 0);
+List<ResolveInfo> activities = packageManager.queryIntentActivities(intent,
+ PackageManager.MATCH_DEFAULT_ONLY);
boolean isIntentSafe = activities.size() > 0;
</pre>