Merge "CLIR, CLIP: Send complete message in case of CDMA" am: e8e8b36f13 am:... (81e87bd8) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/GsmCdmaPhone.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -82,6 +82,7 @@ import android.util.Pair;

		import com.android.ims.ImsManager;
		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.telephony.CommandException;
		import com.android.internal.telephony.cdma.CdmaMmiCode;
		import com.android.internal.telephony.cdma.CdmaSubscriptionSourceManager;
		import com.android.internal.telephony.dataconnection.DataEnabledSettings;
		@@ -2251,6 +2252,9 @@ public class GsmCdmaPhone extends Phone {
		mCi.getCLIR(onComplete);
		} else {
		loge("getOutgoingCallerIdDisplay: not possible in CDMA");
		AsyncResult.forMessage(onComplete, null,
		new CommandException(CommandException.Error.REQUEST_NOT_SUPPORTED));
		onComplete.sendToTarget();
		}
		}

		@@ -2270,6 +2274,9 @@ public class GsmCdmaPhone extends Phone {
		obtainMessage(EVENT_SET_CLIR_COMPLETE, commandInterfaceCLIRMode, 0, onComplete));
		} else {
		loge("setOutgoingCallerIdDisplay: not possible in CDMA");
		AsyncResult.forMessage(onComplete, null,
		new CommandException(CommandException.Error.REQUEST_NOT_SUPPORTED));
		onComplete.sendToTarget();
		}
		}

		@@ -2285,6 +2292,9 @@ public class GsmCdmaPhone extends Phone {
		mCi.queryCLIP(onComplete);
		} else {
		loge("queryCLIP: not possible in CDMA");
		AsyncResult.forMessage(onComplete, null,
		new CommandException(CommandException.Error.REQUEST_NOT_SUPPORTED));
		onComplete.sendToTarget();
		}
		}