Use current user handle instead of owner user

Bug: 128438338
Test: build and test on AAE and Pixel devices; verify if all missing
permissions are granted

Change-Id: Ieed3e8fdd1fb44f1e6800514dcccf6dc8673cd59

1 files changed, 3 insertions, 2 deletions

diff --git a/utils/permissions/src/com/android/permissionutils/GrantPermissionUtil.java b/utils/permissions/src/com/android/permissionutils/GrantPermissionUtil.java
index d76995008..1ce23450e 100644
--- a/utils/permissions/src/com/android/permissionutils/GrantPermissionUtil.java
+++ b/utils/permissions/src/com/android/permissionutils/GrantPermissionUtil.java
@@ -16,12 +16,13 @@
 
 package com.android.permissionutils;
 
+import static android.os.Process.myUserHandle;
+
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.PermissionInfo;
-import android.os.UserHandle;
 import android.util.Log;
 import java.util.ArrayList;
 import java.util.List;
@@ -38,7 +39,7 @@ public class GrantPermissionUtil {
             List<String> missingPermissions = getMissingPermissions(context, pkgInfo);
             if (!missingPermissions.isEmpty()) {
                 for (String permission : missingPermissions) {
-                    pm.grantRuntimePermission(pkgInfo.packageName, permission, UserHandle.OWNER);
+                    pm.grantRuntimePermission(pkgInfo.packageName, permission, myUserHandle());
                 }
             }
         }