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

Commit 0846b400 authored by James Mattis's avatar James Mattis
Browse files

Marking setOemNetworkPreference as @SystemApi 

Marking setOemNetworkPreference in ConnectivityManager as @SystemApi.

Bug: 176496438
Bug: 176494815
Test: atest FrameworksNetTests
atest FrameworksNetIntegrationTests
atest CtsNetTestCasesLatestSdk

Change-Id: I4681c88dc3a83f71c387b29610c33594e57cb43f
parent 6f4a9ce8

core/api/system-current.txt

+25 −0
Original line number Diff line number Diff line
@@ -6046,6 +6046,7 @@ package android.net { 
    method @Deprecated @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public void registerTetheringEventCallback(@NonNull java.util.concurrent.Executor, @NonNull android.net.ConnectivityManager.OnTetheringEventCallback);

    method @RequiresPermission(android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK) public void requestNetwork(@NonNull android.net.NetworkRequest, int, int, @NonNull android.os.Handler, @NonNull android.net.ConnectivityManager.NetworkCallback);

    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_AIRPLANE_MODE, android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_STACK}) public void setAirplaneMode(boolean);

    method @RequiresPermission(android.Manifest.permission.CONTROL_OEM_PAID_NETWORK_PREFERENCE) public void setOemNetworkPreference(@NonNull android.net.OemNetworkPreferences, @Nullable java.util.concurrent.Executor, @Nullable android.net.ConnectivityManager.OnSetOemNetworkPreferenceListener);

    method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK}) public boolean shouldAvoidBadWifi();

    method @RequiresPermission(android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK) public void startCaptivePortalApp(@NonNull android.net.Network, @NonNull android.os.Bundle);

    method @Deprecated @RequiresPermission(android.Manifest.permission.TETHER_PRIVILEGED) public void startTethering(int, boolean, android.net.ConnectivityManager.OnStartTetheringCallback);
@@ -6067,6 +6068,10 @@ package android.net { 
    field @Deprecated public static final int TYPE_WIFI_P2P = 13; // 0xd

  }













  public static interface ConnectivityManager.OnSetOemNetworkPreferenceListener {













    method public void onComplete();













  }



























  @Deprecated public abstract static class ConnectivityManager.OnStartTetheringCallback {















    ctor @Deprecated public ConnectivityManager.OnStartTetheringCallback();















    method @Deprecated public void onTetheringFailed();










@@ -6423,6 +6428,26 @@ package android.net {













    ctor public NetworkStats.Entry(@Nullable String, int, int, int, int, int, int, long, long, long, long, long);















  }



























  public final class OemNetworkPreferences implements android.os.Parcelable {













    method public int describeContents();













    method @NonNull public java.util.Map<java.lang.String,java.lang.Integer> getNetworkPreferences();













    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field @NonNull public static final android.os.Parcelable.Creator<android.net.OemNetworkPreferences> CREATOR;













    field public static final int OEM_NETWORK_PREFERENCE_OEM_PAID = 1; // 0x1













    field public static final int OEM_NETWORK_PREFERENCE_OEM_PAID_NO_FALLBACK = 2; // 0x2













    field public static final int OEM_NETWORK_PREFERENCE_OEM_PAID_ONLY = 3; // 0x3













    field public static final int OEM_NETWORK_PREFERENCE_OEM_PRIVATE_ONLY = 4; // 0x4













    field public static final int OEM_NETWORK_PREFERENCE_UNINITIALIZED = 0; // 0x0













  }

























  public static final class OemNetworkPreferences.Builder {













    ctor public OemNetworkPreferences.Builder();













    ctor public OemNetworkPreferences.Builder(@NonNull android.net.OemNetworkPreferences);













    method @NonNull public android.net.OemNetworkPreferences.Builder addNetworkPreference(@NonNull String, int);













    method @NonNull public android.net.OemNetworkPreferences build();













    method @NonNull public android.net.OemNetworkPreferences.Builder clearNetworkPreference(@NonNull String);













  }



























  public abstract class QosCallback {















    ctor public QosCallback();















    method public void onError(@NonNull android.net.QosCallbackException);

































core/java/android/net/OemNetworkPreferences.java



+8
−6




























Original line number
Diff line number
Diff line








@@ -18,6 +18,7 @@ package android.net;





























import android.annotation.IntDef;















import android.annotation.NonNull;













import android.annotation.SystemApi;















import android.os.Bundle;















import android.os.Parcelable;

























@@ -29,6 +30,7 @@ import java.util.Map;













import java.util.Objects;































/** @hide */













@SystemApi















public final class OemNetworkPreferences implements Parcelable {















    /**















     * Default in case this value is not set. Using it will result in an error.









@@ -45,17 +47,17 @@ public final class OemNetworkPreferences implements Parcelable {













    /**















     * If an unmetered network is available, use it.















     * Otherwise, if a network with the OEM_PAID capability is available, use it.













     * Otherwise, the app doesn't get a network.













     * Otherwise, the app doesn't get a default network.















     */















    public static final int OEM_NETWORK_PREFERENCE_OEM_PAID_NO_FALLBACK = 2;































    /**













     * Prefer only NET_CAPABILITY_OEM_PAID networks.













     * Use only NET_CAPABILITY_OEM_PAID networks.















     */















    public static final int OEM_NETWORK_PREFERENCE_OEM_PAID_ONLY = 3;































    /**













     * Prefer only NET_CAPABILITY_OEM_PRIVATE networks.













     * Use only NET_CAPABILITY_OEM_PRIVATE networks.















     */















    public static final int OEM_NETWORK_PREFERENCE_OEM_PRIVATE_ONLY = 4;


























@@ -95,8 +97,6 @@ public final class OemNetworkPreferences implements Parcelable {













    /**















     * Builder used to create {@link OemNetworkPreferences} objects.  Specify the preferred Network















     * to package name mappings.













     *













     * @hide















     */















    public static final class Builder {















        private final Bundle mNetworkMappings;










@@ -135,7 +135,7 @@ public final class OemNetworkPreferences implements Parcelable {













         * @return The builder to facilitate chaining.















         */















        @NonNull













        public Builder removeNetworkPreference(@NonNull final String packageName) {













        public Builder clearNetworkPreference(@NonNull final String packageName) {















            Objects.requireNonNull(packageName);















            mNetworkMappings.remove(packageName);















            return this;










@@ -174,6 +174,8 @@ public final class OemNetworkPreferences implements Parcelable {













     *















     * @param value int value of OemNetworkPreference















     * @return string version of OemNetworkPreference













     *













     * @hide















     */















    @NonNull















    public static String oemNetworkPreferenceToString(@OemNetworkPreference int value) {

































packages/Connectivity/framework/src/android/net/ConnectivityManager.java



+6
−2




























Original line number
Diff line number
Diff line








@@ -5091,8 +5091,10 @@ public class ConnectivityManager {













    /**















     * Listener for {@link #setOemNetworkPreference(OemNetworkPreferences, Executor,















     * OnSetOemNetworkPreferenceListener)}.













     * @hide















     */













    private interface OnSetOemNetworkPreferenceListener {













    @SystemApi













    public interface OnSetOemNetworkPreferenceListener {















        /**















         * Called when setOemNetworkPreference() successfully completes.















         */









@@ -5115,9 +5117,11 @@ public class ConnectivityManager {













     * @throws IllegalArgumentException if {@code preference} contains invalid preference values.















     * @throws SecurityException if missing the appropriate permissions.















     * @throws UnsupportedOperationException if called on a non-automotive device.













     * @hide















     */













    @SystemApi















    @RequiresPermission(android.Manifest.permission.CONTROL_OEM_PAID_NETWORK_PREFERENCE)













    private void setOemNetworkPreference(@NonNull final OemNetworkPreferences preference,













    public void setOemNetworkPreference(@NonNull final OemNetworkPreferences preference,















            @Nullable @CallbackExecutor final Executor executor,















            @Nullable final OnSetOemNetworkPreferenceListener listener) {















        Objects.requireNonNull(preference, "OemNetworkPreferences must be non-null");

































services/core/java/com/android/server/ConnectivityService.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -9332,17 +9332,17 @@ public class ConnectivityService extends IConnectivityManager.Stub













     *















     * Calling this will overwrite the existing preference.















     *













     * @param preference {@link OemNetworkPreferences} The application network preference to be set.















     * @param listener {@link ConnectivityManager.OnSetOemNetworkPreferenceListener} Listener used















     * to communicate completion of setOemNetworkPreference();













     * @param preference {@link OemNetworkPreferences} The application network preference to be set.















     */















    @Override















    public void setOemNetworkPreference(















            @NonNull final OemNetworkPreferences preference,















            @Nullable final IOnSetOemNetworkPreferenceListener listener) {





























        enforceOemNetworkPreferencesPermission();















        enforceAutomotiveDevice();













        enforceOemNetworkPreferencesPermission();































        Objects.requireNonNull(preference, "OemNetworkPreferences must be non-null");















        validateOemNetworkPreferences(preference);

































tests/net/common/java/android/net/OemNetworkPreferencesTest.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -54,7 +54,7 @@ public class OemNetworkPreferencesTest {













    @Test















    public void testBuilderRemoveNetworkPreferenceRequiresNonNullPackageName() {















        assertThrows(NullPointerException.class,













                () -> mBuilder.removeNetworkPreference(null));













                () -> mBuilder.clearNetworkPreference(null));















    }































    @Test










@@ -129,7 +129,7 @@ public class OemNetworkPreferencesTest {





























        assertTrue(networkPreferences.containsKey(TEST_PACKAGE));





























        mBuilder.removeNetworkPreference(TEST_PACKAGE);













        mBuilder.clearNetworkPreference(TEST_PACKAGE);















        networkPreferences = mBuilder.build().getNetworkPreferences();































        assertFalse(networkPreferences.containsKey(TEST_PACKAGE));