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

am 93487e28: Merge "Sprint: MMS cannot be sent in the UK" into lmp-mr1-dev automerge: fc921d1

Browse Source 
automerge: 5e51c21

* commit '5e51c21943a4e9c0096acbaee5f923e9e0297f25':
  Sprint: MMS cannot be sent in the UK
This commit is contained in:
xinhe
2015-01-28 21:56:50 +00:00
committed by android-build-merger
parent 43181fb72d 5e51c21943
commit 7cfb00fb94
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) {
int[] subId = SubscriptionManager.getSubId(slotId);
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) {
return null;
} catch (NullPointerException ex) {