Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb563380 authored by Sewook Seo's avatar Sewook Seo Committed by Automerger Merge Worker
Browse files

Merge "API review: Additional documentation & annotation" am: 04c1004e 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2019623

Change-Id: I0087dae04f29f790dd31114f9486d7fcef7c99fb
parents 5cf65dbe 04c1004e

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

+11 −2
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.os.IBinder; 
import android.os.Looper;

import android.os.Message;

import android.os.RemoteException;

import android.telephony.AccessNetworkConstants.RadioAccessNetworkType;

import android.util.Log;

import android.util.SparseArray;
@@ -166,7 +167,8 @@ public abstract class DataService extends Service { 
         *        link properties of the existing data connection, otherwise null.

         * @param callback The result callback for this request.

         */

        public void setupDataCall(int accessNetworkType, @NonNull DataProfile dataProfile,

        public void setupDataCall(

                @RadioAccessNetworkType int accessNetworkType, @NonNull DataProfile dataProfile,

                boolean isRoaming, boolean allowRoaming,

                @SetupDataReason int reason, @Nullable LinkProperties linkProperties,

                @NonNull DataServiceCallback callback) {
@@ -214,7 +216,8 @@ public abstract class DataService extends Service { 
         *        for example, a zero-rating slice.

         * @param callback The result callback for this request.

         */

        public void setupDataCall(int accessNetworkType, @NonNull DataProfile dataProfile,

        public void setupDataCall(

                @RadioAccessNetworkType int accessNetworkType, @NonNull DataProfile dataProfile,

                boolean isRoaming, boolean allowRoaming,

                @SetupDataReason int reason,

                @Nullable LinkProperties linkProperties,
@@ -294,6 +297,9 @@ public abstract class DataService extends Service { 
         * with reason {@link DataService.REQUEST_REASON_HANDOVER}. The target transport now owns

         * the transferred resources and is responsible for releasing them.

         *

         * <p/>

         * Note that the callback will be executed on binder thread.

         *

         * @param cid The identifier of the data call which is provided in {@link DataCallResponse}

         * @param callback The result callback for this request.

         *
@@ -322,6 +328,9 @@ public abstract class DataService extends Service { 
         * </li>

         * </ul>

         *

         * <p/>

         * Note that the callback will be executed on binder thread.

         *

         * @param cid The identifier of the data call which is provided in {@link DataCallResponse}

         * @param callback The result callback for this request.

         *