Merge "Smdk4210RIL: switch video and voicePrivacy, readability" into jellybean (f9c47a67) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/Smdk4210RIL.java

+18 −21

Original line number	Diff line number	Diff line
		@@ -630,7 +630,7 @@ public class Smdk4210RIL extends RIL implements CommandsInterface {
		protected Object
		responseCallList(Parcel p) {
		int num;
		int voiceSettings;
		boolean isVideo;
		ArrayList<DriverCall> response;
		DriverCall dc;
		int dataAvail = p.dataAvail();
		@@ -650,37 +650,34 @@ public class Smdk4210RIL extends RIL implements CommandsInterface {
		for (int i = 0 ; i < num ; i++) {

		dc = new DriverCall();

		dc.state = DriverCall.stateFromCLCC(p.readInt());
		Log.d(LOG_TAG, "state = " + dc.state);
		dc.index = p.readInt();
		Log.d(LOG_TAG, "index = " + dc.index);
		dc.TOA = p.readInt();
		Log.d(LOG_TAG, "state = " + dc.TOA);
		dc.isMpty = (0 != p.readInt());
		Log.d(LOG_TAG, "isMpty = " + dc.isMpty);
		dc.isMT = (0 != p.readInt());
		Log.d(LOG_TAG, "isMT = " + dc.isMT);
		dc.als = p.readInt();
		Log.d(LOG_TAG, "als = " + dc.als);
		voiceSettings = p.readInt();
		dc.isVoice = (0 == voiceSettings) ? false : true;
		Log.d(LOG_TAG, "isVoice = " + dc.isVoice);
		dc.isVoice = (0 != p.readInt());
		isVideo = (0 != p.readInt());
		dc.isVoicePrivacy = (0 != p.readInt());
		//Some Samsung magic data for Videocalls
		voiceSettings = p.readInt();
		//printing it to cosole for later investigation
		Log.d(LOG_TAG, "Samsung magic = " + voiceSettings);
		dc.number = p.readString();
		Log.d(LOG_TAG, "number = " + dc.number);
		int np = p.readInt();
		Log.d(LOG_TAG, "np = " + np);
		dc.numberPresentation = DriverCall.presentationFromCLIP(np);
		dc.name = p.readString();
		Log.d(LOG_TAG, "name = " + dc.name);
		dc.namePresentation = p.readInt();
		Log.d(LOG_TAG, "namePresentation = " + dc.namePresentation);
		int uusInfoPresent = p.readInt();

		Log.d(LOG_TAG, "state = " + dc.state);
		Log.d(LOG_TAG, "index = " + dc.index);
		Log.d(LOG_TAG, "state = " + dc.TOA);
		Log.d(LOG_TAG, "isMpty = " + dc.isMpty);
		Log.d(LOG_TAG, "isMT = " + dc.isMT);
		Log.d(LOG_TAG, "als = " + dc.als);
		Log.d(LOG_TAG, "isVoice = " + dc.isVoice);
		Log.d(LOG_TAG, "isVideo = " + isVideo);
		Log.d(LOG_TAG, "number = " + dc.number);
		Log.d(LOG_TAG, "np = " + np);
		Log.d(LOG_TAG, "name = " + dc.name);
		Log.d(LOG_TAG, "namePresentation = " + dc.namePresentation);
		Log.d(LOG_TAG, "uusInfoPresent = " + uusInfoPresent);

		if (uusInfoPresent == 1) {