Merge "Flesh out streaming service management in service"
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 0ff3e5d..c47a37d 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -34,8 +34,10 @@
import android.os.Binder;
import android.os.Bundle;
import android.os.Handler;
+import android.os.IBinder;
import android.os.Looper;
import android.os.Message;
+import android.os.Messenger;
import android.os.Process;
import android.os.ResultReceiver;
import android.os.ServiceManager;
@@ -54,6 +56,7 @@
import android.telephony.IccOpenLogicalChannelResponse;
import android.telephony.ModemActivityInfo;
import android.telephony.NeighboringCellInfo;
+import android.telephony.NetworkScanRequest;
import android.telephony.RadioAccessFamily;
import android.telephony.ServiceState;
import android.telephony.SmsManager;
@@ -2641,6 +2644,27 @@
}
/**
+ * Performs a new network scan and returns the id of this scan.
+ *
+ * @return the id of the requested scan which can be used to stop the scan.
+ */
+ @Override
+ public int requestNetworkScan(int subId, NetworkScanRequest request, Messenger messenger,
+ IBinder binder) {
+ // TODO(yinxu): Implement this method.
+ throw new UnsupportedOperationException("To be implemented...");
+ }
+
+ /**
+ * Stops an existing network scan with the given scanId.
+ */
+ @Override
+ public void stopNetworkScan(int subId, int scanId) {
+ // TODO(yinxu): Implement this method.
+ throw new UnsupportedOperationException("To be implemented...");
+ }
+
+ /**
* Get the calculated preferred network type.
* Used for debugging incorrect network type.
*
@@ -3695,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) {
@@ -3711,7 +3738,7 @@
final Phone phone = getPhone(subId[0]);
if (phone != null) {
- phone.setSimPowerState(powerUp);
+ phone.setSimPowerState(state);
}
}