Merge "Fixed failing unit test cases" (c45522de) · Commits · e / os / android_frameworks_opt_telephony

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -18,7 +18,8 @@ package com.android.internal.telephony;

		import android.annotation.TargetApi;
		import android.os.Build;
		import android.util.Log;
		import android.telephony.Rlog;

		import com.android.internal.annotations.VisibleForTesting;

		@TargetApi(8)
		@@ -59,7 +60,7 @@ public class RilWakelockInfo {
		if(Build.IS_DEBUGGABLE) {
		IllegalArgumentException e = new IllegalArgumentException(
		"concurrentRequests should always be greater than 0.");
		Log.wtf(LOG_TAG, e);
		Rlog.e(LOG_TAG, e.toString());
		throw e;
		} else {
		concurrentRequests = 1;

src/java/com/android/internal/telephony/test/SimulatedCommands.java

+8 −9

Original line number	Diff line number	Diff line
		@@ -22,39 +22,38 @@ import android.os.HandlerThread;
		import android.os.Looper;
		import android.os.Message;
		import android.os.Parcel;
		import android.os.Registrant;
		import android.os.SystemClock;
		import android.os.WorkSource;
		import android.service.carrier.CarrierIdentifier;
		import android.telephony.CellInfo;
		import android.telephony.CellInfoGsm;
		import android.telephony.IccOpenLogicalChannelResponse;
		import android.telephony.Rlog;
		import android.telephony.ServiceState;
		import android.telephony.SignalStrength;
		import android.telephony.IccOpenLogicalChannelResponse;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.telephony.BaseCommands;
		import com.android.internal.telephony.CallFailCause;
		import com.android.internal.telephony.CommandException;
		import com.android.internal.telephony.CommandsInterface;
		import com.android.internal.telephony.LastCallFailCause;
		import com.android.internal.telephony.Phone;
		import com.android.internal.telephony.PhoneConstants;
		import com.android.internal.telephony.SmsResponse;
		import com.android.internal.telephony.RadioCapability;
		import com.android.internal.telephony.SmsResponse;
		import com.android.internal.telephony.UUSInfo;
		import com.android.internal.telephony.cdma.CdmaSmsBroadcastConfigInfo;
		import com.android.internal.telephony.dataconnection.DataCallResponse;
		import com.android.internal.telephony.dataconnection.DataProfile;
		import com.android.internal.telephony.Phone;
		import com.android.internal.telephony.UUSInfo;
		import com.android.internal.telephony.CallFailCause;
		import com.android.internal.telephony.gsm.SmsBroadcastConfigInfo;
		import com.android.internal.telephony.gsm.SuppServiceNotification;
		import com.android.internal.telephony.LastCallFailCause;
		import com.android.internal.telephony.uicc.IccCardStatus;
		import com.android.internal.telephony.uicc.IccIoResult;

		import java.util.ArrayList;
		import java.util.concurrent.atomic.AtomicBoolean;
		import java.util.List;
		import java.util.concurrent.atomic.AtomicBoolean;
		import java.util.concurrent.atomic.AtomicInteger;

		public class SimulatedCommands extends BaseCommands
		@@ -2107,7 +2106,7 @@ public class SimulatedCommands extends BaseCommands
		public void triggerRestrictedStateChanged(int restrictedState) {
		if (mRestrictedStateRegistrant != null) {
		mRestrictedStateRegistrant.notifyRegistrant(
		new AsyncResult(null, new int[]{restrictedState}, null));
		new AsyncResult(null, restrictedState, null));
		}
		}
		}

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -97,7 +97,7 @@ public class GsmSmsDispatcherTest extends TelephonyTest {

		@Test @SmallTest
		public void testSmsStatus() {
		mSimulatedCommands.notifySmsStatus("0123056789ABCDEF"); //change parameter to byte[] pdu
		mSimulatedCommands.notifySmsStatus("0123056789ABCDEF".getBytes());
		TelephonyTestUtils.waitForMs(50);
		verify(mSimulatedCommandsVerifier).acknowledgeLastIncomingGsmSms(true,
		Telephony.Sms.Intents.RESULT_SMS_HANDLED, null);