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

Commit 4d121ff8 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by android-build-merger
Browse files

Merge "Actually @hide unwanted capability methods." into pi-dev am: a09c06a6 

am: dc86aaa1

Change-Id: I923e5377a1abe761217612452cbfdba752e53de2
parents b46011b3 dc86aaa1

api/removed.txt

+0 −8
Original line number Diff line number Diff line
@@ -326,14 +326,6 @@ package android.net { 
  public static abstract class NetworkBadging.Badging implements java.lang.annotation.Annotation {

  }



  public class NetworkRequest implements android.os.Parcelable {

    method public boolean hasUnwantedCapability(int);

  }



  public static class NetworkRequest.Builder {

    method public android.net.NetworkRequest.Builder addUnwantedCapability(int);

  }



  public class SSLCertificateSocketFactory extends javax.net.ssl.SSLSocketFactory {

    method public static deprecated org.apache.http.conn.ssl.SSLSocketFactory getHttpSocketFactory(int, android.net.SSLSessionCache);

  }

core/java/android/net/NetworkRequest.java

+2 −2
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ public class NetworkRequest implements Parcelable { 
         * @param capability The capability to add to unwanted capability list.

         * @return The builder to facilitate chaining.

         *

         * @removed

         * @hide

         */

        public Builder addUnwantedCapability(@NetworkCapabilities.NetCapability int capability) {

            mNetworkCapabilities.addUnwantedCapability(capability);
@@ -436,7 +436,7 @@ public class NetworkRequest implements Parcelable { 
    /**

     * @see Builder#addUnwantedCapability(int)

     *

     * @removed

     * @hide

     */

    public boolean hasUnwantedCapability(@NetCapability int capability) {

        return networkCapabilities.hasUnwantedCapability(capability);