Merge "Update language to comply with Android's inclusive language guidance" am: e211918c69 am: ff0a6eab18

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373837

Change-Id: Ic52b887978dca4791d2d80ace3473a26141f0cc3
This commit is contained in:
Treehugger Robot
2020-07-28 20:34:42 +00:00
committed by Automerger Merge Worker

View File

@@ -195,7 +195,7 @@ public class KeyguardSimPukView extends KeyguardPinBasedInputView {
void onSimLockChangedResponse(final PinResult result) { void onSimLockChangedResponse(final PinResult result) {
if (result == null) Log.e(LOG_TAG, "onSimCheckResponse, pin result is NULL"); if (result == null) Log.e(LOG_TAG, "onSimCheckResponse, pin result is NULL");
else { else {
Log.d(LOG_TAG, "onSimCheckResponse " + " dummy One result " Log.d(LOG_TAG, "onSimCheckResponse " + " empty One result "
+ result.toString()); + result.toString());
if (result.getAttemptsRemaining() >= 0) { if (result.getAttemptsRemaining() >= 0) {
mRemainingAttempts = result.getAttemptsRemaining(); mRemainingAttempts = result.getAttemptsRemaining();