Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add NonNull and Nullable annotations"

Browse Source
This commit is contained in:
Jordan Liu
2019-03-04 20:18:50 +00:00
committed by Gerrit Code Review
parent 6d9dd94da0 260189ceab
commit 56bd70db86
6 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -43454,7 +43454,7 @@ package android.telephony.euicc {
}
public class EuiccManager {
method public android.telephony.euicc.EuiccManager createForCardId(int);
method @NonNull public android.telephony.euicc.EuiccManager createForCardId(int);
method @RequiresPermission("android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS") public void deleteSubscription(int, android.app.PendingIntent);
method @RequiresPermission("android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS") public void downloadSubscription(android.telephony.euicc.DownloadableSubscription, boolean, android.app.PendingIntent);
method @Nullable public String getEid();

14
api/system-current.txt
View File

@@ -4863,8 +4863,8 @@ package android.service.carrier {
public abstract class ApnService extends android.app.Service {
ctor public ApnService();
method public android.os.IBinder onBind(android.content.Intent);
method @WorkerThread public abstract java.util.List<android.content.ContentValues> onRestoreApns(int);
method @NonNull public android.os.IBinder onBind(@Nullable android.content.Intent);
method @WorkerThread @NonNull public abstract java.util.List<android.content.ContentValues> onRestoreApns(int);
}
}
@@ -5512,12 +5512,12 @@ package android.telephony {
field public static final int WWAN = 1; // 0x1
}
public class CallAttributes implements android.os.Parcelable {
ctor public CallAttributes(android.telephony.PreciseCallState, int, android.telephony.CallQuality);
public final class CallAttributes implements android.os.Parcelable {
ctor public CallAttributes(@NonNull android.telephony.PreciseCallState, int, @NonNull android.telephony.CallQuality);
method public int describeContents();
method public android.telephony.CallQuality getCallQuality();
method @NonNull public android.telephony.CallQuality getCallQuality();
method public int getNetworkType();
method public android.telephony.PreciseCallState getPreciseCallState();
method @NonNull public android.telephony.PreciseCallState getPreciseCallState();
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator<android.telephony.CallAttributes> CREATOR;
}
@@ -6834,7 +6834,7 @@ package android.telephony.ims {
}
public class ImsCallSessionListener {
method public void callQualityChanged(android.telephony.CallQuality);
method public void callQualityChanged(@NonNull android.telephony.CallQuality);
method public void callSessionConferenceExtendFailed(android.telephony.ims.ImsReasonInfo);
method public void callSessionConferenceExtendReceived(android.telephony.ims.stub.ImsCallSessionImplBase, android.telephony.ims.ImsCallProfile);
method public void callSessionConferenceExtended(android.telephony.ims.stub.ImsCallSessionImplBase, android.telephony.ims.ImsCallProfile);

6
core/java/android/service/carrier/ApnService.java
View File

@@ -16,6 +16,8 @@
package android.service.carrier;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.annotation.WorkerThread;
import android.app.Service;
@@ -60,7 +62,8 @@ public abstract class ApnService extends Service {
};
@Override
public IBinder onBind(Intent intent) {
@NonNull
public IBinder onBind(@Nullable Intent intent) {
return mBinder;
}
@@ -73,5 +76,6 @@ public abstract class ApnService extends Service {
* subId.
*/
@WorkerThread
@NonNull
public abstract List<ContentValues> onRestoreApns(int subId);
}

9
telephony/java/android/telephony/CallAttributes.java
View File

@@ -16,6 +16,7 @@
package android.telephony;
import android.annotation.NonNull;
import android.annotation.SystemApi;
import android.os.Parcel;
import android.os.Parcelable;
@@ -29,15 +30,15 @@ import java.util.Objects;
* @hide
*/
@SystemApi
public class CallAttributes implements Parcelable {
public final class CallAttributes implements Parcelable {
private PreciseCallState mPreciseCallState;
@NetworkType
private int mNetworkType; // TelephonyManager.NETWORK_TYPE_* ints
private CallQuality mCallQuality;
public CallAttributes(PreciseCallState state, @NetworkType int networkType,
CallQuality callQuality) {
public CallAttributes(@NonNull PreciseCallState state, @NetworkType int networkType,
@NonNull CallQuality callQuality) {
this.mPreciseCallState = state;
this.mNetworkType = networkType;
this.mCallQuality = callQuality;
@@ -59,6 +60,7 @@ public class CallAttributes implements Parcelable {
/**
* Returns the {@link PreciseCallState} of the call.
*/
@NonNull
public PreciseCallState getPreciseCallState() {
return mPreciseCallState;
}
@@ -96,6 +98,7 @@ public class CallAttributes implements Parcelable {
/**
* Returns the {#link CallQuality} of the call.
*/
@NonNull
public CallQuality getCallQuality() {
return mCallQuality;
}

2
telephony/java/android/telephony/euicc/EuiccManager.java
View File

@@ -17,6 +17,7 @@ package android.telephony.euicc;
import android.Manifest;
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.RequiresPermission;
import android.annotation.SdkConstant;
@@ -365,6 +366,7 @@ public class EuiccManager {
*
* @return an EuiccManager that uses the given card ID for all calls.
*/
@NonNull
public EuiccManager createForCardId(int cardId) {
return new EuiccManager(mContext, cardId);
}

3
telephony/java/android/telephony/ims/ImsCallSessionListener.java
View File

@@ -16,6 +16,7 @@
package android.telephony.ims;
import android.annotation.NonNull;
import android.annotation.SystemApi;
import android.os.RemoteException;
import android.telephony.CallQuality;
@@ -619,7 +620,7 @@ public class ImsCallSessionListener {
*
* @param callQuality The new call quality
*/
public void callQualityChanged(CallQuality callQuality) {
public void callQualityChanged(@NonNull CallQuality callQuality) {
try {
mListener.callQualityChanged(callQuality);
} catch (RemoteException e) {