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

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

Browse Source 
* commit 'ac7774e8c13e5e2881a588012b8710ad3947169c':
  Do not fix uris inside the system.
This commit is contained in:
Nicolas Prevot
2014-11-04 10:51:13 +00:00
committed by Android Git Automerger
parent 9ceafdb794 ac7774e8c1
commit 7ca8674f66
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/content/Intent.java
View File

@@ -41,6 +41,7 @@ import android.os.Bundle;
import android.os.IBinder; import android.os.IBinder;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import android.os.Process;
import android.os.StrictMode; import android.os.StrictMode;
import android.os.UserHandle; import android.os.UserHandle;
import android.provider.DocumentsContract; import android.provider.DocumentsContract;
@@ -7498,10 +7499,12 @@ public class Intent implements Parcelable, Cloneable {
*/ */
public void prepareToEnterProcess() { public void prepareToEnterProcess() {
if (mContentUserHint != UserHandle.USER_CURRENT) { if (mContentUserHint != UserHandle.USER_CURRENT) {
if (UserHandle.getAppId(Process.myUid()) != Process.SYSTEM_UID) {
fixUris(mContentUserHint); fixUris(mContentUserHint);
mContentUserHint = UserHandle.USER_CURRENT; mContentUserHint = UserHandle.USER_CURRENT;
} }
} }
}
/** /**
* @hide * @hide