Merge "Make CellBroadcast APIs public" (f8f57c29) · Commits · e / devices / smdk4412 / android_frameworks_opt_telephony

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

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -806,6 +806,9 @@ public class IccSmsInterfaceManager {
	}		}

	public boolean enableCellBroadcastRange(int startMessageId, int endMessageId, int ranType) {		public boolean enableCellBroadcastRange(int startMessageId, int endMessageId, int ranType) {
			mContext.enforceCallingPermission("android.permission.RECEIVE_EMERGENCY_BROADCAST",
			"enabling cell broadcast range [" + startMessageId + "-" + endMessageId + "]. "
			+ "ranType=" + ranType);
	if (ranType == SmsManager.CELL_BROADCAST_RAN_TYPE_GSM) {		if (ranType == SmsManager.CELL_BROADCAST_RAN_TYPE_GSM) {
	return enableGsmBroadcastRange(startMessageId, endMessageId);		return enableGsmBroadcastRange(startMessageId, endMessageId);
	} else if (ranType == SmsManager.CELL_BROADCAST_RAN_TYPE_CDMA) {		} else if (ranType == SmsManager.CELL_BROADCAST_RAN_TYPE_CDMA) {
	@@ -816,6 +819,9 @@ public class IccSmsInterfaceManager {
	}		}

	public boolean disableCellBroadcastRange(int startMessageId, int endMessageId, int ranType) {		public boolean disableCellBroadcastRange(int startMessageId, int endMessageId, int ranType) {
			mContext.enforceCallingPermission("android.permission.RECEIVE_EMERGENCY_BROADCAST",
			"disabling cell broadcast range [" + startMessageId + "-" + endMessageId
			+ "]. ranType=" + ranType);
	if (ranType == SmsManager.CELL_BROADCAST_RAN_TYPE_GSM ) {		if (ranType == SmsManager.CELL_BROADCAST_RAN_TYPE_GSM ) {
	return disableGsmBroadcastRange(startMessageId, endMessageId);		return disableGsmBroadcastRange(startMessageId, endMessageId);
	} else if (ranType == SmsManager.CELL_BROADCAST_RAN_TYPE_CDMA) {		} else if (ranType == SmsManager.CELL_BROADCAST_RAN_TYPE_CDMA) {

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -229,7 +229,7 @@ public class GsmCellBroadcastHandler extends CellBroadcastHandler {

	SmsCbLocation location;		SmsCbLocation location;
	switch (header.getGeographicalScope()) {		switch (header.getGeographicalScope()) {
	case SmsCbMessage.GEOGRAPHICAL_SCOPE_LA_WIDE:		case SmsCbMessage.GEOGRAPHICAL_SCOPE_LOCATION_AREA_WIDE:
	location = new SmsCbLocation(plmn, lac, -1);		location = new SmsCbLocation(plmn, lac, -1);
	break;		break;

tests/telephonytests/src/com/android/internal/telephony/gsm/GsmSmsCbTest.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -92,7 +92,8 @@ public class GsmSmsCbTest extends AndroidTestCase {
	doTestGeographicalScopeValue(pdu, (byte)0x00,		doTestGeographicalScopeValue(pdu, (byte)0x00,
	SmsCbMessage.GEOGRAPHICAL_SCOPE_CELL_WIDE_IMMEDIATE);		SmsCbMessage.GEOGRAPHICAL_SCOPE_CELL_WIDE_IMMEDIATE);
	doTestGeographicalScopeValue(pdu, (byte)0x40, SmsCbMessage.GEOGRAPHICAL_SCOPE_PLMN_WIDE);		doTestGeographicalScopeValue(pdu, (byte)0x40, SmsCbMessage.GEOGRAPHICAL_SCOPE_PLMN_WIDE);
	doTestGeographicalScopeValue(pdu, (byte)0x80, SmsCbMessage.GEOGRAPHICAL_SCOPE_LA_WIDE);		doTestGeographicalScopeValue(pdu, (byte)0x80,
			SmsCbMessage.GEOGRAPHICAL_SCOPE_LOCATION_AREA_WIDE);
	doTestGeographicalScopeValue(pdu, (byte)0xC0, SmsCbMessage.GEOGRAPHICAL_SCOPE_CELL_WIDE);		doTestGeographicalScopeValue(pdu, (byte)0xC0, SmsCbMessage.GEOGRAPHICAL_SCOPE_CELL_WIDE);
	}		}