Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43aae704 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Sharesheet - Photos -> Sharesheet in work profile crashes"

parents 327e8720 51ea0d68

core/java/com/android/internal/app/ChooserActivity.java

+0 −2
Original line number Original line Diff line number Diff line
@@ -938,8 +938,6 @@ public class ChooserActivity extends ResolverActivity { 
        if (isSendAction(in)) {

        if (isSendAction(in)) {

            in.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT |

            in.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT |

                    Intent.FLAG_ACTIVITY_MULTIPLE_TASK);

                    Intent.FLAG_ACTIVITY_MULTIPLE_TASK);



            in.fixUris(getUserId());

        }

        }

    }

    }

core/java/com/android/internal/app/IntentForwarderActivity.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -115,6 +115,7 @@ public class IntentForwarderActivity extends Activity { 
                // At this point, innerIntent is not null. Otherwise, canForward would have returned

                // At this point, innerIntent is not null. Otherwise, canForward would have returned

                // false.

                // false.

                innerIntent.prepareToLeaveUser(callingUserId);

                innerIntent.prepareToLeaveUser(callingUserId);

                innerIntent.fixUris(callingUserId);

            } else {

            } else {

                newIntent.prepareToLeaveUser(callingUserId);

                newIntent.prepareToLeaveUser(callingUserId);

            }

            }