merge in pi-release history after reset to master
diff --git a/src/java/com/android/ims/ImsManager.java b/src/java/com/android/ims/ImsManager.java
index e86bfde..d8ada6f 100644
--- a/src/java/com/android/ims/ImsManager.java
+++ b/src/java/com/android/ims/ImsManager.java
@@ -2353,15 +2353,6 @@
}
}
- public void onSmsReady() throws ImsException{
- try {
- mImsServiceProxy.onSmsReady();
- } catch (RemoteException e) {
- throw new ImsException("onSmsReady()", e,
- ImsReasonInfo.CODE_LOCAL_IMS_SERVICE_DOWN);
- }
- }
-
public void addRegistrationCallback(ImsRegistrationImplBase.Callback callback) {
// TODO: implement (coming in ag/3472519)
}
diff --git a/src/java/com/android/ims/ImsServiceProxy.java b/src/java/com/android/ims/ImsServiceProxy.java
index 4ac8fea..7fcaac2 100644
--- a/src/java/com/android/ims/ImsServiceProxy.java
+++ b/src/java/com/android/ims/ImsServiceProxy.java
@@ -371,13 +371,6 @@
}
}
- public void onSmsReady() throws RemoteException {
- synchronized (mLock) {
- checkServiceIsReady();
- getServiceInterface(mBinder).onSmsReady();
- }
- }
-
public void setSmsListener(IImsSmsListener listener) throws RemoteException {
synchronized (mLock) {
checkServiceIsReady();