Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d665b6f authored by Aishwarya Mallampati's avatar Aishwarya Mallampati
Browse files

Address API review comments. 

The following changes are made in this CL:
- Renamed CarrierRoamingNtnModeListener to CarrierRoamingNtnListener
- Renamed SatelliteCommunicationAllowedStateCallback to
  SatelliteCommunicationAccessStateCallback. And also renamed interface
  methods accordingly
- Renamed getSubId in SatelliteSubscriberInfo to getSubscriptionId
- Added javadocs for provisionSatellite and deprovisionSatellite

Bug: 384876570
Test: 386228735
Flag: com.android.internal.telephony.flags.satellite_system_apis

Change-Id: If7c373b47de578cdab717ef92a4edb32a37419a4
parent cd5ea677

core/api/system-current.txt

+8 −8
Original line number Original line Diff line number Diff line
@@ -15956,7 +15956,7 @@ package android.telephony { 
    method @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public default void onCallStatesChanged(@NonNull java.util.List<android.telephony.CallState>);

    method @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public default void onCallStatesChanged(@NonNull java.util.List<android.telephony.CallState>);

  }

  }

















  @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") public static interface TelephonyCallback.CarrierRoamingNtnModeListener {







  @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") public static interface TelephonyCallback.CarrierRoamingNtnListener {











    method public default void onCarrierRoamingNtnAvailableServicesChanged(@NonNull int[]);







    method public default void onCarrierRoamingNtnAvailableServicesChanged(@NonNull int[]);











    method public default void onCarrierRoamingNtnEligibleStateChanged(boolean);







    method public default void onCarrierRoamingNtnEligibleStateChanged(boolean);











    method public void onCarrierRoamingNtnModeChanged(boolean);







    method public void onCarrierRoamingNtnModeChanged(boolean);










@@ -18634,9 +18634,9 @@ package android.telephony.satellite {









    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public void onSatelliteCapabilitiesChanged(@NonNull android.telephony.satellite.SatelliteCapabilities);







    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public void onSatelliteCapabilitiesChanged(@NonNull android.telephony.satellite.SatelliteCapabilities);











  }







  }



























  @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") public interface SatelliteCommunicationAllowedStateCallback {







  @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") public interface SatelliteCommunicationAccessStateCallback {











    method public default void onSatelliteAccessConfigurationChanged(@Nullable android.telephony.satellite.SatelliteAccessConfiguration);







    method public void onAccessAllowedStateChanged(boolean);











    method public void onSatelliteCommunicationAllowedStateChanged(boolean);







    method public default void onAccessConfigurationChanged(@Nullable android.telephony.satellite.SatelliteAccessConfiguration);











  }







  }



























  @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public final class SatelliteDatagram implements android.os.Parcelable {







  @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") public final class SatelliteDatagram implements android.os.Parcelable {










@@ -18675,7 +18675,7 @@ package android.telephony.satellite {









    method @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void provisionSatellite(@NonNull java.util.List<android.telephony.satellite.SatelliteSubscriberInfo>, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Boolean,android.telephony.satellite.SatelliteManager.SatelliteException>);







    method @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void provisionSatellite(@NonNull java.util.List<android.telephony.satellite.SatelliteSubscriberInfo>, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Boolean,android.telephony.satellite.SatelliteManager.SatelliteException>);











    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void provisionService(@NonNull String, @NonNull byte[], @Nullable android.os.CancellationSignal, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);







    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void provisionService(@NonNull String, @NonNull byte[], @Nullable android.os.CancellationSignal, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);











    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public int registerForCapabilitiesChanged(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.satellite.SatelliteCapabilitiesCallback);







    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public int registerForCapabilitiesChanged(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.satellite.SatelliteCapabilitiesCallback);











    method @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public int registerForCommunicationAllowedStateChanged(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.satellite.SatelliteCommunicationAllowedStateCallback);







    method @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public int registerForCommunicationAccessStateChanged(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.satellite.SatelliteCommunicationAccessStateCallback);











    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public int registerForIncomingDatagram(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.satellite.SatelliteDatagramCallback);







    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public int registerForIncomingDatagram(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.satellite.SatelliteDatagramCallback);











    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public int registerForModemStateChanged(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.satellite.SatelliteModemStateCallback);







    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public int registerForModemStateChanged(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.satellite.SatelliteModemStateCallback);











    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void registerForNtnSignalStrengthChanged(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.satellite.NtnSignalStrengthCallback);







    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void registerForNtnSignalStrengthChanged(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.satellite.NtnSignalStrengthCallback);










@@ -18704,7 +18704,7 @@ package android.telephony.satellite {









    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void startTransmissionUpdates(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>, @NonNull android.telephony.satellite.SatelliteTransmissionUpdateCallback);







    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void startTransmissionUpdates(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>, @NonNull android.telephony.satellite.SatelliteTransmissionUpdateCallback);











    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void stopTransmissionUpdates(@NonNull android.telephony.satellite.SatelliteTransmissionUpdateCallback, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);







    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void stopTransmissionUpdates(@NonNull android.telephony.satellite.SatelliteTransmissionUpdateCallback, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);











    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void unregisterForCapabilitiesChanged(@NonNull android.telephony.satellite.SatelliteCapabilitiesCallback);







    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void unregisterForCapabilitiesChanged(@NonNull android.telephony.satellite.SatelliteCapabilitiesCallback);











    method @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void unregisterForCommunicationAllowedStateChanged(@NonNull android.telephony.satellite.SatelliteCommunicationAllowedStateCallback);







    method @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void unregisterForCommunicationAccessStateChanged(@NonNull android.telephony.satellite.SatelliteCommunicationAccessStateCallback);











    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void unregisterForIncomingDatagram(@NonNull android.telephony.satellite.SatelliteDatagramCallback);







    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void unregisterForIncomingDatagram(@NonNull android.telephony.satellite.SatelliteDatagramCallback);











    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void unregisterForModemStateChanged(@NonNull android.telephony.satellite.SatelliteModemStateCallback);







    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void unregisterForModemStateChanged(@NonNull android.telephony.satellite.SatelliteModemStateCallback);











    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void unregisterForNtnSignalStrengthChanged(@NonNull android.telephony.satellite.NtnSignalStrengthCallback);







    method @FlaggedApi("com.android.internal.telephony.flags.oem_enabled_satellite_flag") @RequiresPermission(android.Manifest.permission.SATELLITE_COMMUNICATION) public void unregisterForNtnSignalStrengthChanged(@NonNull android.telephony.satellite.NtnSignalStrengthCallback);










@@ -18833,9 +18833,9 @@ package android.telephony.satellite {









    method public int describeContents();







    method public int describeContents();











    method public int getCarrierId();







    method public int getCarrierId();











    method @NonNull public String getNiddApn();







    method @NonNull public String getNiddApn();











    method public int getSubId();














    method @NonNull public String getSubscriberId();







    method @NonNull public String getSubscriberId();











    method public int getSubscriberIdType();







    method public int getSubscriberIdType();














    method public int getSubscriptionId();











    method public void writeToParcel(@NonNull android.os.Parcel, int);







    method public void writeToParcel(@NonNull android.os.Parcel, int);











    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.satellite.SatelliteSubscriberInfo> CREATOR;







    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.satellite.SatelliteSubscriberInfo> CREATOR;











    field public static final int SUBSCRIBER_ID_TYPE_ICCID = 0; // 0x0







    field public static final int SUBSCRIBER_ID_TYPE_ICCID = 0; // 0x0









@@ -18847,9 +18847,9 @@ package android.telephony.satellite {









    method @NonNull public android.telephony.satellite.SatelliteSubscriberInfo build();







    method @NonNull public android.telephony.satellite.SatelliteSubscriberInfo build();











    method @NonNull public android.telephony.satellite.SatelliteSubscriberInfo.Builder setCarrierId(int);







    method @NonNull public android.telephony.satellite.SatelliteSubscriberInfo.Builder setCarrierId(int);











    method @NonNull public android.telephony.satellite.SatelliteSubscriberInfo.Builder setNiddApn(@NonNull String);







    method @NonNull public android.telephony.satellite.SatelliteSubscriberInfo.Builder setNiddApn(@NonNull String);











    method @NonNull public android.telephony.satellite.SatelliteSubscriberInfo.Builder setSubId(int);














    method @NonNull public android.telephony.satellite.SatelliteSubscriberInfo.Builder setSubscriberId(@NonNull String);







    method @NonNull public android.telephony.satellite.SatelliteSubscriberInfo.Builder setSubscriberId(@NonNull String);











    method @NonNull public android.telephony.satellite.SatelliteSubscriberInfo.Builder setSubscriberIdType(int);







    method @NonNull public android.telephony.satellite.SatelliteSubscriberInfo.Builder setSubscriberIdType(int);














    method @NonNull public android.telephony.satellite.SatelliteSubscriberInfo.Builder setSubscriptionId(int);











  }







  }



























  @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") public final class SatelliteSubscriberProvisionStatus implements android.os.Parcelable {







  @FlaggedApi("com.android.internal.telephony.flags.satellite_system_apis") public final class SatelliteSubscriberProvisionStatus implements android.os.Parcelable {

























core/java/android/telephony/TelephonyCallback.java



+9
−9




























Original line number
Original line
Diff line number
Diff line








@@ -1819,7 +1819,7 @@ public class TelephonyCallback {









     */







     */











    @SystemApi







    @SystemApi











    @FlaggedApi(Flags.FLAG_SATELLITE_SYSTEM_APIS)







    @FlaggedApi(Flags.FLAG_SATELLITE_SYSTEM_APIS)











    public interface CarrierRoamingNtnModeListener {







    public interface CarrierRoamingNtnListener {











        /**







        /**











         * Callback invoked when carrier roaming non-terrestrial network mode changes.







         * Callback invoked when carrier roaming non-terrestrial network mode changes.











         *







         *










@@ -2332,8 +2332,8 @@ public class TelephonyCallback {









        public void onCarrierRoamingNtnModeChanged(boolean active) {







        public void onCarrierRoamingNtnModeChanged(boolean active) {











            if (!Flags.carrierEnabledSatelliteFlag()) return;







            if (!Flags.carrierEnabledSatelliteFlag()) return;































            CarrierRoamingNtnModeListener listener =







            CarrierRoamingNtnListener listener =











                    (CarrierRoamingNtnModeListener) mTelephonyCallbackWeakRef.get();







                    (CarrierRoamingNtnListener) mTelephonyCallbackWeakRef.get();











            if (listener == null) return;







            if (listener == null) return;































            Binder.withCleanCallingIdentity(







            Binder.withCleanCallingIdentity(









@@ -2343,8 +2343,8 @@ public class TelephonyCallback {









        public void onCarrierRoamingNtnEligibleStateChanged(boolean eligible) {







        public void onCarrierRoamingNtnEligibleStateChanged(boolean eligible) {











            if (!Flags.carrierRoamingNbIotNtn()) return;







            if (!Flags.carrierRoamingNbIotNtn()) return;































            CarrierRoamingNtnModeListener listener =







            CarrierRoamingNtnListener listener =











                    (CarrierRoamingNtnModeListener) mTelephonyCallbackWeakRef.get();







                    (CarrierRoamingNtnListener) mTelephonyCallbackWeakRef.get();











            if (listener == null) return;







            if (listener == null) return;































            Binder.withCleanCallingIdentity(() -> mExecutor.execute(







            Binder.withCleanCallingIdentity(() -> mExecutor.execute(









@@ -2355,8 +2355,8 @@ public class TelephonyCallback {









                @NetworkRegistrationInfo.ServiceType int[] availableServices) {







                @NetworkRegistrationInfo.ServiceType int[] availableServices) {











            if (!Flags.carrierRoamingNbIotNtn()) return;







            if (!Flags.carrierRoamingNbIotNtn()) return;































            CarrierRoamingNtnModeListener listener =







            CarrierRoamingNtnListener listener =











                    (CarrierRoamingNtnModeListener) mTelephonyCallbackWeakRef.get();







                    (CarrierRoamingNtnListener) mTelephonyCallbackWeakRef.get();











            if (listener == null) return;







            if (listener == null) return;































            Binder.withCleanCallingIdentity(() -> mExecutor.execute(







            Binder.withCleanCallingIdentity(() -> mExecutor.execute(









@@ -2367,8 +2367,8 @@ public class TelephonyCallback {









                @NonNull NtnSignalStrength ntnSignalStrength) {







                @NonNull NtnSignalStrength ntnSignalStrength) {











            if (!Flags.carrierRoamingNbIotNtn()) return;







            if (!Flags.carrierRoamingNbIotNtn()) return;































            CarrierRoamingNtnModeListener listener =







            CarrierRoamingNtnListener listener =











                    (CarrierRoamingNtnModeListener) mTelephonyCallbackWeakRef.get();







                    (CarrierRoamingNtnListener) mTelephonyCallbackWeakRef.get();











            if (listener == null) return;







            if (listener == null) return;































            Binder.withCleanCallingIdentity(() -> mExecutor.execute(







            Binder.withCleanCallingIdentity(() -> mExecutor.execute(

































core/java/android/telephony/TelephonyRegistryManager.java



+1
−1




























Original line number
Original line
Diff line number
Diff line








@@ -1341,7 +1341,7 @@ public class TelephonyRegistryManager {









                    TelephonyCallback.EVENT_SIMULTANEOUS_CELLULAR_CALLING_SUBSCRIPTIONS_CHANGED);







                    TelephonyCallback.EVENT_SIMULTANEOUS_CELLULAR_CALLING_SUBSCRIPTIONS_CHANGED);











        }







        }































        if (telephonyCallback instanceof TelephonyCallback.CarrierRoamingNtnModeListener) {







        if (telephonyCallback instanceof TelephonyCallback.CarrierRoamingNtnListener) {











            eventList.add(TelephonyCallback.EVENT_CARRIER_ROAMING_NTN_MODE_CHANGED);







            eventList.add(TelephonyCallback.EVENT_CARRIER_ROAMING_NTN_MODE_CHANGED);











            eventList.add(TelephonyCallback.EVENT_CARRIER_ROAMING_NTN_ELIGIBLE_STATE_CHANGED);







            eventList.add(TelephonyCallback.EVENT_CARRIER_ROAMING_NTN_ELIGIBLE_STATE_CHANGED);











            eventList.add(TelephonyCallback.EVENT_CARRIER_ROAMING_NTN_AVAILABLE_SERVICES_CHANGED);







            eventList.add(TelephonyCallback.EVENT_CARRIER_ROAMING_NTN_AVAILABLE_SERVICES_CHANGED);

































packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionRepositoryImpl.kt



+1
−1




























Original line number
Original line
Diff line number
Diff line








@@ -143,7 +143,7 @@ class MobileConnectionRepositoryImpl(









                    object :







                    object :











                        TelephonyCallback(),







                        TelephonyCallback(),











                        TelephonyCallback.CarrierNetworkListener,







                        TelephonyCallback.CarrierNetworkListener,











                        TelephonyCallback.CarrierRoamingNtnModeListener,







                        TelephonyCallback.CarrierRoamingNtnListener,











                        TelephonyCallback.DataActivityListener,







                        TelephonyCallback.DataActivityListener,











                        TelephonyCallback.DataConnectionStateListener,







                        TelephonyCallback.DataConnectionStateListener,











                        TelephonyCallback.DataEnabledListener,







                        TelephonyCallback.DataEnabledListener,

































packages/SystemUI/src/com/android/systemui/statusbar/pipeline/satellite/data/prod/DeviceBasedSatelliteRepositoryImpl.kt



+8
−8




























Original line number
Original line
Diff line number
Diff line








@@ -21,7 +21,7 @@ import android.os.OutcomeReceiver









import android.telephony.TelephonyCallback







import android.telephony.TelephonyCallback











import android.telephony.TelephonyManager







import android.telephony.TelephonyManager











import android.telephony.satellite.NtnSignalStrengthCallback







import android.telephony.satellite.NtnSignalStrengthCallback











import android.telephony.satellite.SatelliteCommunicationAllowedStateCallback







import android.telephony.satellite.SatelliteCommunicationAccessStateCallback











import android.telephony.satellite.SatelliteManager







import android.telephony.satellite.SatelliteManager











import android.telephony.satellite.SatelliteManager.SATELLITE_RESULT_SUCCESS







import android.telephony.satellite.SatelliteManager.SATELLITE_RESULT_SUCCESS











import android.telephony.satellite.SatelliteModemStateCallback







import android.telephony.satellite.SatelliteModemStateCallback










@@ -263,9 +263,9 @@ constructor(





























    private fun isSatelliteAvailableFlow(sm: SupportedSatelliteManager): Flow<Boolean> =







    private fun isSatelliteAvailableFlow(sm: SupportedSatelliteManager): Flow<Boolean> =











        conflatedCallbackFlow {







        conflatedCallbackFlow {











                val callback = SatelliteCommunicationAllowedStateCallback { allowed ->







                val callback = SatelliteCommunicationAccessStateCallback { allowed ->











                    logBuffer.i({ bool1 = allowed }) {







                    logBuffer.i({ bool1 = allowed }) {











                        "onSatelliteCommunicationAllowedStateChanged: $bool1"







                        "onSatelliteCommunicationAccessAllowedStateChanged: $bool1"











                    }







                    }































                    trySend(allowed)







                    trySend(allowed)









@@ -273,20 +273,20 @@ constructor(





























                var registered = false







                var registered = false











                try {







                try {











                    logBuffer.i { "registerForCommunicationAllowedStateChanged" }







                    logBuffer.i { "registerForCommunicationAccessStateChanged" }











                    sm.registerForCommunicationAllowedStateChanged(







                    sm.registerForCommunicationAccessStateChanged(











                        bgDispatcher.asExecutor(),







                        bgDispatcher.asExecutor(),











                        callback,







                        callback,











                    )







                    )











                    registered = true







                    registered = true











                } catch (e: Exception) {







                } catch (e: Exception) {











                    logBuffer.e("Error calling registerForCommunicationAllowedStateChanged", e)







                    logBuffer.e("Error calling registerForCommunicationAccessStateChanged", e)











                }







                }































                awaitClose {







                awaitClose {











                    if (registered) {







                    if (registered) {











                        logBuffer.i { "unRegisterForCommunicationAllowedStateChanged" }







                        logBuffer.i { "unRegisterForCommunicationAccessStateChanged" }











                        sm.unregisterForCommunicationAllowedStateChanged(callback)







                        sm.unregisterForCommunicationAccessStateChanged(callback)











                    }







                    }











                }







                }











            }







            }