Merge "Don't send null data call list response" into tm-dev (174c5ebb) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/data/DataService.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -41,6 +41,7 @@ import com.android.telephony.Rlog;
	import java.lang.annotation.Retention;		import java.lang.annotation.Retention;
	import java.lang.annotation.RetentionPolicy;		import java.lang.annotation.RetentionPolicy;
	import java.util.ArrayList;		import java.util.ArrayList;
			import java.util.Collections;
	import java.util.List;		import java.util.List;
	import java.util.Objects;		import java.util.Objects;

	@@ -351,7 +352,7 @@ public abstract class DataService extends Service {
	public void requestDataCallList(@NonNull DataServiceCallback callback) {		public void requestDataCallList(@NonNull DataServiceCallback callback) {
	// The default implementation is to return unsupported.		// The default implementation is to return unsupported.
	callback.onRequestDataCallListComplete(DataServiceCallback.RESULT_ERROR_UNSUPPORTED,		callback.onRequestDataCallListComplete(DataServiceCallback.RESULT_ERROR_UNSUPPORTED,
	null);		Collections.EMPTY_LIST);
	}		}

	private void registerForDataCallListChanged(IDataServiceCallback callback) {		private void registerForDataCallListChanged(IDataServiceCallback callback) {