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

Remove ConnectivityService hidden annotations

Browse Source 
BoolRes and VpnType are hidden annotations that should not be used in a
module class.

Original change (project moved):
I84690c868ecc62a546ec97bcae2e017a283dc07e

Test: m
Bug: 171540887
Merged-In: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f
Change-Id: Ie02cff68cf9adf82fc39bde4d2ba2be3255fb3d5
This commit is contained in:
Remi NGUYEN VAN
2021-03-06 00:11:24 +09:00
parent 8f72bd6401
commit 06830749cc
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 android.Manifest;
import android.annotation.BoolRes;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.app.AppOpsManager;
@@ -1460,7 +1459,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
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);
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;
final TransportInfo ti = vpn.networkCapabilities.getTransportInfo();
if (!(ti instanceof VpnTransportInfo)) return VpnManager.TYPE_VPN_NONE;