LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Marking setOemNetworkPreference as @SystemApi

Browse Source 
Marking setOemNetworkPreference in ConnectivityManager as @SystemApi.

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

Change-Id: I4681c88dc3a83f71c387b29610c33594e57cb43f
This commit is contained in:
James Mattis
2021-01-26 16:23:52 -08:00
parent a46c144617
commit 6e2d702d37
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
framework/src/android/net/ConnectivityManager.java
View File

@@ -5091,8 +5091,10 @@ public class ConnectivityManager {
/** /**
* Listener for {@link #setOemNetworkPreference(OemNetworkPreferences, Executor, * Listener for {@link #setOemNetworkPreference(OemNetworkPreferences, Executor,
* OnSetOemNetworkPreferenceListener)}. * OnSetOemNetworkPreferenceListener)}.
* @hide
*/ */
private interface OnSetOemNetworkPreferenceListener { @SystemApi
public interface OnSetOemNetworkPreferenceListener {
/** /**
* Called when setOemNetworkPreference() successfully completes. * Called when setOemNetworkPreference() successfully completes.
*/ */
@@ -5115,9 +5117,11 @@ public class ConnectivityManager {
* @throws IllegalArgumentException if {@code preference} contains invalid preference values. * @throws IllegalArgumentException if {@code preference} contains invalid preference values.
* @throws SecurityException if missing the appropriate permissions. * @throws SecurityException if missing the appropriate permissions.
* @throws UnsupportedOperationException if called on a non-automotive device. * @throws UnsupportedOperationException if called on a non-automotive device.
* @hide
*/ */
@SystemApi
@RequiresPermission(android.Manifest.permission.CONTROL_OEM_PAID_NETWORK_PREFERENCE) @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 @CallbackExecutor final Executor executor,
@Nullable final OnSetOemNetworkPreferenceListener listener) { @Nullable final OnSetOemNetworkPreferenceListener listener) {
Objects.requireNonNull(preference, "OemNetworkPreferences must be non-null"); Objects.requireNonNull(preference, "OemNetworkPreferences must be non-null");