From 4616e52aefa8d9b24dc309f2baee1660eec351b5 Mon Sep 17 00:00:00 2001 From: Malcolm Chen Date: Fri, 21 Dec 2018 15:43:57 -0800 Subject: Connect IRadioConfig 1.1 HAL interfaces with RadioConfig.java IRadioConfig 1.1 getPhoneCapability and setPreferredDataModem are defined. Here we hook the calls into RadioConfig. Bug: 121354686 Test: sanity Change-Id: I2a198d446962510ef9a3019d3aa30b40e796ebe0 Merged-In: I2a198d446962510ef9a3019d3aa30b40e796ebe0 --- telephony/java/android/telephony/ModemInfo.java | 5 +++++ telephony/java/com/android/internal/telephony/RILConstants.java | 1 + 2 files changed, 6 insertions(+) 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; -- cgit v1.2.3-59-g8ed1b