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

Merge changes I30579090,I7a725647 into tm-dev am: fb0f85333c

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21253698

Change-Id: If36c790c85a488f7249047832b344f60788fd727
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-04 06:17:11 +00:00
committed by Automerger Merge Worker
parent 1f8e607935 fb0f85333c
commit c351acabe5
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
services/core/java/com/android/server/pm/permission/OneTimePermissionUserManager.java
View File

@@ -18,6 +18,7 @@ package com.android.server.pm.permission;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.app.ActivityManager; import android.app.ActivityManager;
import android.app.ActivityManagerInternal;
import android.app.AlarmManager; import android.app.AlarmManager;
import android.app.IActivityManager; import android.app.IActivityManager;
import android.app.IUidObserver; import android.app.IUidObserver;
@@ -34,6 +35,7 @@ import android.util.Log;
import android.util.SparseArray; import android.util.SparseArray;
import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.GuardedBy;
import com.android.server.LocalServices;
/** /**
* Class that handles one-time permissions for a user * Class that handles one-time permissions for a user
@@ -49,6 +51,7 @@ public class OneTimePermissionUserManager {
private final @NonNull Context mContext; private final @NonNull Context mContext;
private final @NonNull IActivityManager mIActivityManager; private final @NonNull IActivityManager mIActivityManager;
private final @NonNull ActivityManagerInternal mActivityManagerInternal;
private final @NonNull AlarmManager mAlarmManager; private final @NonNull AlarmManager mAlarmManager;
private final @NonNull PermissionControllerManager mPermissionControllerManager; private final @NonNull PermissionControllerManager mPermissionControllerManager;
@@ -79,6 +82,7 @@ public class OneTimePermissionUserManager {
OneTimePermissionUserManager(@NonNull Context context) { OneTimePermissionUserManager(@NonNull Context context) {
mContext = context; mContext = context;
mIActivityManager = ActivityManager.getService(); mIActivityManager = ActivityManager.getService();
mActivityManagerInternal = LocalServices.getService(ActivityManagerInternal.class);
mAlarmManager = context.getSystemService(AlarmManager.class); mAlarmManager = context.getSystemService(AlarmManager.class);
mPermissionControllerManager = context.getSystemService(PermissionControllerManager.class); mPermissionControllerManager = context.getSystemService(PermissionControllerManager.class);
mHandler = context.getMainThreadHandler(); mHandler = context.getMainThreadHandler();
@@ -241,12 +245,7 @@ public class OneTimePermissionUserManager {
} }
private int getCurrentState() { private int getCurrentState() {
try { return getStateFromProcState(mActivityManagerInternal.getUidProcessState(mUid));
return getStateFromProcState(mIActivityManager.getUidProcessState(mUid, null));
} catch (RemoteException e) {
Log.e(LOG_TAG, "Couldn't check uid proc state", e);
}
return STATE_GONE;
} }
private int getStateFromProcState(int procState) { private int getStateFromProcState(int procState) {