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

Commit 1deae4e7 authored by Josh Hou's avatar Josh Hou Committed by android-build-merger
Browse files

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

am: e658c48e

Change-Id: I723c22a0b7e76808cf60667ef7b2fcffac8ce71c
parents b32c31d1 e658c48e

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;