diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-07-16 21:44:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-16 21:44:21 +0000 |
| commit | aaee5b5334746cabd59aed69153d08ecbb70ab1d (patch) | |
| tree | ff30538c4fa4226bcd385147be8f42a9240d035c /core/java/com | |
| parent | b09b84cafde5ac31f5ef5c79f7a78db540824471 (diff) | |
| parent | a7cfbe0e548ac76f20915b65851b8bc9095aa541 (diff) | |
| download | frameworks_base-aaee5b5334746cabd59aed69153d08ecbb70ab1d.zip frameworks_base-aaee5b5334746cabd59aed69153d08ecbb70ab1d.tar.gz frameworks_base-aaee5b5334746cabd59aed69153d08ecbb70ab1d.tar.bz2 | |
Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev
Diffstat (limited to 'core/java/com')
| -rw-r--r-- | core/java/com/android/internal/app/IntentForwarderActivity.java | 2 | ||||
| -rw-r--r-- | core/java/com/android/internal/app/ResolverActivity.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/com/android/internal/app/IntentForwarderActivity.java b/core/java/com/android/internal/app/IntentForwarderActivity.java index 233bee3..39b66aa 100644 --- a/core/java/com/android/internal/app/IntentForwarderActivity.java +++ b/core/java/com/android/internal/app/IntentForwarderActivity.java @@ -103,7 +103,7 @@ public class IntentForwarderActivity extends Activity { || ChooserActivity.class.getName().equals(ri.activityInfo.name)); try { - startActivityAsCaller(newIntent, null, targetUserId); + startActivityAsCaller(newIntent, null, false, targetUserId); } catch (RuntimeException e) { int launchedFromUid = -1; String launchedFromPackage = "?"; diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java index 7bc18f3..ba19131 100644 --- a/core/java/com/android/internal/app/ResolverActivity.java +++ b/core/java/com/android/internal/app/ResolverActivity.java @@ -973,7 +973,7 @@ public class ResolverActivity extends Activity { @Override public boolean startAsCaller(Activity activity, Bundle options, int userId) { - activity.startActivityAsCaller(mResolvedIntent, options, userId); + activity.startActivityAsCaller(mResolvedIntent, options, false, userId); return true; } |