Merge "Add Support for getRadioHalVersion()"
am: 4c3c2e7bde
Change-Id: I47447e9357114e30525e7a195684c455a8779147
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index b2da3a1..dd5fbcd 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -114,6 +114,7 @@
import com.android.internal.telephony.CellNetworkScanResult;
import com.android.internal.telephony.CommandException;
import com.android.internal.telephony.DefaultPhoneNotifier;
+import com.android.internal.telephony.HalVersion;
import com.android.internal.telephony.INumberVerificationCallback;
import com.android.internal.telephony.ITelephony;
import com.android.internal.telephony.IccCard;
@@ -158,7 +159,6 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -6651,4 +6651,16 @@
Binder.restoreCallingIdentity(identity);
}
}
+
+ /**
+ * Get the IRadio HAL Version
+ */
+ @Override
+ public int getRadioHalVersion() {
+ Phone phone = getDefaultPhone();
+ if (phone == null) return -1;
+ HalVersion hv = phone.getHalVersion();
+ if (hv.equals(HalVersion.UNKNOWN)) return -1;
+ return hv.major * 100 + hv.minor;
+ }
}