summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Xiangyu/Malcolm Chen <refuhoo@google.com> 2019-01-21 19:23:53 -0800
committer android-build-merger <android-build-merger@google.com> 2019-01-21 19:23:53 -0800
commit112d88e592111d5c606013ed5ed58e8253f4904e (patch)
tree91cfd547753451dad0a3281ef4107f6d3a949368
parent95b523ce8aecabe1e5679c74acc0b04a56e55eb2 (diff)
parent5c1968475c887c538d085a929750a0a838ba93f9 (diff)
Merge "Connect IRadioConfig 1.1 HAL interfaces with RadioConfig.java"
am: 5c1968475c Change-Id: Ia19133604da30bd1c67b62369f0bcd94c08d0cb4
-rw-r--r--telephony/java/android/telephony/ModemInfo.java5
-rw-r--r--telephony/java/com/android/internal/telephony/RILConstants.java1
2 files changed, 6 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/ModemInfo.java b/telephony/java/android/telephony/ModemInfo.java
index 564effe05e38..27a5121a148c 100644
--- a/telephony/java/android/telephony/ModemInfo.java
+++ b/telephony/java/android/telephony/ModemInfo.java
@@ -32,6 +32,11 @@ public class ModemInfo implements Parcelable {
public final boolean isVoiceSupported;
public final boolean isDataSupported;
+ // TODO b/121394331: Clean up this class after V1_1.PhoneCapability cleanup.
+ public ModemInfo(int modemId) {
+ this(modemId, 0, true, true);
+ }
+
public ModemInfo(int modemId, int rat, boolean isVoiceSupported, boolean isDataSupported) {
this.modemId = modemId;
this.rat = rat;
diff --git a/telephony/java/com/android/internal/telephony/RILConstants.java b/telephony/java/com/android/internal/telephony/RILConstants.java
index 2ebe87067be3..8e58b02de23d 100644
--- a/telephony/java/com/android/internal/telephony/RILConstants.java
+++ b/telephony/java/com/android/internal/telephony/RILConstants.java
@@ -422,6 +422,7 @@ public interface RILConstants {
int RIL_REQUEST_SET_LINK_CAPACITY_REPORTING_CRITERIA = 203;
int RIL_REQUEST_SET_PREFERRED_DATA_MODEM = 204;
int RIL_REQUEST_EMERGENCY_DIAL = 205;
+ int RIL_REQUEST_GET_PHONE_CAPABILITY = 206;
/* Responses begin */
int RIL_RESPONSE_ACKNOWLEDGEMENT = 800;