Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I69a0bc7fd1b4da7cc9da3b3aab6e6689da58da78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hunsuk Choi
2023-02-27 22:33:41 +00:00
committed by Automerger Merge Worker
parent 9da494c88a baf281de2b
commit 62a415bf86
5 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
telephony/java/android/telephony/DomainSelectionService.java
View File

@@ -537,9 +537,9 @@ public class DomainSelectionService extends Service {
} }
@Override @Override
public void onWlanSelected() { public void onWlanSelected(boolean useEmergencyPdn) {
try { try {
mCallback.onWlanSelected(); mCallback.onWlanSelected(useEmergencyPdn);
} catch (Exception e) { } catch (Exception e) {
Rlog.e(TAG, "onWlanSelected e=" + e); Rlog.e(TAG, "onWlanSelected e=" + e);
} }
@@ -702,9 +702,10 @@ public class DomainSelectionService extends Service {
} }
@Override @Override
public void onDomainSelected(@NetworkRegistrationInfo.Domain int domain) { public void onDomainSelected(@NetworkRegistrationInfo.Domain int domain,
boolean useEmergencyPdn) {
try { try {
mCallback.onDomainSelected(domain); mCallback.onDomainSelected(domain, useEmergencyPdn);
} catch (Exception e) { } catch (Exception e) {
Rlog.e(TAG, "onDomainSelected e=" + e); Rlog.e(TAG, "onDomainSelected e=" + e);
} }

4
telephony/java/android/telephony/TransportSelectorCallback.java
View File

@@ -35,8 +35,10 @@ public interface TransportSelectorCallback {
/** /**
* Notify that WLAN transport has been selected. * 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. * Notify that WWAN transport has been selected.

3
telephony/java/android/telephony/WwanSelectorCallback.java
View File

@@ -46,6 +46,7 @@ public interface WwanSelectorCallback {
* this interface can be discarded. * this interface can be discarded.
* *
* @param domain The selected domain. * @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);
} }

2
telephony/java/com/android/internal/telephony/ITransportSelectorCallback.aidl
View File

@@ -22,7 +22,7 @@ import com.android.internal.telephony.IWwanSelectorCallback;
interface ITransportSelectorCallback { interface ITransportSelectorCallback {
oneway void onCreated(in IDomainSelector selector); oneway void onCreated(in IDomainSelector selector);
oneway void onWlanSelected(); oneway void onWlanSelected(boolean useEmergencyPdn);
IWwanSelectorCallback onWwanSelected(); IWwanSelectorCallback onWwanSelected();
oneway void onWwanSelectedAsync(in ITransportSelectorResultCallback cb); oneway void onWwanSelectedAsync(in ITransportSelectorResultCallback cb);
oneway void onSelectionTerminated(int cause); oneway void onSelectionTerminated(int cause);

2
telephony/java/com/android/internal/telephony/IWwanSelectorCallback.aidl
View File

@@ -21,6 +21,6 @@ import com.android.internal.telephony.IWwanSelectorResultCallback;
oneway interface IWwanSelectorCallback { oneway interface IWwanSelectorCallback {
void onRequestEmergencyNetworkScan(in int[] preferredNetworks, void onRequestEmergencyNetworkScan(in int[] preferredNetworks,
int scanType, in IWwanSelectorResultCallback cb); int scanType, in IWwanSelectorResultCallback cb);
void onDomainSelected(int domain); void onDomainSelected(int domain, boolean useEmergencyPdn);
void onCancel(); void onCancel();
} }