Merge "Dummy implementation of the Subsecond Switching API." am: 7281c7bc8f am: 374f863100
am: 427622e1c0
Change-Id: I116cc9f18dc4aada614bde651385f1e5b2d393f6
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 67cb3f6..8b81b57 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -33,8 +33,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;
@@ -53,6 +55,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;
@@ -2655,6 +2658,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.
*