summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-10-14 02:25:15 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2021-10-14 02:25:15 +0000
commit368f14380480ae802b5436db2e8a8f25faf469f5 (patch)
tree89fa9b136df34f29315905b854f0026bb95d1f90 /src/com
parent17fa6106d68bb08edf66d9f2a1bee551a3a1684b (diff)
parentbb7775287706c4b3b5e8a8d1f9a457acfaae3353 (diff)
downloadplatform_packages_services_Telephony-master.tar.gz
platform_packages_services_Telephony-master.tar.bz2
platform_packages_services_Telephony-master.zip
Merge "Revert "Refactor PinStorage#storePin to avoid dead lock when unl...""HEADmaster
Diffstat (limited to 'src/com')
-rwxr-xr-xsrc/com/android/phone/PhoneInterfaceManager.java14
1 files changed, 5 insertions, 9 deletions
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 7581f56ad..db14924f1 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -185,7 +185,6 @@ import com.android.internal.telephony.uicc.IccCardApplicationStatus.AppType;
import com.android.internal.telephony.uicc.IccIoResult;
import com.android.internal.telephony.uicc.IccRecords;
import com.android.internal.telephony.uicc.IccUtils;
-import com.android.internal.telephony.uicc.PinStorage;
import com.android.internal.telephony.uicc.SIMRecords;
import com.android.internal.telephony.uicc.UiccCard;
import com.android.internal.telephony.uicc.UiccCardApplication;
@@ -1733,9 +1732,8 @@ public class PhoneInterfaceManager extends ITelephony.Stub {
// If the operation is successful, update the PIN storage
Pair<String, String> passwords = (Pair<String, String>) request.argument;
int phoneId = getPhoneFromRequest(request).getPhoneId();
- PinStorage pinStorage = UiccController.getInstance().getPinStorage();
- pinStorage.storePin(passwords.second, phoneId,
- pinStorage.getIccid(phoneId));
+ UiccController.getInstance().getPinStorage()
+ .storePin(passwords.second, phoneId);
} else {
request.result = msg.arg1;
}
@@ -1759,9 +1757,8 @@ public class PhoneInterfaceManager extends ITelephony.Stub {
Pair<Boolean, String> enabled = (Pair<Boolean, String>) request.argument;
int phoneId = getPhoneFromRequest(request).getPhoneId();
if (enabled.first) {
- PinStorage pinStorage = UiccController.getInstance().getPinStorage();
- pinStorage.storePin(enabled.second, phoneId,
- pinStorage.getIccid(phoneId));
+ UiccController.getInstance().getPinStorage()
+ .storePin(enabled.second, phoneId);
} else {
UiccController.getInstance().getPinStorage().clearPin(phoneId);
}
@@ -2460,8 +2457,7 @@ public class PhoneInterfaceManager extends ITelephony.Stub {
resultArray[1] = mRetryCount;
if (mResult == PhoneConstants.PIN_RESULT_SUCCESS && pin.length() > 0) {
- PinStorage pinStorage = UiccController.getInstance().getPinStorage();
- pinStorage.storePin(pin, mPhoneId, pinStorage.getIccid(mPhoneId));
+ UiccController.getInstance().getPinStorage().storePin(pin, mPhoneId);
}
return resultArray;