Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Also call Intent#fixUris for the intent resolver case" into rvc-dev am: 31a2e1ba46

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11689597

Change-Id: Ia6db57986cf4d5f37108afaca66b00fe3ffc06d1
This commit is contained in:
TreeHugger Robot
2020-06-03 19:18:42 +00:00
committed by Automerger Merge Worker
parent 3e7ea78d42 31a2e1ba46
commit 7b69285f87
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/com/android/internal/app/ChooserActivity.java
View File

@@ -3043,10 +3043,6 @@ public class ChooserActivity extends ResolverActivity implements
currentRootAdapter.updateDirectShareExpansion(); currentRootAdapter.updateDirectShareExpansion();
} }
void prepareIntentForCrossProfileLaunch(Intent intent) {
intent.fixUris(UserHandle.myUserId());
}
@Override @Override
protected WindowInsets onApplyWindowInsets(View v, WindowInsets insets) { protected WindowInsets onApplyWindowInsets(View v, WindowInsets insets) {
if (shouldShowTabs()) { if (shouldShowTabs()) {

4
core/java/com/android/internal/app/ResolverActivity.java
View File

@@ -1250,7 +1250,9 @@ public class ResolverActivity extends Activity implements
return true; return true;
} }
void prepareIntentForCrossProfileLaunch(Intent intent) {} private void prepareIntentForCrossProfileLaunch(Intent intent) {
intent.fixUris(UserHandle.myUserId());
}
private boolean isLaunchingTargetInOtherProfile() { private boolean isLaunchingTargetInOtherProfile() {
return mMultiProfilePagerAdapter.getCurrentUserHandle().getIdentifier() return mMultiProfilePagerAdapter.getCurrentUserHandle().getIdentifier()