Merge "Fix: updateExternalState() does not update SIM state to PERM_DISABLED"
diff --git a/src/java/com/android/internal/telephony/cat/CommandParamsFactory.java b/src/java/com/android/internal/telephony/cat/CommandParamsFactory.java
old mode 100755
new mode 100644
index 2990da3..cfc8737
--- a/src/java/com/android/internal/telephony/cat/CommandParamsFactory.java
+++ b/src/java/com/android/internal/telephony/cat/CommandParamsFactory.java
@@ -454,6 +454,7 @@
ctlv = searchForTag(ComprehensionTlvTag.ICON_ID, ctlvs);
if (ctlv != null) {
iconId = ValueParser.retrieveIconId(ctlv);
+ input.iconSelfExplanatory = iconId.selfExplanatory;
}
// parse duration
@@ -531,6 +532,7 @@
ctlv = searchForTag(ComprehensionTlvTag.ICON_ID, ctlvs);
if (ctlv != null) {
iconId = ValueParser.retrieveIconId(ctlv);
+ input.iconSelfExplanatory = iconId.selfExplanatory;
}
input.digitOnly = (cmdDet.commandQualifier & 0x01) == 0;
diff --git a/src/java/com/android/internal/telephony/cat/Input.java b/src/java/com/android/internal/telephony/cat/Input.java
index 48705d1..aaaff43 100644
--- a/src/java/com/android/internal/telephony/cat/Input.java
+++ b/src/java/com/android/internal/telephony/cat/Input.java
@@ -37,6 +37,7 @@
public boolean yesNo;
public boolean helpAvailable;
public Duration duration;
+ public boolean iconSelfExplanatory;
Input() {
text = "";
@@ -51,6 +52,7 @@
yesNo = false;
helpAvailable = false;
duration = null;
+ iconSelfExplanatory = false;
}
private Input(Parcel in) {
@@ -66,6 +68,7 @@
yesNo = in.readInt() == 1 ? true : false;
helpAvailable = in.readInt() == 1 ? true : false;
duration = in.readParcelable(null);
+ iconSelfExplanatory = in.readInt() == 1 ? true : false;
}
@Override
@@ -87,6 +90,7 @@
dest.writeInt(yesNo ? 1 : 0);
dest.writeInt(helpAvailable ? 1 : 0);
dest.writeParcelable(duration, 0);
+ dest.writeInt(iconSelfExplanatory ? 1 : 0);
}
public static final Parcelable.Creator<Input> CREATOR = new Parcelable.Creator<Input>() {
