diff options
| author | Nathan Harold <nharold@google.com> | 2019-02-20 17:50:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-02-20 17:50:41 +0000 |
| commit | a6dda25ac90b7ce6a9afa7da6cc86fade59f9ebf (patch) | |
| tree | eb4e192f159ca9731155e9ca6abee722df7b0d55 | |
| parent | 4ba3b12efb713c21904214ee33e44a711bdca3ff (diff) | |
| parent | 69e0ed19e10407bceded9ee0091b3cf6f03660f0 (diff) | |
| download | frameworks_base-a6dda25ac90b7ce6a9afa7da6cc86fade59f9ebf.tar.gz frameworks_base-a6dda25ac90b7ce6a9afa7da6cc86fade59f9ebf.tar.bz2 frameworks_base-a6dda25ac90b7ce6a9afa7da6cc86fade59f9ebf.zip | |
Merge "Expose the Radio HAL Version for Test Purposes"
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 24 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/ITelephony.aidl | 5 |
3 files changed, 30 insertions, 0 deletions
diff --git a/api/test-current.txt b/api/test-current.txt index c9d176979a6..dc97dd06157 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -1479,6 +1479,7 @@ package android.telephony { public class TelephonyManager { method public int getCarrierIdListVersion(); + method public android.util.Pair<java.lang.Integer,java.lang.Integer> getRadioHalVersion(); method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void refreshUiccProfile(); method public void setCarrierTestOverride(String, String, String, String, String, String, String); field public static final int UNKNOWN_CARRIER_ID_LIST_VERSION = -1; // 0xffffffff diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 510faec1c62..80671e91c48 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -10309,4 +10309,28 @@ public class TelephonyManager { } return false; } + + /** + * Retrieve the Radio HAL Version for this device. + * + * Get the HAL version for the IRadio interface for test purposes. + * + * @return a Pair of (major version, minor version) or (-1,-1) if unknown. + * + * @hide + */ + @TestApi + public Pair<Integer, Integer> getRadioHalVersion() { + try { + ITelephony service = getITelephony(); + if (service != null) { + int version = service.getRadioHalVersion(); + if (version == -1) return new Pair<Integer, Integer>(-1, -1); + return new Pair<Integer, Integer>(version / 100, version % 100); + } + } catch (RemoteException e) { + Log.e(TAG, "getRadioHalVersion() RemoteException", e); + } + return new Pair<Integer, Integer>(-1, -1); + } } diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl index a51b59a273a..0f4fda46c77 100644 --- a/telephony/java/com/android/internal/telephony/ITelephony.aidl +++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl @@ -1847,4 +1847,9 @@ interface ITelephony { * Get the mapping from logical slots to physical slots. */ int[] getSlotsMapping(); + + /** + * Get the IRadio HAL Version encoded as 100 * MAJOR_VERSION + MINOR_VERSION or -1 if unknown + */ + int getRadioHalVersion(); } |