Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b69dab5 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "add NonNull annotation to API" am: fd2bb720 am: 6131255e am: e658c48e"

parents 568a2e26 1deae4e7

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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);

telephony/java/android/telephony/data/ApnSetting.java

+1 −0
Original line number Diff line number Diff line
@@ -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;