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

Merge "Fix null pointer exception" into tm-qpr-dev am: 56b94f24fc am: a9228bfc55

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

Change-Id: I5a0afe59a81088a101cd1ff4ceae200a2c64a336
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Vincent Wang
2022-09-22 03:44:52 +00:00
committed by Automerger Merge Worker
parent 7f4aa09e17 a9228bfc55
commit 48fb8029a5
1 changed files with 43 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java
View File

@@ -373,18 +373,14 @@ public class AuthController extends CoreStartable implements CommandQueue.Callba
@Override
public void onTryAgainPressed(long requestId) {
if (mReceiver == null) {
Log.e(TAG, "onTryAgainPressed: Receiver is null");
return;
}
if (requestId != mCurrentDialog.getRequestId()) {
Log.w(TAG, "requestId doesn't match, skip onTryAgainPressed");
final IBiometricSysuiReceiver receiver = getCurrentReceiver(requestId);
if (receiver == null) {
Log.w(TAG, "Skip onTryAgainPressed");
return;
}
try {
mReceiver.onTryAgainPressed();
receiver.onTryAgainPressed();
} catch (RemoteException e) {
Log.e(TAG, "RemoteException when handling try again", e);
}
@@ -392,18 +388,14 @@ public class AuthController extends CoreStartable implements CommandQueue.Callba
@Override
public void onDeviceCredentialPressed(long requestId) {
if (mReceiver == null) {
Log.e(TAG, "onDeviceCredentialPressed: Receiver is null");
return;
}
if (requestId != mCurrentDialog.getRequestId()) {
Log.w(TAG, "requestId doesn't match, skip onDeviceCredentialPressed");
final IBiometricSysuiReceiver receiver = getCurrentReceiver(requestId);
if (receiver == null) {
Log.w(TAG, "Skip onDeviceCredentialPressed");
return;
}
try {
mReceiver.onDeviceCredentialPressed();
receiver.onDeviceCredentialPressed();
} catch (RemoteException e) {
Log.e(TAG, "RemoteException when handling credential button", e);
}
@@ -411,18 +403,14 @@ public class AuthController extends CoreStartable implements CommandQueue.Callba
@Override
public void onSystemEvent(int event, long requestId) {
if (mReceiver == null) {
Log.e(TAG, "onSystemEvent(" + event + "): Receiver is null");
return;
}
if (requestId != mCurrentDialog.getRequestId()) {
Log.w(TAG, "requestId doesn't match, skip onSystemEvent");
final IBiometricSysuiReceiver receiver = getCurrentReceiver(requestId);
if (receiver == null) {
Log.w(TAG, "Skip onSystemEvent");
return;
}
try {
mReceiver.onSystemEvent(event);
receiver.onSystemEvent(event);
} catch (RemoteException e) {
Log.e(TAG, "RemoteException when sending system event", e);
}
@@ -430,23 +418,46 @@ public class AuthController extends CoreStartable implements CommandQueue.Callba
@Override
public void onDialogAnimatedIn(long requestId) {
if (mReceiver == null) {
Log.e(TAG, "onDialogAnimatedIn: Receiver is null");
return;
}
if (requestId != mCurrentDialog.getRequestId()) {
Log.w(TAG, "requestId doesn't match, skip onDialogAnimatedIn");
final IBiometricSysuiReceiver receiver = getCurrentReceiver(requestId);
if (receiver == null) {
Log.w(TAG, "Skip onDialogAnimatedIn");
return;
}
try {
mReceiver.onDialogAnimatedIn();
receiver.onDialogAnimatedIn();
} catch (RemoteException e) {
Log.e(TAG, "RemoteException when sending onDialogAnimatedIn", e);
}
}
@Nullable
private IBiometricSysuiReceiver getCurrentReceiver(long requestId) {
if (!isRequestIdValid(requestId)) {
return null;
}
if (mReceiver == null) {
Log.w(TAG, "getCurrentReceiver: Receiver is null");
}
return mReceiver;
}
private boolean isRequestIdValid(long requestId) {
if (mCurrentDialog == null) {
Log.w(TAG, "shouldNotifyReceiver: dialog already gone");
return false;
}
if (requestId != mCurrentDialog.getRequestId()) {
Log.w(TAG, "shouldNotifyReceiver: requestId doesn't match");
return false;
}
return true;
}
@Override
public void onDismissed(@DismissedReason int reason,
@Nullable byte[] credentialAttestation, long requestId) {