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 d8ada6f..c73db6a 100644
--- a/src/java/com/android/ims/ImsManager.java
+++ b/src/java/com/android/ims/ImsManager.java
@@ -29,8 +29,6 @@
import android.provider.Settings;
import android.telecom.TelecomManager;
import android.telephony.CarrierConfigManager;
-import android.telephony.ims.internal.feature.ImsFeature;
-import android.telephony.ims.stub.ImsRegistrationImplBase;
import android.telephony.Rlog;
import android.telephony.ServiceState;
import android.telephony.SubscriptionManager;
@@ -2352,15 +2350,6 @@
ImsReasonInfo.CODE_LOCAL_IMS_SERVICE_DOWN);
}
}
-
- public void addRegistrationCallback(ImsRegistrationImplBase.Callback callback) {
- // TODO: implement (coming in ag/3472519)
- }
-
- public void addCapabilitiesCallback(ImsFeature.CapabilityCallback callback) {
- // TODO: implement (coming in ag/3472519)
- }
-
/**
* Gets the Multi-Endpoint interface to subscribe to multi-enpoint notifications..
*