summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcodeworkx <daniel.hillenbrand@codeworkx.de>2012-08-04 10:59:23 +0200
committercodeworkx <daniel.hillenbrand@codeworkx.de>2012-08-04 10:59:23 +0200
commit7d1ce115103af0c17ea6d53c076bb026265b26cf (patch)
tree4f571e5437d44e119b1ee601c0df31e4137558ba
parentf0d5352d630cba2ef010e57ff4573f0f20fdf27b (diff)
downloadframeworks_base-7d1ce115103af0c17ea6d53c076bb026265b26cf.zip
frameworks_base-7d1ce115103af0c17ea6d53c076bb026265b26cf.tar.gz
frameworks_base-7d1ce115103af0c17ea6d53c076bb026265b26cf.tar.bz2
Smdk4210RIL: improve readability of responseCallList
Change-Id: I622180c3f542d5c764d5ac83f1720427893c5758
-rw-r--r--telephony/java/com/android/internal/telephony/Smdk4210RIL.java39
1 files changed, 18 insertions, 21 deletions
diff --git a/telephony/java/com/android/internal/telephony/Smdk4210RIL.java b/telephony/java/com/android/internal/telephony/Smdk4210RIL.java
index 75b64cc..b385627 100644
--- a/telephony/java/com/android/internal/telephony/Smdk4210RIL.java
+++ b/telephony/java/com/android/internal/telephony/Smdk4210RIL.java
@@ -630,8 +630,7 @@ public class Smdk4210RIL extends RIL implements CommandsInterface {
protected Object
responseCallList(Parcel p) {
int num;
- int voiceSettings;
- int videoSettings;
+ boolean isVideo;
ArrayList<DriverCall> response;
DriverCall dc;
int dataAvail = p.dataAvail();
@@ -650,37 +649,35 @@ public class Smdk4210RIL extends RIL implements CommandsInterface {
for (int i = 0 ; i < num ; i++) {
- dc = new DriverCall();
+ dc = new DriverCall();
+ dc.state = DriverCall.stateFromCLCC(p.readInt());
+ dc.index = p.readInt();
+ dc.TOA = p.readInt();
+ dc.isMpty = (0 != p.readInt());
+ dc.isMT = (0 != p.readInt());
+ dc.als = p.readInt();
+ dc.isVoice = (0 != p.readInt());
+ isVideo = (0 != p.readInt());
+ dc.isVoicePrivacy = (0 != p.readInt());
+ dc.number = p.readString();
+ int np = p.readInt();
+ dc.numberPresentation = DriverCall.presentationFromCLIP(np);
+ dc.name = p.readString();
+ dc.namePresentation = p.readInt();
+ int uusInfoPresent = p.readInt();
- dc.state = DriverCall.stateFromCLCC(p.readInt());
Log.d(LOG_TAG, "state = " + dc.state);
- dc.index = p.readInt();
Log.d(LOG_TAG, "index = " + dc.index);
- dc.TOA = p.readInt();
Log.d(LOG_TAG, "state = " + dc.TOA);
- dc.isMpty = (0 != p.readInt());
Log.d(LOG_TAG, "isMpty = " + dc.isMpty);
- dc.isMT = (0 != p.readInt());
Log.d(LOG_TAG, "isMT = " + dc.isMT);
- dc.als = p.readInt();
Log.d(LOG_TAG, "als = " + dc.als);
- voiceSettings = p.readInt();
- dc.isVoice = (0 == voiceSettings) ? false : true;
Log.d(LOG_TAG, "isVoice = " + dc.isVoice);
- // For samsungs videocall feature
- videoSettings = p.readInt();
- Log.d(LOG_TAG, "isVideo = " + videoSettings);
- dc.isVoicePrivacy = (0 != p.readInt());
- dc.number = p.readString();
+ Log.d(LOG_TAG, "isVideo = " + isVideo);
Log.d(LOG_TAG, "number = " + dc.number);
- int np = p.readInt();
Log.d(LOG_TAG, "np = " + np);
- dc.numberPresentation = DriverCall.presentationFromCLIP(np);
- dc.name = p.readString();
Log.d(LOG_TAG, "name = " + dc.name);
- dc.namePresentation = p.readInt();
Log.d(LOG_TAG, "namePresentation = " + dc.namePresentation);
- int uusInfoPresent = p.readInt();
Log.d(LOG_TAG, "uusInfoPresent = " + uusInfoPresent);
if (uusInfoPresent == 1) {