commit 6e2d702d373b25603b85436e66b06315e5f12cbf
author James Mattis <jmattis@google.com> Tue Jan 26 16:23:52 2021 -0800
committer James Mattis <jmattis@google.com> Thu Feb 11 20:38:21 2021 -0800
tree 31df2221f28f9051f7e9ba4e92f63ed9ba5143c7
parent a46c1446172562802d773d9b5841eec9976c6d4f

Marking setOemNetworkPreference as @SystemApi

Marking setOemNetworkPreference in ConnectivityManager as @SystemApi.

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

Change-Id: I4681c88dc3a83f71c387b29610c33594e57cb43f

framework/src/android/net/ConnectivityManager.java

diff --git a/framework/src/android/net/ConnectivityManager.java b/framework/src/android/net/ConnectivityManager.java
index 811b053..a972d9f 100644
--- a/framework/src/android/net/ConnectivityManager.java
+++ b/framework/src/android/net/ConnectivityManager.java
@@ -5091,8 +5091,10 @@
     /**
      * Listener for {@link #setOemNetworkPreference(OemNetworkPreferences, Executor,
      * OnSetOemNetworkPreferenceListener)}.
+     * @hide
      */
-    private interface OnSetOemNetworkPreferenceListener {
+    @SystemApi
+    public interface OnSetOemNetworkPreferenceListener {
         /**
          * Called when setOemNetworkPreference() successfully completes.
          */
@@ -5115,9 +5117,11 @@
      * @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");