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

Commit 15858efc authored by David Su's avatar David Su Committed by Android (Google) Code Review
Browse files

Merge changes from topic "framework-jar-build-against-framework-wifi-stubs" 

* changes:
  framework.jar - include framework-wifi-stubs instead of framework-wifi
  Expose WifiConfiguration.SuiteBCipher
parents 8f0903ae eb257295

Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -492,8 +492,7 @@ java_library { 
        "framework-sdkextensions-stubs-systemapi",

        // TODO(b/146167933): Use framework-statsd-stubs instead.

        "framework-statsd",

        // TODO(b/140299412): should be framework-wifi-stubs

        "framework-wifi",

        "framework-wifi-stubs",

        "ike-stubs",

        // TODO(b/147200698): should be the stub of framework-tethering

        "framework-tethering",
@@ -529,7 +528,8 @@ java_library { 
        "compat-changeid-annotation-processor",

    ],

    static_libs: [

        "exoplayer2-core"

        "exoplayer2-core",

        "android.hardware.wifi-V1.0-java-constants",

    ]

}

api/current.txt

+5 −0
Original line number Diff line number Diff line
@@ -30521,6 +30521,11 @@ package android.net.wifi { 
    field @Deprecated public static final String[] strings;

  }













  @Deprecated public static class WifiConfiguration.SuiteBCipher {













    field @Deprecated public static final int ECDHE_ECDSA = 0; // 0x0













    field @Deprecated public static final int ECDHE_RSA = 1; // 0x1













  }



























  public class WifiEnterpriseConfig implements android.os.Parcelable {















    ctor public WifiEnterpriseConfig();















    ctor public WifiEnterpriseConfig(android.net.wifi.WifiEnterpriseConfig);

























wifi/Android.bp



+0
−1






























Original line number
Diff line number
Diff line








@@ -97,7 +97,6 @@ java_library {













    },















    hostdex: true, // for hiddenapi check















    visibility: [













        "//frameworks/base", // TODO(b/140299412) remove once all dependencies are fixed















        "//frameworks/opt/net/wifi/service:__subpackages__",















    ] + test_access_hidden_api_whitelist,















    apex_available: [

































wifi/java/android/net/wifi/WifiConfiguration.java



+0
−1






























Original line number
Diff line number
Diff line








@@ -373,7 +373,6 @@ public class WifiConfiguration implements Parcelable {













     * ECDHE_ECDSA















     * ECDHE_RSA















     * </pre>













     * @hide















     */















    public static class SuiteBCipher {















        private SuiteBCipher() { }