Merge "Fixed crash when creating bugreport" into mm-wireless-dev (9f69a420) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/Phone.java

+45 −30

Original line number	Diff line number	Diff line
		@@ -3189,44 +3189,59 @@ public abstract class Phone extends Handler implements PhoneInternalInterface {
		pw.flush();
		pw.println("++++++++++++++++++++++++++++++++");

		if (mImsPhone != null) {
		try {
		mImsPhone.dump(fd, pw, args);
		} catch (Exception e) {
		e.printStackTrace();
		}

		pw.flush();
		pw.println("++++++++++++++++++++++++++++++++");
		}

		if (mDcTracker != null) {
		try {
		mDcTracker.dump(fd, pw, args);
		} catch (Exception e) {
		e.printStackTrace();
		}

		pw.flush();
		pw.println("++++++++++++++++++++++++++++++++");
		}

		if (getServiceStateTracker() != null) {
		try {
		getServiceStateTracker().dump(fd, pw, args);
		} catch (Exception e) {
		e.printStackTrace();
		}

		pw.flush();
		pw.println("++++++++++++++++++++++++++++++++");
		}

		if (getCallTracker() != null) {
		try {
		getCallTracker().dump(fd, pw, args);
		} catch (Exception e) {
		e.printStackTrace();
		}

		pw.flush();
		pw.println("++++++++++++++++++++++++++++++++");
		}

		if (mCi != null && mCi instanceof RIL) {
		try {
		((RIL)mCi).dump(fd, pw, args);
		} catch (Exception e) {
		e.printStackTrace();
		}

		pw.flush();
		pw.println("++++++++++++++++++++++++++++++++");
		}
		}
		}

+7 −5

Original line number	Diff line number	Diff line
		@@ -640,10 +640,12 @@ public class RetryManager {
		pw.println(" mSameApnRetryCount = " + mSameApnRetryCount);
		pw.println(" mModemSuggestedDelay = " + mModemSuggestedDelay);

		if (mWaitingApns != null) {
		pw.println(" APN list: ");
		for (int i = 0; i < mWaitingApns.size(); i++) {
		pw.println(" [" + i + "]=" + mWaitingApns.get(i));
		}
		}

		pw.println("***************************************");
		pw.flush();