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

Merge changes Iabad7300,I85363e28

Browse Source 
* changes:
  Stubbed setOemNetworkPreference in Connectivity
  Update OemNetworkPreferences to use 1:1 Map
This commit is contained in:
James Mattis
2021-02-06 04:33:51 +00:00
committed by Gerrit Code Review
parent 6a84d58b7f 452c6ffa61
commit e3e711d775
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4845,9 +4845,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

3
framework/src/android/net/IConnectivityManager.aidl
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;
@@ -240,4 +241,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);
} }