Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3b1213c authored by Aaron Huang's avatar Aaron Huang Committed by Automerger Merge Worker
Browse files

Merge "Remove IntDef annotations from NetworkPolicyManager" into sc-dev am:... 

Merge "Remove IntDef annotations from NetworkPolicyManager" into sc-dev am: 2debdb3e am: b0409be5

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

Change-Id: If12bf74efcf666761c8756526ea2f1eabddcd32f
parents 2c5952dd b0409be5

Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -322,7 +322,6 @@ java_defaults { 
    libs: [

        "app-compat-annotations",

        "ext",

        "framework-connectivity-annotations",

        "framework-updatable-stubs-module_libs_api",

        "unsupportedappusage",

    ],

core/java/android/net/NetworkPolicyManager.java

+0 −4
Original line number Diff line number Diff line
@@ -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);