commit 58c285db623b8120bb1e98e909095ff8150c18bb
author Colin Cross <ccross@android.com> Wed May 18 18:23:18 2022 +0000
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Wed May 18 19:55:16 2022 +0000
tree 55f36a2a77682b9faac797ccddbcf07bcad8c76c
parent 5c011a00dbb692e440cfea01391701f9766658f6

Revert "Autogenerate connectivity jarjar rules"

This reverts commit 53eb35cd828cc92d6cb25858ca87c9330d22dea9.

Reason for revert: b/233081774, caused long build times in FrameworkNetTests

Change-Id: Ide01c994f694b55fc0e87bb0e81584ac44196e68
Merged-In: Ide01c994f694b55fc0e87bb0e81584ac44196e68
(cherry picked from commit ece3171cf018936148c7443dd190814737de1642)
(cherry picked from commit 8e50171f0d764d9814ccfdcd20f98b04f983628b)
Merged-In: Ide01c994f694b55fc0e87bb0e81584ac44196e68

framework/src/android/net/QosSocketInfo.java

diff --git a/framework/src/android/net/QosSocketInfo.java b/framework/src/android/net/QosSocketInfo.java
index acb825f..39c2f33 100644
--- a/framework/src/android/net/QosSocketInfo.java
+++ b/framework/src/android/net/QosSocketInfo.java
@@ -73,10 +73,9 @@
      * The parcel file descriptor wrapped around the socket's file descriptor.
      *
      * @return the parcel file descriptor of the socket
-     * @hide
      */
     @NonNull
-    public ParcelFileDescriptor getParcelFileDescriptor() {
+    ParcelFileDescriptor getParcelFileDescriptor() {
         return mParcelFileDescriptor;
     }