Null checker in AuthController

Test: N/A
Fixes: 286312166
Change-Id: I63abe76ce3a30f5516e46c732307529e07a44391
This commit is contained in:
Diya Bera
2023-06-08 09:43:46 -07:00
parent 6f7805292a
commit 3e24239989

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;