Stubbed setOemNetworkPreference in Connectivity

Stubbed setOemNetworkPreference() in ConnectivityService and connected
it to ConnectivityManager.

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

Change-Id: Iabad7300a8b058e1edcb0defab8a031d21e6433c
This commit is contained in:
James Mattis
2021-01-01 14:13:35 -08:00
parent e74935d4e6
commit 47db058602
3 changed files with 18 additions and 3 deletions

View File

@@ -4871,9 +4871,13 @@ public class ConnectivityManager {
} }
} }
private void setOemNetworkPreference(@NonNull OemNetworkPreferences preference) { private void setOemNetworkPreference(@NonNull final OemNetworkPreferences preference) {
Log.d(TAG, "setOemNetworkPreference called with preference: " try {
+ preference.toString()); mService.setOemNetworkPreference(preference);
} catch (RemoteException e) {
Log.e(TAG, "setOemNetworkPreference() failed for preference: " + preference.toString());
throw e.rethrowFromSystemServer();
}
} }
@NonNull @NonNull

View File

@@ -29,6 +29,7 @@ import android.net.NetworkCapabilities;
import android.net.NetworkInfo; import android.net.NetworkInfo;
import android.net.NetworkRequest; import android.net.NetworkRequest;
import android.net.NetworkState; import android.net.NetworkState;
import android.net.OemNetworkPreferences;
import android.net.ProxyInfo; import android.net.ProxyInfo;
import android.net.UidRange; import android.net.UidRange;
import android.net.QosSocketInfo; import android.net.QosSocketInfo;
@@ -243,4 +244,6 @@ interface IConnectivityManager
void registerQosSocketCallback(in QosSocketInfo socketInfo, in IQosCallback callback); void registerQosSocketCallback(in QosSocketInfo socketInfo, in IQosCallback callback);
void unregisterQosCallback(in IQosCallback callback); void unregisterQosCallback(in IQosCallback callback);
void setOemNetworkPreference(in OemNetworkPreferences preference);
} }

View File

@@ -120,6 +120,7 @@ import android.net.NetworkState;
import android.net.NetworkTestResultParcelable; import android.net.NetworkTestResultParcelable;
import android.net.NetworkUtils; import android.net.NetworkUtils;
import android.net.NetworkWatchlistManager; import android.net.NetworkWatchlistManager;
import android.net.OemNetworkPreferences;
import android.net.PrivateDnsConfigParcel; import android.net.PrivateDnsConfigParcel;
import android.net.ProxyInfo; import android.net.ProxyInfo;
import android.net.QosCallbackException; import android.net.QosCallbackException;
@@ -9143,6 +9144,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
} }
} }
} }
/** /**
* Registers {@link QosSocketFilter} with {@link IQosCallback}. * Registers {@link QosSocketFilter} with {@link IQosCallback}.
* *
@@ -9192,4 +9194,10 @@ public class ConnectivityService extends IConnectivityManager.Stub
public void unregisterQosCallback(@NonNull final IQosCallback callback) { public void unregisterQosCallback(@NonNull final IQosCallback callback) {
mQosCallbackTracker.unregisterCallback(callback); mQosCallbackTracker.unregisterCallback(callback);
} }
@Override
public void setOemNetworkPreference(@NonNull final OemNetworkPreferences preference) {
// TODO http://b/176495594 track multiple default networks with networkPreferences
if (DBG) log("setOemNetworkPreference() called with: " + preference.toString());
}
} }