Merge branch 'cm-11.0' into stable/cm-11.0 (601afac3) · Commits · e / os / android_frameworks_opt_telephony

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

+6 −4

Original line number	Original line	Diff line number	Diff line
	@@ -703,10 +703,12 @@ public class CallManager {
	AudioManager audioManager = (AudioManager)		AudioManager audioManager = (AudioManager)
	context.getSystemService(Context.AUDIO_SERVICE);		context.getSystemService(Context.AUDIO_SERVICE);
	int currMode = audioManager.getMode();		int currMode = audioManager.getMode();
	if ((currMode != AudioManager.MODE_IN_CALL) && !(ringingPhone instanceof SipPhone)) {		if (!(ringingPhone instanceof SipPhone)) {
			if (currMode != AudioManager.MODE_IN_CALL) {
	Rlog.d(LOG_TAG, "setAudioMode Setting audio mode from " +		Rlog.d(LOG_TAG, "setAudioMode Setting audio mode from " +
	currMode + " to " + AudioManager.MODE_IN_CALL);		currMode + " to " + AudioManager.MODE_IN_CALL);
	audioManager.setMode(AudioManager.MODE_IN_CALL);		audioManager.setMode(AudioManager.MODE_IN_CALL);
			}
	mSpeedUpAudioForMtCall = true;		mSpeedUpAudioForMtCall = true;
	}		}
	}		}

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

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4629,6 +4629,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
	rr = RILRequest.obtain(RIL_REQUEST_SIM_TRANSMIT_CHANNEL, result);		rr = RILRequest.obtain(RIL_REQUEST_SIM_TRANSMIT_CHANNEL, result);
	}		}

			rr.mParcel.writeInt(cla);
	rr.mParcel.writeInt(command);		rr.mParcel.writeInt(command);
	rr.mParcel.writeInt(channel);		rr.mParcel.writeInt(channel);
	rr.mParcel.writeString(null);		rr.mParcel.writeString(null);
	@@ -4637,7 +4638,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
	rr.mParcel.writeInt(p3);		rr.mParcel.writeInt(p3);
	rr.mParcel.writeString(data);		rr.mParcel.writeString(data);
	rr.mParcel.writeString(null);		rr.mParcel.writeString(null);
	rr.mParcel.writeInt(cla);		rr.mParcel.writeString(null);

	if (RILJ_LOGD) riljLog(rr.serialString() + "> iccExchangeAPDU: "		if (RILJ_LOGD) riljLog(rr.serialString() + "> iccExchangeAPDU: "
	+ requestToString(rr.mRequest)		+ requestToString(rr.mRequest)

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

0 → 100644

+59 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2006 The Android Open Source Project
			* Copyright (C) 2011, 2012 The CyanogenMod Project
			*
			* Licensed under the Apache License, Version 2.0 (the "License");
			* you may not use this file except in compliance with the License.
			* You may obtain a copy of the License at
			*
			* http://www.apache.org/licenses/LICENSE-2.0
			*
			* Unless required by applicable law or agreed to in writing, software
			* distributed under the License is distributed on an "AS IS" BASIS,
			* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
			* See the License for the specific language governing permissions and
			* limitations under the License.
			*/

			package com.android.internal.telephony;

			import com.android.internal.util.BitwiseInputStream;
			import com.android.internal.util.BitwiseInputStream.AccessException;

			public class VirginMobileDecoder {
			/**
			* If we have VirginMobile MMS, decode it
			* Then, update mUserData & mMessageRef fields
			* If not VirginMobile MMS, do nothing
			*/
			public static void decodeMMS(SmsMessageBase sms) {
			BitwiseInputStream inStream;
			byte[] userData = null;
			int ref = 0;
			int i1 = 0;
			int desiredBitLength = 0;
			try {
			inStream = new BitwiseInputStream(sms.getUserData());
			inStream.skip(20);
			final int j = inStream.read(8) << 8;
			final int k = inStream.read(8);
			ref = j \| k;
			inStream.skip(12);
			i1 = inStream.read(8) + -2;
			inStream.skip(13);
			byte abyte1[] = new byte[i1];
			for (int j1 = 0; j1 < i1; j1++) {
			abyte1[j1] = 0;
			}
			desiredBitLength = i1 * 8;
			if (inStream.available() < desiredBitLength) {
			return;
			}
			userData = inStream.readByteArray(desiredBitLength);
			} catch (AccessException e) {
			return;
			}
			sms.mUserData = userData;
			sms.mMessageRef = ref;
			}
			}

src/java/com/android/internal/telephony/cdma/CDMALTEPhone.java

+0 −21

Original line number	Original line	Diff line number	Diff line
	@@ -200,27 +200,6 @@ public class CDMALTEPhone extends CDMAPhone {

	}		}


	/**
	* Sets the "current" field in the telephony provider according to the
	* build-time operator numeric property
	*
	* @return true for success; false otherwise.
	*/
	@Override
	boolean updateCurrentCarrierInProvider(String operatorNumeric) {
	boolean retVal;
	if (mUiccController.getUiccCardApplication(UiccController.APP_FAM_3GPP) == null) {
	if (DBG) log("updateCurrentCarrierInProvider APP_FAM_3GPP == null");
	retVal = super.updateCurrentCarrierInProvider(operatorNumeric);
	} else {
	if (DBG) log("updateCurrentCarrierInProvider not updated");
	retVal = true;
	}
	if (DBG) log("updateCurrentCarrierInProvider X retVal=" + retVal);
	return retVal;
	}

	@Override		@Override
	public boolean updateCurrentCarrierInProvider() {		public boolean updateCurrentCarrierInProvider() {
	if (mSimRecords != null) {		if (mSimRecords != null) {

src/java/com/android/internal/telephony/cdma/CDMAPhone.java

+4 −5