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

Merge "Remove ConnectivityService hidden annotations"

Browse Source
This commit is contained in:
Remi NGUYEN VAN
2021-06-04 07:02:37 +00:00
committed by Gerrit Code Review
parent 91c4df62bf 06830749cc
commit 448406a3aa
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
service/src/com/android/server/ConnectivityService.java
View File

@@ -87,7 +87,6 @@ import static android.system.OsConstants.IPPROTO_UDP;
import static java.util.Map.Entry; import static java.util.Map.Entry;
import android.Manifest; import android.Manifest;
import android.annotation.BoolRes;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.app.AppOpsManager; import android.app.AppOpsManager;
@@ -1460,7 +1459,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
mHandler.sendEmptyMessage(EVENT_PRIVATE_DNS_SETTINGS_CHANGED); mHandler.sendEmptyMessage(EVENT_PRIVATE_DNS_SETTINGS_CHANGED);
} }
private void handleAlwaysOnNetworkRequest(NetworkRequest networkRequest, @BoolRes int id) { private void handleAlwaysOnNetworkRequest(NetworkRequest networkRequest, int id) {
final boolean enable = mContext.getResources().getBoolean(id); final boolean enable = mContext.getResources().getBoolean(id);
handleAlwaysOnNetworkRequest(networkRequest, enable); handleAlwaysOnNetworkRequest(networkRequest, enable);
} }
@@ -8777,7 +8776,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
} }
} }
private @VpnManager.VpnType int getVpnType(@Nullable NetworkAgentInfo vpn) { private int getVpnType(@Nullable NetworkAgentInfo vpn) {
if (vpn == null) return VpnManager.TYPE_VPN_NONE; if (vpn == null) return VpnManager.TYPE_VPN_NONE;
final TransportInfo ti = vpn.networkCapabilities.getTransportInfo(); final TransportInfo ti = vpn.networkCapabilities.getTransportInfo();
if (!(ti instanceof VpnTransportInfo)) return VpnManager.TYPE_VPN_NONE; if (!(ti instanceof VpnTransportInfo)) return VpnManager.TYPE_VPN_NONE;