From 23ac92cb394d9cdee129d85593ea045882b6fca5 Mon Sep 17 00:00:00 2001
From: Amit Mahajan <amitmahajan@google.com>
Date: Mon, 19 Apr 2021 14:16:14 -0700
Subject: [PATCH] Re-expose TrafficDescriptor.Builder for testing.

Based on API council feedback.

Test: atest TrafficDescriptorTest
Bug: 185782182
Change-Id: Idb467d37728b062fa29f6bd284bd3144522d701e
---
 core/api/current.txt                                       | 7 +++++++
 .../java/android/telephony/data/TrafficDescriptor.java     | 1 -
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/core/api/current.txt b/core/api/current.txt
index a4afe784e6e8b..08c2bcded93eb 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -43064,6 +43064,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();
diff --git a/telephony/java/android/telephony/data/TrafficDescriptor.java b/telephony/java/android/telephony/data/TrafficDescriptor.java
index f400a5e39704b..2178fc1717b95 100644
--- a/telephony/java/android/telephony/data/TrafficDescriptor.java
+++ b/telephony/java/android/telephony/data/TrafficDescriptor.java
@@ -125,7 +125,6 @@ public final class TrafficDescriptor implements Parcelable {
      *     .build();
      * </code></pre>
      *
-     * @hide
      */
     public static final class Builder {
         private String mDnn = null;