From 1bc2c54ff6b70eec01ad156f789deb8dbce02fb8 Mon Sep 17 00:00:00 2001
From: Nathan Harold <nharold@google.com>
Date: Tue, 13 Dec 2016 19:03:09 -0800
Subject: [PATCH] Remove dependency on IccConstants from SmsManager

-Redefine the length of the SmsRecord in SmsManager

Bug: 33414487
Test: compilation
Change-Id: I941085e96f45164152528c123102a59930859546
---
 telephony/java/android/telephony/SmsManager.java | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/telephony/java/android/telephony/SmsManager.java b/telephony/java/android/telephony/SmsManager.java
index e31755ae80cc3..07bcb3851d763 100644
--- a/telephony/java/android/telephony/SmsManager.java
+++ b/telephony/java/android/telephony/SmsManager.java
@@ -35,7 +35,6 @@ import android.util.Log;
 import com.android.internal.telephony.IMms;
 import com.android.internal.telephony.ISms;
 import com.android.internal.telephony.SmsRawData;
-import com.android.internal.telephony.uicc.IccConstants;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -73,6 +72,16 @@ public final class SmsManager {
     /** @hide */
     public static final int CELL_BROADCAST_RAN_TYPE_CDMA = 1;
 
+    /** SMS record length from TS 51.011 10.5.3
+     * @hide
+     */
+    public static final int SMS_RECORD_LENGTH = 176;
+
+    /** SMS record length from C.S0023 3.4.27
+     * @hide
+     */
+    public static final int CDMA_SMS_RECORD_LENGTH = 255;
+
     private static final Map<Integer, SmsManager> sSubInstances =
             new ArrayMap<Integer, SmsManager>();
 
@@ -753,7 +762,7 @@ public final class SmsManager {
     public boolean
     deleteMessageFromIcc(int messageIndex) {
         boolean success = false;
-        byte[] pdu = new byte[IccConstants.SMS_RECORD_LENGTH-1];
+        byte[] pdu = new byte[SMS_RECORD_LENGTH-1];
         Arrays.fill(pdu, (byte)0xff);
 
         try {