1 files changed, 11 insertions, 101 deletions
diff --git a/src/java/com/android/internal/telephony/BaseCommands.java b/src/java/com/android/internal/telephony/BaseCommands.java
index b8de97522e..b33b732fbd 100644
--- a/src/java/com/android/internal/telephony/BaseCommands.java
+++ b/src/java/com/android/internal/telephony/BaseCommands.java
@@ -18,7 +18,6 @@
 package com.android.internal.telephony;
 
 import android.annotation.NonNull;
-import android.annotation.Nullable;
 import android.compat.annotation.UnsupportedAppUsage;
 import android.content.Context;
 import android.os.AsyncResult;
@@ -69,8 +68,6 @@ public abstract class BaseCommands implements CommandsInterface {
     protected RegistrantList mVoicePrivacyOnRegistrants = new RegistrantList();
     protected RegistrantList mVoicePrivacyOffRegistrants = new RegistrantList();
     @UnsupportedAppUsage
-    protected Registrant mUnsolOemHookRawRegistrant;
-    @UnsupportedAppUsage
     protected RegistrantList mOtaProvisionRegistrants = new RegistrantList();
     @UnsupportedAppUsage
     protected RegistrantList mCallWaitingInfoRegistrants = new RegistrantList();
@@ -121,13 +118,8 @@ public abstract class BaseCommands implements CommandsInterface {
     protected RegistrantList mConnectionSetupFailureRegistrants = new RegistrantList();
     protected RegistrantList mNotifyAnbrRegistrants = new RegistrantList();
     protected RegistrantList mTriggerImsDeregistrationRegistrants = new RegistrantList();
-    protected RegistrantList mPendingSatelliteMessageCountRegistrants = new RegistrantList();
-    protected RegistrantList mNewSatelliteMessagesRegistrants = new RegistrantList();
-    protected RegistrantList mSatelliteMessagesTransferCompleteRegistrants = new RegistrantList();
-    protected RegistrantList mSatellitePointingInfoChangedRegistrants = new RegistrantList();
-    protected RegistrantList mSatelliteModeChangedRegistrants = new RegistrantList();
-    protected RegistrantList mSatelliteRadioTechnologyChangedRegistrants = new RegistrantList();
-    protected RegistrantList mSatelliteProvisionStateChangedRegistrants = new RegistrantList();
+    protected RegistrantList mImeiInfoRegistrants = new RegistrantList();
+    protected RegistrantList mCellularIdentifierDisclosedRegistrants = new RegistrantList();
 
     @UnsupportedAppUsage
     protected Registrant mGsmSmsRegistrant;
@@ -681,17 +673,6 @@ public abstract class BaseCommands implements CommandsInterface {
         mSignalInfoRegistrants.addUnique(h, what, obj);
     }
 
-    public void setOnUnsolOemHookRaw(Handler h, int what, Object obj) {
-        mUnsolOemHookRawRegistrant = new Registrant (h, what, obj);
-    }
-
-    public void unSetOnUnsolOemHookRaw(Handler h) {
-        if (mUnsolOemHookRawRegistrant != null && mUnsolOemHookRawRegistrant.getHandler() == h) {
-            mUnsolOemHookRawRegistrant.clear();
-            mUnsolOemHookRawRegistrant = null;
-        }
-    }
-
     @Override
     public void unregisterForSignalInfo(Handler h) {
         mSignalInfoRegistrants.remove(h);
@@ -1011,18 +992,6 @@ public abstract class BaseCommands implements CommandsInterface {
     }
 
     @Override
-    public void startLceService(int reportIntervalMs, boolean pullMode, Message result) {
-    }
-
-    @Override
-    public void stopLceService(Message result) {
-    }
-
-    @Override
-    public void pullLceData(Message result) {
-    }
-
-    @Override
     public void registerForLceInfo(Handler h, int what, Object obj) {
         synchronized (mStateMonitor) {
             mLceInfoRegistrants.addUnique(h, what, obj);
@@ -1208,80 +1177,21 @@ public abstract class BaseCommands implements CommandsInterface {
         mTriggerImsDeregistrationRegistrants.remove(h);
     }
 
+    /**
+     * Register to listen for the changes in the primary IMEI with respect to the sim slot.
+     */
     @Override
-    public void registerForPendingSatelliteMessageCount(
-            @NonNull Handler h, int what, @Nullable Object obj) {
-        mPendingSatelliteMessageCountRegistrants.add(h, what, obj);
-    }
-
-    @Override
-    public void unregisterForPendingSatelliteMessageCount(@NonNull Handler h) {
-        mPendingSatelliteMessageCountRegistrants.remove(h);
-    }
-
-    @Override
-    public void registerForNewSatelliteMessages(
-            @NonNull Handler h, int what, @Nullable Object obj) {
-        mNewSatelliteMessagesRegistrants.add(h, what, obj);
-    }
-
-    @Override
-    public void unregisterForNewSatelliteMessages(@NonNull Handler h) {
-        mNewSatelliteMessagesRegistrants.remove(h);
-    }
-
-    @Override
-    public void registerForSatelliteMessagesTransferComplete(@NonNull Handler h,
-            int what, @Nullable Object obj) {
-        mSatelliteMessagesTransferCompleteRegistrants.add(h, what, obj);
-    }
-
-    @Override
-    public void unregisterForSatelliteMessagesTransferComplete(@NonNull Handler h) {
-        mSatelliteMessagesTransferCompleteRegistrants.remove(h);
-    }
-
-    @Override
-    public void registerForSatellitePointingInfoChanged(@NonNull Handler h,
-            int what, @Nullable Object obj) {
-        mSatellitePointingInfoChangedRegistrants.add(h, what, obj);
-    }
-
-    @Override
-    public void unregisterForSatellitePointingInfoChanged(@NonNull Handler h) {
-        mSatellitePointingInfoChangedRegistrants.remove(h);
-    }
-
-    @Override
-    public void registerForSatelliteModeChanged(@NonNull Handler h,
-            int what, @Nullable Object obj) {
-        mSatelliteModeChangedRegistrants.add(h, what, obj);
-    }
-
-    @Override
-    public void unregisterForSatelliteModeChanged(@NonNull Handler h) {
-        mSatelliteModeChangedRegistrants.remove(h);
-    }
-
-    @Override
-    public void registerForSatelliteRadioTechnologyChanged(@NonNull Handler h,
-            int what, @Nullable Object obj) {
-        mSatelliteRadioTechnologyChangedRegistrants.add(h, what, obj);
-    }
-
-    @Override
-    public void unregisterForSatelliteRadioTechnologyChanged(@NonNull Handler h) {
-        mSatelliteRadioTechnologyChangedRegistrants.remove(h);
+    public void registerForImeiMappingChanged(Handler h, int what, Object obj) {
+        mImeiInfoRegistrants.add(h, what, obj);
     }
 
     @Override
-    public void registerForSatelliteProvisionStateChanged(@NonNull Handler h,
-            int what, @Nullable Object obj) {
-        mSatelliteProvisionStateChangedRegistrants.add(h, what, obj);
+    public void registerForCellularIdentifierDisclosures(Handler h, int what, Object obj) {
+        mCellularIdentifierDisclosedRegistrants.add(h, what, obj);
     }
 
     @Override
-    public void unregisterForSatelliteProvisionStateChanged(@NonNull Handler h) {
-        mSatelliteProvisionStateChangedRegistrants.remove(h);
+    public void unregisterForCellularIdentifierDisclosures(Handler h) {
+        mCellularIdentifierDisclosedRegistrants.remove(h);
     }
 }