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

Commit a8c300f4 authored by Sooraj Sasindran's avatar Sooraj Sasindran Committed by Automerger Merge Worker
Browse files

Merge "Add EnableCellularModem Api to reinitiallise QESDK" into udc-dev am: e7d9a123 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22339602



Change-Id: I07cdbb222e23633d755842f601c23c2280652a06
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b6a5a3c6 e7d9a123

telephony/java/android/telephony/satellite/stub/ISatellite.aidl

+9 −0
Original line number Diff line number Diff line
@@ -66,6 +66,15 @@ oneway interface ISatellite { 
    void requestSatelliteListeningEnabled(in boolean enable, in int timeout,

            in IIntegerConsumer resultCallback);



    /**

     * Allow cellular modem scanning while satellite mode is on.

     * @param enabled  {@code true} to enable cellular modem while satellite mode is on

     * and {@code false} to disable

     * @param errorCallback The callback to receive the error code result of the operation.

     */

    void enableCellularModemWhileSatelliteModeIsOn(in boolean enabled,

        in IIntegerConsumer errorCallback);



    /**

     * Request to enable or disable the satellite modem and demo mode. If the satellite modem

     * is enabled, this may also disable the cellular modem, and if the satellite modem is disabled,

telephony/java/android/telephony/satellite/stub/SatelliteImplBase.java

+20 −0
Original line number Diff line number Diff line
@@ -78,6 +78,15 @@ public class SatelliteImplBase extends SatelliteService { 
                    "requestSatelliteListeningEnabled");

        }



        @Override

        public void enableCellularModemWhileSatelliteModeIsOn(boolean enabled,

                IIntegerConsumer errorCallback) throws RemoteException {

            executeMethodAsync(

                    () -> SatelliteImplBase.this

                            .enableCellularModemWhileSatelliteModeIsOn(enabled, errorCallback),

                    "enableCellularModemWhileSatelliteModeIsOn");

        }



        @Override

        public void requestSatelliteEnabled(boolean enableSatellite, boolean enableDemoMode,

                IIntegerConsumer errorCallback) throws RemoteException {
@@ -260,6 +269,17 @@ public class SatelliteImplBase extends SatelliteService { 
        // stub implementation

    }



    /**

     * Allow cellular modem scanning while satellite mode is on.

     * @param enabled  {@code true} to enable cellular modem while satellite mode is on

     * and {@code false} to disable

     * @param errorCallback The callback to receive the error code result of the operation.

     */

    public void enableCellularModemWhileSatelliteModeIsOn(boolean enabled,

            @NonNull IIntegerConsumer errorCallback) {

        // stub implementation

    }



    /**

     * Request to enable or disable the satellite modem and demo mode. If the satellite modem is

     * enabled, this may also disable the cellular modem, and if the satellite modem is disabled,