Flag off new Chooser behavior.
Bug: 119480958
Test: Manual
Change-Id: Ide635d08c128c48d8ec488f6d2d5b915e21e82f4
diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java
index 0f88722..46c6fa4 100644
--- a/core/java/com/android/internal/app/ResolverActivity.java
+++ b/core/java/com/android/internal/app/ResolverActivity.java
@@ -93,6 +93,9 @@
@UiThread
public class ResolverActivity extends Activity {
+ // Temporary flag for new chooser delegate behavior.
+ boolean mEnableChooserDelegate = false;
+
protected ResolveListAdapter mAdapter;
private boolean mSafeForwardingMode;
private AbsListView mAdapterView;
@@ -1216,7 +1219,13 @@
@Override
public boolean startAsCaller(ResolverActivity activity, Bundle options, int userId) {
- return activity.startAsCallerImpl(mResolvedIntent, options, false, userId);
+
+ if (mEnableChooserDelegate) {
+ return activity.startAsCallerImpl(mResolvedIntent, options, false, userId);
+ } else {
+ activity.startActivityAsCaller(mResolvedIntent, options, null, false, userId);
+ return true;
+ }
}
@Override