Merge "Convert tests mk file to bp."
diff --git a/src/com/android/phone/euicc/EuiccUiDispatcherActivity.java b/src/com/android/phone/euicc/EuiccUiDispatcherActivity.java
index 4c85818..96f04e1 100644
--- a/src/com/android/phone/euicc/EuiccUiDispatcherActivity.java
+++ b/src/com/android/phone/euicc/EuiccUiDispatcherActivity.java
@@ -27,6 +27,7 @@
import android.os.Bundle;
import android.os.RemoteException;
import android.os.ServiceManager;
+import android.os.UserHandle;
import android.service.euicc.EuiccService;
import android.telephony.euicc.EuiccManager;
import android.util.Log;
@@ -138,7 +139,7 @@
protected void grantDefaultPermissionsToActiveLuiApp(ActivityInfo activityInfo) {
try {
mPackageManager.grantDefaultPermissionsToActiveLuiApp(
- activityInfo.packageName, getUserId());
+ activityInfo.packageName, UserHandle.myUserId());
} catch (RemoteException e) {
Log.e(TAG, "Failed to grant permissions to active LUI app.", e);
}
@@ -150,7 +151,8 @@
try {
Set<String> luiApps = getAllLuiAppPackageNames(intent);
String[] luiAppsArray = luiApps.toArray(new String[luiApps.size()]);
- mPackageManager.revokeDefaultPermissionsFromLuiApps(luiAppsArray, getUserId());
+ mPackageManager.revokeDefaultPermissionsFromLuiApps(luiAppsArray,
+ UserHandle.myUserId());
} catch (RemoteException e) {
Log.e(TAG, "Failed to revoke LUI app permissions.");
throw new RuntimeException(e);