Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51f3b337 authored by Chen Xu's avatar Chen Xu Committed by android-build-merger
Browse files

Merge "add NonNull and Nullable annotation to APIs" am: ade80819 am: 552a1002 

am: 5516b103

Change-Id: I40477f0184a0c7aaced7d426cfae752d66603791
parents 1f8d9304 5516b103

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

+2 −3
Original line number Diff line number Diff line
@@ -2849,9 +2849,8 @@ public class DcTracker extends Handler { 
                        cause, cid, mTelephonyManager.getNetworkType());

            }

            ApnSetting apn = apnContext.getApnSetting();

            mPhone.notifyPreciseDataConnectionFailed(

                    apnContext.getApnType(), apn != null ? apn.getApnName()

                    : "unknown", cause);

            mPhone.notifyPreciseDataConnectionFailed(apnContext.getApnType(),

                    apn != null ? apn.getApnName() : null, cause);



            // Compose broadcast intent send to the specific carrier signaling receivers

            Intent intent = new Intent(TelephonyIntents