Merge "Support different SIM power states"
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index b9673c8..c47a37d 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -3719,14 +3719,17 @@
}
/**
- * Set SIM card power state. Request is equivalent to inserting or removing the card.
+ * Set SIM card power state.
*
* @param slotIndex SIM slot id.
- * @param powerUp True if powering up the SIM, otherwise powering down
+ * @param state State of SIM (power down, power up, pass through)
+ * - {@link android.telephony.TelephonyManager#CARD_POWER_DOWN}
+ * - {@link android.telephony.TelephonyManager#CARD_POWER_UP}
+ * - {@link android.telephony.TelephonyManager#CARD_POWER_UP_PASS_THROUGH}
*
**/
@Override
- public void setSimPowerStateForSlot(int slotIndex, boolean powerUp) {
+ public void setSimPowerStateForSlot(int slotIndex, int state) {
enforceModifyPermission();
int subId[] = mSubscriptionController.getSubIdUsingSlotIndex(slotIndex);
if (subId == null || subId.length == 0) {
@@ -3735,7 +3738,7 @@
final Phone phone = getPhone(subId[0]);
if (phone != null) {
- phone.setSimPowerState(powerUp);
+ phone.setSimPowerState(state);
}
}