Merge "new carrier id API"
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 69620cd..53384d9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -79,6 +79,7 @@
<protected-broadcast android:name= "com.android.phone.vvm.ACTION_VISUAL_VOICEMAIL_SERVICE_EVENT" />
<protected-broadcast android:name= "com.android.internal.telephony.CARRIER_VVM_PACKAGE_INSTALLED" />
<protected-broadcast android:name= "com.android.cellbroadcastreceiver.GET_LATEST_CB_AREA_INFO" />
+ <protected-broadcast android:name= "android.intent.action.CURRENT_CARRIER_IDENTITY_CHANGED" />
<uses-permission android:name="android.permission.BROADCAST_STICKY" />
<uses-permission android:name="android.permission.CALL_PHONE" />
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 8f4cc09..d705580 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -1768,6 +1768,18 @@
return phone == null ? null : phone.getDeviceSvn();
}
+ @Override
+ public int getSubscriptionCarrierId(int subId) {
+ final Phone phone = getPhone(subId);
+ return phone == null ? TelephonyManager.UNKNOWN_CARRIER_ID : phone.getCarrierId();
+ }
+
+ @Override
+ public String getSubscriptionCarrierName(int subId) {
+ final Phone phone = getPhone(subId);
+ return phone == null ? null : phone.getCarrierName();
+ }
+
//
// Internal helper methods.
//
