summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorSander Alewijnse <salewijnse@google.com>2015-03-10 17:51:57 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-03-10 17:51:59 +0000
commit94ac7556a6def9cacd85267fe69dfe3258e6cf67 (patch)
treebe2ff44f409c8b59499b53d7387d607430e46753 /core
parentd5800c06827fa051d66adcbbc90bfb459e4f2755 (diff)
parent053d3ddd400a13838c132129a03e56dae0db93d8 (diff)
downloadframeworks_base-94ac7556a6def9cacd85267fe69dfe3258e6cf67.zip
frameworks_base-94ac7556a6def9cacd85267fe69dfe3258e6cf67.tar.gz
frameworks_base-94ac7556a6def9cacd85267fe69dfe3258e6cf67.tar.bz2
Merge "Do not show toast when forwarding from resolver activity to itself."
Diffstat (limited to 'core')
-rw-r--r--core/java/com/android/internal/app/ResolverActivity.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java
index a410e45..3ceea9d 100644
--- a/core/java/com/android/internal/app/ResolverActivity.java
+++ b/core/java/com/android/internal/app/ResolverActivity.java
@@ -342,6 +342,9 @@ public class ResolverActivity extends Activity implements AdapterView.OnItemClic
return;
}
+ // Do not show the profile switch message anymore.
+ mProfileSwitchMessageId = -1;
+
final Intent intent = intentForDisplayResolveInfo(dri);
onIntentSelected(dri.ri, intent, false);
finish();