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

Commit 7338e5c2 authored by Jack Yu's avatar Jack Yu
Browse files

Added annotations to the APIs 

Added @Nullable and @NonNull to several APIs.

Test: Manual
Bug: 126701840
Bug: 126702171
Bug: 126702057
Bug: 126702564
Bug: 126703014
Bug: 126702900

Change-Id: Ib4d8b2b45b11ef5d70cd229f33b8c8f903e5e6ee
parent 6bd48a24

api/system-current.txt

+7 −8
Original line number Diff line number Diff line
@@ -6034,7 +6034,7 @@ package android.telephony { 
    method public int describeContents();

    method public int getAccessNetworkTechnology();

    method @NonNull public int[] getAvailableServices();

    method public android.telephony.CellIdentity getCellIdentity();

    method @Nullable public android.telephony.CellIdentity getCellIdentity();

    method @Nullable public android.telephony.DataSpecificRegistrationStates getDataSpecificStates();

    method public int getDomain();

    method public int getRegState();
@@ -6078,7 +6078,7 @@ package android.telephony { 
  public abstract class NetworkService extends android.app.Service {

    ctor public NetworkService();

    method public android.os.IBinder onBind(android.content.Intent);

    method public abstract android.telephony.NetworkService.NetworkServiceProvider onCreateNetworkServiceProvider(int);

    method @Nullable public abstract android.telephony.NetworkService.NetworkServiceProvider onCreateNetworkServiceProvider(int);

    field public static final String NETWORK_SERVICE_INTERFACE = "android.telephony.NetworkService";

  }









@@ -6091,7 +6091,7 @@ package android.telephony {













  }





























  public class NetworkServiceCallback {













    method public void onGetNetworkRegistrationStateComplete(int, android.telephony.NetworkRegistrationState);













    method public void onGetNetworkRegistrationStateComplete(int, @Nullable android.telephony.NetworkRegistrationState);















    field public static final int RESULT_ERROR_BUSY = 3; // 0x3















    field public static final int RESULT_ERROR_FAILED = 5; // 0x5















    field public static final int RESULT_ERROR_ILLEGAL_STATE = 4; // 0x4










@@ -6522,7 +6522,6 @@ package android.telephony.data {



























  public final class DataCallResponse implements android.os.Parcelable {















    ctor public DataCallResponse(int, int, int, int, int, @Nullable String, @Nullable java.util.List<android.net.LinkAddress>, @Nullable java.util.List<java.net.InetAddress>, @Nullable java.util.List<java.net.InetAddress>, @Nullable java.util.List<java.lang.String>, int);













    ctor public DataCallResponse(android.os.Parcel);















    method public int describeContents();















    method public int getActive();















    method @NonNull public java.util.List<android.net.LinkAddress> getAddresses();










@@ -6565,7 +6564,7 @@ package android.telephony.data {













  public abstract class DataService extends android.app.Service {















    ctor public DataService();















    method public android.os.IBinder onBind(android.content.Intent);













    method public abstract android.telephony.data.DataService.DataServiceProvider onCreateDataServiceProvider(int);













    method @Nullable public abstract android.telephony.data.DataService.DataServiceProvider onCreateDataServiceProvider(int);















    field public static final String DATA_SERVICE_INTERFACE = "android.telephony.data.DataService";















    field public static final int REQUEST_REASON_HANDOVER = 3; // 0x3















    field public static final int REQUEST_REASON_NORMAL = 1; // 0x1









@@ -6585,12 +6584,12 @@ package android.telephony.data {













  }





























  public class DataServiceCallback {













    method public void onDataCallListChanged(java.util.List<android.telephony.data.DataCallResponse>);













    method public void onDataCallListChanged(@NonNull java.util.List<android.telephony.data.DataCallResponse>);















    method public void onDeactivateDataCallComplete(int);













    method public void onGetDataCallListComplete(int, java.util.List<android.telephony.data.DataCallResponse>);













    method public void onGetDataCallListComplete(int, @NonNull java.util.List<android.telephony.data.DataCallResponse>);















    method public void onSetDataProfileComplete(int);















    method public void onSetInitialAttachApnComplete(int);













    method public void onSetupDataCallComplete(int, android.telephony.data.DataCallResponse);













    method public void onSetupDataCallComplete(int, @Nullable android.telephony.data.DataCallResponse);















    field public static final int RESULT_ERROR_BUSY = 3; // 0x3















    field public static final int RESULT_ERROR_ILLEGAL_STATE = 4; // 0x4















    field public static final int RESULT_ERROR_INVALID_ARG = 2; // 0x2

































telephony/java/android/telephony/NetworkRegistrationState.java



+1
−0




























Original line number
Diff line number
Diff line








@@ -344,6 +344,7 @@ public class NetworkRegistrationState implements Parcelable {













    /**















     * @return The cell information.















     */













    @Nullable















    public CellIdentity getCellIdentity() {















        return mCellIdentity;















    }

































telephony/java/android/telephony/NetworkService.java



+2
−0




























Original line number
Diff line number
Diff line








@@ -17,6 +17,7 @@













package android.telephony;































import android.annotation.NonNull;













import android.annotation.Nullable;















import android.annotation.SystemApi;















import android.app.Service;















import android.content.Intent;










@@ -232,6 +233,7 @@ public abstract class NetworkService extends Service {













     * @param slotIndex SIM slot id the network service associated with.















     * @return Network service object















     */













    @Nullable















    public abstract NetworkServiceProvider onCreateNetworkServiceProvider(int slotIndex);































    @Override

































telephony/java/android/telephony/NetworkServiceCallback.java



+3
−1




























Original line number
Diff line number
Diff line








@@ -17,6 +17,7 @@













package android.telephony;































import android.annotation.IntDef;













import android.annotation.Nullable;















import android.annotation.SystemApi;















import android.os.RemoteException;















import android.telephony.NetworkService.NetworkServiceProvider;










@@ -75,7 +76,8 @@ public class NetworkServiceCallback {













     *                {@link NetworkServiceCallback#RESULT_ERROR_UNSUPPORTED}















     * @param state The state information to be returned to callback.















     */













    public void onGetNetworkRegistrationStateComplete(int result, NetworkRegistrationState state) {













    public void onGetNetworkRegistrationStateComplete(int result,













                                                      @Nullable NetworkRegistrationState state) {















        INetworkServiceCallback callback = mCallback.get();















        if (callback != null) {















            try {

































telephony/java/android/telephony/data/DataCallResponse.java



+4
−0




























Original line number
Diff line number
Diff line








@@ -25,6 +25,8 @@ import android.os.Parcel;













import android.os.Parcelable;















import android.telephony.data.ApnSetting.ProtocolType;





























import com.android.internal.annotations.VisibleForTesting;





























import java.net.InetAddress;















import java.util.ArrayList;















import java.util.List;










@@ -90,6 +92,8 @@ public final class DataCallResponse implements Parcelable {













        mMtu = mtu;















    }





























    /** @hide */













    @VisibleForTesting















    public DataCallResponse(Parcel source) {















        mStatus = source.readInt();















        mSuggestedRetryTime = source.readInt();