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

Merge "add NonNull annotation to API"

Browse Source
This commit is contained in:
Josh Hou
2019-03-13 00:58:21 +00:00
committed by Gerrit Code Review
parent d2cb5a0608 134ffe709b
commit 56c9d22970
2 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
api/current.txt
View File

@@ -43384,26 +43384,26 @@ package android.telephony.data {
public static class ApnSetting.Builder {
ctor public ApnSetting.Builder();
method public android.telephony.data.ApnSetting build();
method public android.telephony.data.ApnSetting.Builder setApnName(String);
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 @NonNull public android.telephony.data.ApnSetting.Builder setApnName(String);
method @NonNull public android.telephony.data.ApnSetting.Builder setApnTypeBitmask(int);
method @NonNull public android.telephony.data.ApnSetting.Builder setAuthType(int);
method @NonNull public android.telephony.data.ApnSetting.Builder setCarrierEnabled(boolean);
method @NonNull public android.telephony.data.ApnSetting.Builder setCarrierId(int);
method public android.telephony.data.ApnSetting.Builder setEntryName(String);
method @NonNull 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);
method public android.telephony.data.ApnSetting.Builder setMmsProxyPort(int);
method public android.telephony.data.ApnSetting.Builder setMmsc(android.net.Uri);
method public android.telephony.data.ApnSetting.Builder setMvnoType(int);
method public android.telephony.data.ApnSetting.Builder setNetworkTypeBitmask(int);
method public android.telephony.data.ApnSetting.Builder setOperatorNumeric(String);
method public android.telephony.data.ApnSetting.Builder setPassword(String);
method public android.telephony.data.ApnSetting.Builder setProtocol(int);
method @NonNull public android.telephony.data.ApnSetting.Builder setMmsProxyAddress(String);
method @NonNull public android.telephony.data.ApnSetting.Builder setMmsProxyPort(int);
method @NonNull public android.telephony.data.ApnSetting.Builder setMmsc(android.net.Uri);
method @NonNull public android.telephony.data.ApnSetting.Builder setMvnoType(int);
method @NonNull public android.telephony.data.ApnSetting.Builder setNetworkTypeBitmask(int);
method @NonNull public android.telephony.data.ApnSetting.Builder setOperatorNumeric(String);
method @NonNull public android.telephony.data.ApnSetting.Builder setPassword(String);
method @NonNull public android.telephony.data.ApnSetting.Builder setProtocol(int);
method @Deprecated public android.telephony.data.ApnSetting.Builder setProxyAddress(java.net.InetAddress);
method public android.telephony.data.ApnSetting.Builder setProxyAddress(String);
method public android.telephony.data.ApnSetting.Builder setProxyPort(int);
method public android.telephony.data.ApnSetting.Builder setRoamingProtocol(int);
method public android.telephony.data.ApnSetting.Builder setUser(String);
method @NonNull public android.telephony.data.ApnSetting.Builder setProxyAddress(String);
method @NonNull public android.telephony.data.ApnSetting.Builder setProxyPort(int);
method @NonNull public android.telephony.data.ApnSetting.Builder setRoamingProtocol(int);
method @NonNull public android.telephony.data.ApnSetting.Builder setUser(String);
}
}

17
telephony/java/android/telephony/data/ApnSetting.java
View File

@@ -1641,6 +1641,7 @@ public class ApnSetting implements Parcelable {
*
* @param entryName the entry name to set for the APN
*/
@NonNull
public Builder setEntryName(String entryName) {
this.mEntryName = entryName;
return this;
@@ -1651,6 +1652,7 @@ public class ApnSetting implements Parcelable {
*
* @param apnName the name to set for the APN
*/
@NonNull
public Builder setApnName(String apnName) {
this.mApnName = apnName;
return this;
@@ -1681,6 +1683,7 @@ public class ApnSetting implements Parcelable {
*
* @param proxy the proxy address to set for the APN
*/
@NonNull
public Builder setProxyAddress(String proxy) {
this.mProxyAddress = proxy;
return this;
@@ -1691,6 +1694,7 @@ public class ApnSetting implements Parcelable {
*
* @param port the proxy port to set for the APN
*/
@NonNull
public Builder setProxyPort(int port) {
this.mProxyPort = port;
return this;
@@ -1701,6 +1705,7 @@ public class ApnSetting implements Parcelable {
*
* @param mmsc the MMSC Uri to set for the APN
*/
@NonNull
public Builder setMmsc(Uri mmsc) {
this.mMmsc = mmsc;
return this;
@@ -1732,6 +1737,7 @@ public class ApnSetting implements Parcelable {
*
* @param mmsProxy the MMS proxy address to set for the APN
*/
@NonNull
public Builder setMmsProxyAddress(String mmsProxy) {
this.mMmsProxyAddress = mmsProxy;
return this;
@@ -1742,6 +1748,7 @@ public class ApnSetting implements Parcelable {
*
* @param mmsPort the MMS proxy port to set for the APN
*/
@NonNull
public Builder setMmsProxyPort(int mmsPort) {
this.mMmsProxyPort = mmsPort;
return this;
@@ -1752,6 +1759,7 @@ public class ApnSetting implements Parcelable {
*
* @param user the APN username to set for the APN
*/
@NonNull
public Builder setUser(String user) {
this.mUser = user;
return this;
@@ -1763,6 +1771,7 @@ public class ApnSetting implements Parcelable {
* @see android.provider.Telephony.Carriers#PASSWORD
* @param password the APN password to set for the APN
*/
@NonNull
public Builder setPassword(String password) {
this.mPassword = password;
return this;
@@ -1773,6 +1782,7 @@ public class ApnSetting implements Parcelable {
*
* @param authType the authentication type to set for the APN
*/
@NonNull
public Builder setAuthType(@AuthType int authType) {
this.mAuthType = authType;
return this;
@@ -1789,6 +1799,7 @@ public class ApnSetting implements Parcelable {
*
* @param apnTypeBitmask a bitmask describing the types of the APN
*/
@NonNull
public Builder setApnTypeBitmask(@ApnType int apnTypeBitmask) {
this.mApnTypeBitmask = apnTypeBitmask;
return this;
@@ -1801,6 +1812,7 @@ public class ApnSetting implements Parcelable {
*
* @param operatorNumeric the numeric operator ID to set for this entry
*/
@NonNull
public Builder setOperatorNumeric(String operatorNumeric) {
this.mOperatorNumeric = operatorNumeric;
return this;
@@ -1813,6 +1825,7 @@ public class ApnSetting implements Parcelable {
*
* @param protocol the protocol to set to use to connect to this APN
*/
@NonNull
public Builder setProtocol(@ProtocolType int protocol) {
this.mProtocol = protocol;
return this;
@@ -1825,6 +1838,7 @@ public class ApnSetting implements Parcelable {
*
* @param roamingProtocol the protocol to set to use to connect to this APN when roaming
*/
@NonNull
public Builder setRoamingProtocol(@ProtocolType int roamingProtocol) {
this.mRoamingProtocol = roamingProtocol;
return this;
@@ -1835,6 +1849,7 @@ public class ApnSetting implements Parcelable {
*
* @param carrierEnabled the current status to set for this APN
*/
@NonNull
public Builder setCarrierEnabled(boolean carrierEnabled) {
this.mCarrierEnabled = carrierEnabled;
return this;
@@ -1845,6 +1860,7 @@ public class ApnSetting implements Parcelable {
*
* @param networkTypeBitmask the Radio Technology (Network Type) info
*/
@NonNull
public Builder setNetworkTypeBitmask(int networkTypeBitmask) {
this.mNetworkTypeBitmask = networkTypeBitmask;
return this;
@@ -1855,6 +1871,7 @@ public class ApnSetting implements Parcelable {
*
* @param mvnoType the MVNO match type to set for this APN
*/
@NonNull
public Builder setMvnoType(@MvnoType int mvnoType) {
this.mMvnoType = mvnoType;
return this;