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

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

Browse Source 
am: e658c48ea0

Change-Id: I723c22a0b7e76808cf60667ef7b2fcffac8ce71c
This commit is contained in:
Josh Hou
2019-03-06 17:55:41 -08:00
committed by android-build-merger
parent b32c31d1a9 e658c48ea0
commit 1deae4e73b
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;