commit d4a4ac717b9abda01e857738e25242b43241725a
author Kelvin Kwan <kelvinkwan@google.com> Wed Feb 26 21:59:33 2020 +0000
committer Kelvin Kwan <kelvinkwan@google.com> Thu Feb 27 15:27:19 2020 +0000
tree f16910d14f5bcf0287d51da7b4a14a068e2210f2
parent 73aacb48396b83a2b0417380eaf05ff0bce2e8d7

Use ResolveInfo#isCrossProfileIntentForwarderActivity in DocsUI

Bug: 150283377
Test: atest DocumentsUIGoogleTests
Change-Id: Ibfbaead63e0588a6e90ecc59f59dd9dfbb464dca

src/com/android/documentsui/UserIdManager.java

diff --git a/src/com/android/documentsui/UserIdManager.java b/src/com/android/documentsui/UserIdManager.java
index 2d80f8c..3458fd9 100644
--- a/src/com/android/documentsui/UserIdManager.java
+++ b/src/com/android/documentsui/UserIdManager.java
@@ -26,7 +26,6 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
-import android.os.Build;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.util.Log;
@@ -37,6 +36,7 @@
 
 import com.android.documentsui.base.Features;
 import com.android.documentsui.base.UserId;
+import com.android.documentsui.util.VersionUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -213,8 +213,7 @@
         private static boolean isDeviceSupported(Context context) {
             // The feature requires Android R DocumentsContract APIs and INTERACT_ACROSS_USERS
             // permission.
-            return (Build.VERSION.CODENAME.equals("R")
-                    || (Build.VERSION.CODENAME.equals("REL") && Build.VERSION.SDK_INT >= 30))
+            return VersionUtils.isAtLeastR()
                     && context.checkSelfPermission(Manifest.permission.INTERACT_ACROSS_USERS)
                     == PackageManager.PERMISSION_GRANTED;
         }