summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMohamad Ayyash <mkayyash@google.com>2015-02-18 12:16:17 -0800
committerMohamad Ayyash <mkayyash@google.com>2015-02-18 12:35:48 -0800
commitf98e1c72fc77bd1708c5b1869b64510ae0179f85 (patch)
treed80f79e507defad09059cc2da2118bf668f640cc
parent63f0a7d0588ad2d5f7c24f5b9d74591245ceb4c2 (diff)
downloadframeworks_base-f98e1c72fc77bd1708c5b1869b64510ae0179f85.zip
frameworks_base-f98e1c72fc77bd1708c5b1869b64510ae0179f85.tar.gz
frameworks_base-f98e1c72fc77bd1708c5b1869b64510ae0179f85.tar.bz2
AlsaCardsParser: Ensure line is not NULL when reading Cards File.
Change-Id: I5136bbb776bbbf97229b2d96975b819a94232d66 Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
-rw-r--r--core/java/android/alsa/AlsaCardsParser.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/alsa/AlsaCardsParser.java b/core/java/android/alsa/AlsaCardsParser.java
index 26a61ae..5e88bca 100644
--- a/core/java/android/alsa/AlsaCardsParser.java
+++ b/core/java/android/alsa/AlsaCardsParser.java
@@ -117,6 +117,9 @@ public class AlsaCardsParser {
cardRecord.parse(line, 0);
line = bufferedReader.readLine();
+ if (line == null) {
+ break;
+ }
if (DEBUG) {
Slog.i(TAG, " " + line);
}