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

Commit 416e7996 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add callback method to notify the emergency mode included in satellite... 

Merge "Add callback method to notify the emergency mode included in satellite enable request is changed" into main
parents 856f2751 08cc2460

telephony/java/android/telephony/satellite/ISatelliteModemStateCallback.aidl

+7 −0
Original line number Diff line number Diff line
@@ -27,4 +27,11 @@ oneway interface ISatelliteModemStateCallback { 
     * @param state The current satellite modem state.

     */

    void onSatelliteModemStateChanged(in int state);



    /**

     * Indicates that the satellite emergency mode has changed.

     *

     * @param isEmergency True means satellite enabled for emergency mode, false otherwise.

     */

    void onEmergencyModeChanged(in boolean isEmergency);

}

telephony/java/android/telephony/satellite/SatelliteManager.java

+6 −0
Original line number Diff line number Diff line
@@ -1531,6 +1531,12 @@ public final class SatelliteManager { 
                        executor.execute(() -> Binder.withCleanCallingIdentity(() ->

                                callback.onSatelliteModemStateChanged(state)));

                    }



                    @Override

                    public void onEmergencyModeChanged(boolean isEmergency) {

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

                                callback.onEmergencyModeChanged(isEmergency)));

                    }

                };

                sSatelliteModemStateCallbackMap.put(callback, internalCallback);

                return telephony.registerForSatelliteModemStateChanged(mSubId, internalCallback);

telephony/java/android/telephony/satellite/SatelliteModemStateCallback.java

+10 −0
Original line number Diff line number Diff line
@@ -35,4 +35,14 @@ public interface SatelliteModemStateCallback { 
     */

    @FlaggedApi(Flags.FLAG_OEM_ENABLED_SATELLITE_FLAG)

    void onSatelliteModemStateChanged(@SatelliteManager.SatelliteModemState int state);



    /**

     * Called when the satellite emergency mode has changed.

     *

     * @param isEmergency {@code true} enabled for emergency mode, {@code false} otherwise.

     *

     * @hide

     */

    @FlaggedApi(Flags.FLAG_CARRIER_ROAMING_NB_IOT_NTN)

    default void onEmergencyModeChanged(boolean isEmergency) {};

}