commit 576bf2a12d3249b7af2cad918b95faa65a8d175d
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 04 09:14:36 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Mar 04 09:14:36 2020 +0000
tree af4e191a61ab7a7ae4d04493bb8eae2135537ea8
parent 0ff6b9ab290a31e12aebf1ef06d34bce8cb2448e
parent 4d9ba6fe33b93f433df39a91dcddc3e10251ede9

Use Process.myUserHandle to instead of wrong uid am: 4d9ba6fe33

Change-Id: Ie26c1af1cf71d6cc58eec364bfac9ffd8c868fce

src/com/android/documentsui/base/Shared.java

diff --git a/src/com/android/documentsui/base/Shared.java b/src/com/android/documentsui/base/Shared.java
index d4fd027..8c3a11a 100644
--- a/src/com/android/documentsui/base/Shared.java
+++ b/src/com/android/documentsui/base/Shared.java
@@ -32,7 +32,7 @@
 import android.content.res.Configuration;
 import android.net.Uri;
 import android.os.Looper;
-import android.os.UserHandle;
+import android.os.Process;
 import android.provider.DocumentsContract;
 import android.provider.Settings;
 import android.text.TextUtils;
@@ -171,13 +171,11 @@
      */
     public static boolean shouldRestrictStorageAccessFramework(Activity activity) {
         final String packageName = getCallingPackageName(activity);
-        final int uid = UserId.CURRENT_USER.getIdentifier();
         final boolean ret = CompatChanges.isChangeEnabled(RESTRICT_STORAGE_ACCESS_FRAMEWORK,
-                packageName, UserHandle.getUserHandleForUid(uid));
+                packageName, Process.myUserHandle());
 
         Log.d(TAG,
-                "shouldRestrictStorageAccessFramework = " + ret + ", packageName = " + packageName
-                        + " with user = " + uid);
+                "shouldRestrictStorageAccessFramework = " + ret + ", packageName = " + packageName);
 
         return ret;
     }