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

Commit 62a415bf authored by Hunsuk Choi's avatar Hunsuk Choi Committed by Automerger Merge Worker
Browse files

Merge "Add useEmergencyPdn to onWlanSelected and onDomainSelected" into udc-dev am: baf281de 

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



Change-Id: I69a0bc7fd1b4da7cc9da3b3aab6e6689da58da78
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9da494c8 baf281de

telephony/java/android/telephony/DomainSelectionService.java

+5 −4
Original line number Diff line number Diff line
@@ -537,9 +537,9 @@ public class DomainSelectionService extends Service { 
        }



        @Override

        public void onWlanSelected() {

        public void onWlanSelected(boolean useEmergencyPdn) {

            try {

                mCallback.onWlanSelected();

                mCallback.onWlanSelected(useEmergencyPdn);

            } catch (Exception e) {

                Rlog.e(TAG, "onWlanSelected e=" + e);

            }
@@ -702,9 +702,10 @@ public class DomainSelectionService extends Service { 
        }



        @Override

        public void onDomainSelected(@NetworkRegistrationInfo.Domain int domain) {

        public void onDomainSelected(@NetworkRegistrationInfo.Domain int domain,

                boolean useEmergencyPdn) {

            try {

                mCallback.onDomainSelected(domain);

                mCallback.onDomainSelected(domain, useEmergencyPdn);

            } catch (Exception e) {

                Rlog.e(TAG, "onDomainSelected e=" + e);

            }

telephony/java/android/telephony/TransportSelectorCallback.java

+3 −1
Original line number Diff line number Diff line
@@ -35,8 +35,10 @@ public interface TransportSelectorCallback { 


    /**

     * Notify that WLAN transport has been selected.

     *

     * @param useEmergencyPdn Indicates whether Wi-Fi emergency services use emergency PDN or not.

     */

    void onWlanSelected();

    void onWlanSelected(boolean useEmergencyPdn);



    /**

     * Notify that WWAN transport has been selected.

telephony/java/android/telephony/WwanSelectorCallback.java

+2 −1
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ public interface WwanSelectorCallback { 
     * this interface can be discarded.

     *

     * @param domain The selected domain.

     * @param useEmergencyPdn Indicates whether emergency services use emergency PDN or not.

     */

    void onDomainSelected(@NetworkRegistrationInfo.Domain int domain);

    void onDomainSelected(@NetworkRegistrationInfo.Domain int domain, boolean useEmergencyPdn);

}

telephony/java/com/android/internal/telephony/ITransportSelectorCallback.aidl

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import com.android.internal.telephony.IWwanSelectorCallback; 


interface ITransportSelectorCallback {

    oneway void onCreated(in IDomainSelector selector);

    oneway void onWlanSelected();

    oneway void onWlanSelected(boolean useEmergencyPdn);

    IWwanSelectorCallback onWwanSelected();

    oneway void onWwanSelectedAsync(in ITransportSelectorResultCallback cb);

    oneway void onSelectionTerminated(int cause);

telephony/java/com/android/internal/telephony/IWwanSelectorCallback.aidl

+1 −1
Original line number Diff line number Diff line
@@ -21,6 +21,6 @@ import com.android.internal.telephony.IWwanSelectorResultCallback; 
oneway interface IWwanSelectorCallback {

    void onRequestEmergencyNetworkScan(in int[] preferredNetworks,

            int scanType, in IWwanSelectorResultCallback cb);

    void onDomainSelected(int domain);

    void onDomainSelected(int domain, boolean useEmergencyPdn);

    void onCancel();

}