summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPawit Pornkitprasan <p.pawit@gmail.com>2013-03-31 08:47:00 +0700
committerPawit Pornkitprasan <p.pawit@gmail.com>2013-03-31 08:47:00 +0700
commitbd99c467ea13b816b1350bda294702d87cfcf777 (patch)
treeae8c2e35f9dacac9c780025836051eae91c628be
parent55e90eb792ef64539d7610a369af054802f9eff5 (diff)
downloadandroid_packages_apps_SamsungServiceMode-bd99c467ea13b816b1350bda294702d87cfcf777.tar.gz
android_packages_apps_SamsungServiceMode-bd99c467ea13b816b1350bda294702d87cfcf777.tar.bz2
android_packages_apps_SamsungServiceMode-bd99c467ea13b816b1350bda294702d87cfcf777.zip
SamsungServiceMode: dynamic line countcm-10.1-M3
Initialize the mDisplay array based on the actual number of lines received to avoid NPE due to null values in the array. Change-Id: Id54570bd3fb3f1ee8ff16dd3cbc9daf03a1974b0
-rw-r--r--src/com/cyanogenmod/samsungservicemode/SamsungServiceModeActivity.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/com/cyanogenmod/samsungservicemode/SamsungServiceModeActivity.java b/src/com/cyanogenmod/samsungservicemode/SamsungServiceModeActivity.java
index f760ed0..1901c7b 100644
--- a/src/com/cyanogenmod/samsungservicemode/SamsungServiceModeActivity.java
+++ b/src/com/cyanogenmod/samsungservicemode/SamsungServiceModeActivity.java
@@ -35,11 +35,10 @@ public class SamsungServiceModeActivity extends Activity implements AdapterView.
private static final int DIALOG_INPUT = 0;
private static final int CHARS_PER_LINE = 34;
- private static final int LINES = 16; // 11 on gb and ics, 16 on jb
private ListView mListView;
private EditText mInputText;
- private String[] mDisplay = new String[LINES];
+ private String[] mDisplay;
private int mCurrentSvcMode;
private int mCurrentModeType;
@@ -92,9 +91,10 @@ public class SamsungServiceModeActivity extends Activity implements AdapterView.
}
int lines = aob.length / CHARS_PER_LINE;
- if (lines > LINES) {
- Log.e(TAG, "Datasize " + aob.length + " larger than expected");
- return;
+
+ if (mDisplay == null || mDisplay.length != lines) {
+ Log.v(TAG, "New array = " + lines);
+ mDisplay = new String[lines];
}
for (int i = 0; i < lines; i++) {