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

Merge "Merge "add NonNull annotation to API" am: fd2bb72030 am: 6131255e77 am: e658c48ea0"

Browse Source
This commit is contained in:
Android Build Merger (Role)
2019-03-07 01:56:13 +00:00
committed by Android (Google) Code Review
parent 568a2e268f 1deae4e73b
commit 6b69dab550
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -45422,7 +45422,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);

1
telephony/java/android/telephony/data/ApnSetting.java
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;