Add multipath preference, background status API am: e62e7ff645

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

Change-Id: I4c1a53223c4cce7759b2cc3efb74a6568abcde57
This commit is contained in:
Remi NGUYEN VAN
2021-03-21 16:37:02 +00:00
committed by Automerger Merge Worker
2 changed files with 3 additions and 14 deletions

View File

@@ -62,7 +62,6 @@ import android.os.PersistableBundle;
import android.os.Process; import android.os.Process;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ResultReceiver; import android.os.ResultReceiver;
import android.os.ServiceManager;
import android.os.ServiceSpecificException; import android.os.ServiceSpecificException;
import android.os.UserHandle; import android.os.UserHandle;
import android.provider.Settings; import android.provider.Settings;
@@ -842,7 +841,6 @@ public class ConnectivityManager {
private final Context mContext; private final Context mContext;
private INetworkPolicyManager mNPManager;
private final TetheringManager mTetheringManager; private final TetheringManager mTetheringManager;
/** /**
@@ -4794,17 +4792,6 @@ public class ConnectivityManager {
public @interface RestrictBackgroundStatus { public @interface RestrictBackgroundStatus {
} }
private INetworkPolicyManager getNetworkPolicyManager() {
synchronized (this) {
if (mNPManager != null) {
return mNPManager;
}
mNPManager = INetworkPolicyManager.Stub.asInterface(ServiceManager
.getService(Context.NETWORK_POLICY_SERVICE));
return mNPManager;
}
}
/** /**
* Determines if the calling application is subject to metered network restrictions while * Determines if the calling application is subject to metered network restrictions while
* running on background. * running on background.
@@ -4815,7 +4802,7 @@ public class ConnectivityManager {
*/ */
public @RestrictBackgroundStatus int getRestrictBackgroundStatus() { public @RestrictBackgroundStatus int getRestrictBackgroundStatus() {
try { try {
return getNetworkPolicyManager().getRestrictBackgroundByCaller(); return mService.getRestrictBackgroundStatusByCaller();
} catch (RemoteException e) { } catch (RemoteException e) {
throw e.rethrowFromSystemServer(); throw e.rethrowFromSystemServer();
} }

View File

@@ -220,4 +220,6 @@ interface IConnectivityManager
void setProfileNetworkPreference(in UserHandle profile, int preference, void setProfileNetworkPreference(in UserHandle profile, int preference,
in IOnCompleteListener listener); in IOnCompleteListener listener);
int getRestrictBackgroundStatusByCaller();
} }