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

Merge "Merge "Also call Intent#fixUris for the intent resolver case" into rvc-dev am: 31a2e1ba46 am: a825b17dfe" into rvc-d1-dev-plus-aosp am: 3cfe1e9bf4

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

Change-Id: Ia5ef5495ded5a261bea8e735d2e56c08178c36e5
This commit is contained in:
Automerger Merge Worker
2020-06-03 19:36:30 +00:00
parent e573293a37 3cfe1e9bf4
commit 803648e9a4
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();
}
void prepareIntentForCrossProfileLaunch(Intent intent) {
intent.fixUris(UserHandle.myUserId());
}
@Override
protected WindowInsets onApplyWindowInsets(View v, WindowInsets insets) {
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;
}
void prepareIntentForCrossProfileLaunch(Intent intent) {}
private void prepareIntentForCrossProfileLaunch(Intent intent) {
intent.fixUris(UserHandle.myUserId());
}
private boolean isLaunchingTargetInOtherProfile() {
return mMultiProfilePagerAdapter.getCurrentUserHandle().getIdentifier()