Merge "Send error if ONS is not available" into qt-r1-dev (8a7ebca2) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/TelephonyManager.java

+16 −4

Original line number	Original line	Diff line number	Diff line
	@@ -10834,7 +10834,6 @@ public class TelephonyManager {
	* @param callback Callback will be triggered once it succeeds or failed.		* @param callback Callback will be triggered once it succeeds or failed.
	* See {@link TelephonyManager.SetOpportunisticSubscriptionResult}		* See {@link TelephonyManager.SetOpportunisticSubscriptionResult}
	* for more details. Pass null if don't care about the result.		* for more details. Pass null if don't care about the result.
	*
	*/		*/
	public void setPreferredOpportunisticDataSubscription(int subId, boolean needValidation,		public void setPreferredOpportunisticDataSubscription(int subId, boolean needValidation,
	@Nullable @CallbackExecutor Executor executor, @Nullable Consumer<Integer> callback) {		@Nullable @CallbackExecutor Executor executor, @Nullable Consumer<Integer> callback) {
	@@ -10842,6 +10841,12 @@ public class TelephonyManager {
	try {		try {
	IOns iOpportunisticNetworkService = getIOns();		IOns iOpportunisticNetworkService = getIOns();
	if (iOpportunisticNetworkService == null) {		if (iOpportunisticNetworkService == null) {
			if (executor == null \|\| callback == null) {
			return;
			}
			Binder.withCleanCallingIdentity(() -> executor.execute(() -> {
			callback.accept(SET_OPPORTUNISTIC_SUB_INACTIVE_SUBSCRIPTION);
			}));
	return;		return;
	}		}
	ISetOpportunisticDataCallback callbackStub = new ISetOpportunisticDataCallback.Stub() {		ISetOpportunisticDataCallback callbackStub = new ISetOpportunisticDataCallback.Stub() {
	@@ -10923,9 +10928,16 @@ public class TelephonyManager {
	if (executor == null \|\| callback == null) {		if (executor == null \|\| callback == null) {
	return;		return;
	}		}
			if (iOpportunisticNetworkService == null) {
			/* Todo<b/130595455> passing unknown due to lack of good error codes */
			Binder.withCleanCallingIdentity(() -> executor.execute(() -> {
			callback.accept(UPDATE_AVAILABLE_NETWORKS_UNKNOWN_FAILURE);
			}));
			} else {
	Binder.withCleanCallingIdentity(() -> executor.execute(() -> {		Binder.withCleanCallingIdentity(() -> executor.execute(() -> {
	callback.accept(UPDATE_AVAILABLE_NETWORKS_INVALID_ARGUMENTS);		callback.accept(UPDATE_AVAILABLE_NETWORKS_INVALID_ARGUMENTS);
	}));		}));
			}
	return;		return;
	}		}
	IUpdateAvailableNetworksCallback callbackStub =		IUpdateAvailableNetworksCallback callbackStub =