Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Sprint: MMS cannot be sent in the UK" into lmp-mr1-dev

Browse Source
This commit is contained in:
xinhe
2015-01-28 21:42:14 +00:00
committed by Android (Google) Code Review
parent 1f81973e7d 6620b4273e
commit fc921d19b6
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -703,7 +703,11 @@ public class TelephonyManager {
public String getNai(int slotId) { public String getNai(int slotId) {
int[] subId = SubscriptionManager.getSubId(slotId); int[] subId = SubscriptionManager.getSubId(slotId);
try { try {
return getSubscriberInfo().getNaiForSubscriber(subId[0]); String nai = getSubscriberInfo().getNaiForSubscriber(subId[0]);
if (Log.isLoggable(TAG, Log.VERBOSE)) {
Rlog.v(TAG, "Nai = " + nai);
}
return nai;
} catch (RemoteException ex) { } catch (RemoteException ex) {
return null; return null;
} catch (NullPointerException ex) { } catch (NullPointerException ex) {