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

Commit 838809d8 authored by Amit Mahajan's avatar Amit Mahajan Committed by Automerger Merge Worker
Browse files

Merge "Re-expose TrafficDescriptor.Builder for testing." into sc-dev am: 9753f5c3 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14238260

Change-Id: I207e54a786938ceebfa3bd870f82b48e2b5ff000
parents 0dfd32df 9753f5c3

core/api/current.txt

+7 −0
Original line number Diff line number Diff line
@@ -43073,6 +43073,13 @@ package android.telephony.data { 
    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.data.TrafficDescriptor> CREATOR;

  }













  public static final class TrafficDescriptor.Builder {













    ctor public TrafficDescriptor.Builder();













    method @NonNull public android.telephony.data.TrafficDescriptor build();













    method @NonNull public android.telephony.data.TrafficDescriptor.Builder setDataNetworkName(@NonNull String);













    method @NonNull public android.telephony.data.TrafficDescriptor.Builder setOsAppId(@NonNull byte[]);













  }



























  public final class UrspRule implements android.os.Parcelable {















    method public int describeContents();















    method @IntRange(from=0x0, to=0xff) public int getPrecedence();

























telephony/java/android/telephony/data/TrafficDescriptor.java



+0
−1






























Original line number
Diff line number
Diff line








@@ -125,7 +125,6 @@ public final class TrafficDescriptor implements Parcelable {













     *     .build();















     * </code></pre>















     *













     * @hide















     */















    public static final class Builder {















        private String mDnn = null;