Merge "Improved Cell Broadcast debug messages." (2d9066c0) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/gsm/GsmCellBroadcastHandler.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -78,6 +78,7 @@ public class GsmCellBroadcastHandler extends CellBroadcastHandler {
		handleBroadcastSms(cbMessage);
		return true;
		}
		if (VDBG) log("Not handled GSM broadcasts.");
		}
		return super.handleSmsMessage(message);
		}
		@@ -106,6 +107,7 @@ public class GsmCellBroadcastHandler extends CellBroadcastHandler {
		}

		SmsCbHeader header = new SmsCbHeader(receivedPdu);
		if (VDBG) log("header=" + header);
		String plmn = TelephonyManager.from(mContext).getNetworkOperatorForPhone(
		mPhone.getPhoneId());
		int lac = -1;
		@@ -154,12 +156,14 @@ public class GsmCellBroadcastHandler extends CellBroadcastHandler {
		mSmsCbPageMap.put(concatInfo, pdus);
		}

		if (VDBG) log("pdus size=" + pdus.length);
		// Page parameter is one-based
		pdus[header.getPageIndex() - 1] = receivedPdu;

		for (byte[] pdu : pdus) {
		if (pdu == null) {
		// Still missing pages, exit
		log("still missing pdu");
		return null;
		}
		}