Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove IntDef annotations from NetworkPolicyManager" into sc-dev am: 2debdb3ec2 am: b0409be590

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14747451

Change-Id: If12bf74efcf666761c8756526ea2f1eabddcd32f
This commit is contained in:
Aaron Huang
2021-06-01 08:49:37 +00:00
committed by Automerger Merge Worker
parent 2c5952dd21 b0409be590
commit e3b1213cfa
2 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Android.bp
View File

@@ -322,7 +322,6 @@ java_defaults {
libs: [
"app-compat-annotations",
"ext",
"framework-connectivity-annotations",
"framework-updatable-stubs-module_libs_api",
"unsupportedappusage",
],

4
core/java/android/net/NetworkPolicyManager.java
View File

@@ -34,8 +34,6 @@ import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.Signature;
import android.net.ConnectivityAnnotations.MultipathPreference;
import android.net.ConnectivityAnnotations.RestrictBackgroundStatus;
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiInfo;
import android.os.Build;
@@ -465,7 +463,6 @@ public class NetworkPolicyManager {
*/
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
@RequiresPermission(NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK)
@RestrictBackgroundStatus
public int getRestrictBackgroundStatus(int uid) {
try {
return mService.getRestrictBackgroundStatus(uid);
@@ -591,7 +588,6 @@ public class NetworkPolicyManager {
*/
@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
@RequiresPermission(NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK)
@MultipathPreference
public int getMultipathPreference(@NonNull Network network) {
try {
return mService.getMultipathPreference(network);