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

Commit f6319c7e authored by Nicolas Prevot's avatar Nicolas Prevot Committed by Android Git Automerger
Browse files

am b01a483e: am 7ca8674f: am ac7774e8: Merge "Do not fix uris inside the system." into lmp-mr1-dev 

* commit 'b01a483e':
  Do not fix uris inside the system.
parents 9ce01394 b01a483e

core/java/android/content/Intent.java

+5 −2
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import android.os.Bundle; 
import android.os.IBinder;

import android.os.Parcel;

import android.os.Parcelable;

import android.os.Process;

import android.os.StrictMode;

import android.os.UserHandle;

import android.provider.DocumentsContract;
@@ -7498,10 +7499,12 @@ public class Intent implements Parcelable, Cloneable { 
     */

    public void prepareToEnterProcess() {

        if (mContentUserHint != UserHandle.USER_CURRENT) {

            if (UserHandle.getAppId(Process.myUid()) != Process.SYSTEM_UID) {

                fixUris(mContentUserHint);

                mContentUserHint = UserHandle.USER_CURRENT;

            }

        }

    }



    /**

     * @hide