summaryrefslogtreecommitdiffstats
path: root/docs/html
diff options
context:
space:
mode:
authorJoe Fernandez <joefernandez@google.com>2015-01-31 04:20:19 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-01-31 04:20:19 +0000
commit14437e4781fea9688b7c68ec6c3201e8a926ab04 (patch)
treec51d4e51c1b62067dd3a4fee8c942734d9541d37 /docs/html
parentdf5a1987108539c703477adff3749d647ba313c5 (diff)
parentf4b2bd4c41233327f0fb2e4d45af8dc9c8eba689 (diff)
downloadframeworks_base-14437e4781fea9688b7c68ec6c3201e8a926ab04.zip
frameworks_base-14437e4781fea9688b7c68ec6c3201e8a926ab04.tar.gz
frameworks_base-14437e4781fea9688b7c68ec6c3201e8a926ab04.tar.bz2
am 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs automerge: f02a8d9 automerge: cacf7da automerge: 346a9a2
automerge: f4b2bd4 * commit 'f4b2bd4c41233327f0fb2e4d45af8dc9c8eba689': docs: training intent doc error update
Diffstat (limited to 'docs/html')
-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>