Merge "Null checker in AuthController" into udc-qpr-dev

This commit is contained in:
Treehugger Robot
2023-06-08 21:38:13 +00:00
committed by Android (Google) Code Review

View File

@@ -242,15 +242,17 @@ public class AuthController implements CoreStartable, CommandQueue.Callbacks,
}
private boolean isOwnerInForeground() {
final String clientPackage = mCurrentDialog.getOpPackageName();
final List<ActivityManager.RunningTaskInfo> runningTasks =
mActivityTaskManager.getTasks(1);
if (!runningTasks.isEmpty()) {
final String topPackage = runningTasks.get(0).topActivity.getPackageName();
if (!topPackage.contentEquals(clientPackage)
&& !Utils.isSystem(mContext, clientPackage)) {
Log.w(TAG, "Evicting client due to: " + topPackage);
return false;
if (mCurrentDialog != null) {
final String clientPackage = mCurrentDialog.getOpPackageName();
final List<ActivityManager.RunningTaskInfo> runningTasks =
mActivityTaskManager.getTasks(1);
if (!runningTasks.isEmpty()) {
final String topPackage = runningTasks.get(0).topActivity.getPackageName();
if (!topPackage.contentEquals(clientPackage)
&& !Utils.isSystem(mContext, clientPackage)) {
Log.w(TAG, "Evicting client due to: " + topPackage);
return false;
}
}
}
return true;