Merge "add NonNull annotation to API"

This commit is contained in:
Treehugger Robot
2019-03-07 01:07:34 +00:00
committed by Gerrit Code Review
2 changed files with 2 additions and 1 deletions

View File

@@ -43377,7 +43377,7 @@ package android.telephony.data {
method public android.telephony.data.ApnSetting.Builder setApnTypeBitmask(int);
method public android.telephony.data.ApnSetting.Builder setAuthType(int);
method public android.telephony.data.ApnSetting.Builder setCarrierEnabled(boolean);
method public android.telephony.data.ApnSetting.Builder setCarrierId(int);
method @NonNull public android.telephony.data.ApnSetting.Builder setCarrierId(int);
method public android.telephony.data.ApnSetting.Builder setEntryName(String);
method @Deprecated public android.telephony.data.ApnSetting.Builder setMmsProxyAddress(java.net.InetAddress);
method public android.telephony.data.ApnSetting.Builder setMmsProxyAddress(String);

View File

@@ -1868,6 +1868,7 @@ public class ApnSetting implements Parcelable {
*
* @param carrierId the carrier id to set for this APN
*/
@NonNull
public Builder setCarrierId(int carrierId) {
this.mCarrierId = carrierId;
return this;