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

Merge "Strict-related commands porting" am: ff9159b1df

Browse Source 
am: 0f148251c4

Change-Id: I325d686498aa8185a5fb620a88da5125b824b4ad
This commit is contained in:
Luke Huang
2018-08-13 00:22:06 -07:00
committed by android-build-merger
parent d827e4b6ad 0f148251c4
commit 6b9564e30f
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
services/core/java/com/android/server/NetworkManagementService.java
View File

@@ -641,12 +641,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub
SystemProperties.set(PROP_QTAGUID_ENABLED, mBandwidthControlEnabled ? "1" : "0");
try {
mConnector.execute("strict", "enable");
mStrictEnabled = true;
} catch (NativeDaemonConnectorException e) {
Log.wtf(TAG, "Failed strict enable", e);
}
mStrictEnabled = true;
setDataSaverModeEnabled(mDataSaverMode);
@@ -1804,26 +1799,26 @@ public class NetworkManagementService extends INetworkManagementService.Stub
}
private void applyUidCleartextNetworkPolicy(int uid, int policy) {
final String policyString;
final int policyValue;
switch (policy) {
case StrictMode.NETWORK_POLICY_ACCEPT:
policyString = "accept";
policyValue = INetd.PENALTY_POLICY_ACCEPT;
break;
case StrictMode.NETWORK_POLICY_LOG:
policyString = "log";
policyValue = INetd.PENALTY_POLICY_LOG;
break;
case StrictMode.NETWORK_POLICY_REJECT:
policyString = "reject";
policyValue = INetd.PENALTY_POLICY_REJECT;
break;
default:
throw new IllegalArgumentException("Unknown policy " + policy);
}
try {
mConnector.execute("strict", "set_uid_cleartext_policy", uid, policyString);
mNetdService.strictUidCleartextPenalty(uid, policyValue);
mUidCleartextPolicy.put(uid, policy);
} catch (NativeDaemonConnectorException e) {
throw e.rethrowAsParcelableException();
} catch (RemoteException | ServiceSpecificException e) {
throw new IllegalStateException(e);
}
}
@@ -1841,6 +1836,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub
return;
}
// TODO: remove this code after removing prepareNativeDaemon()
if (!mStrictEnabled) {
// Module isn't enabled yet; stash the requested policy away to
// apply later once the daemon is connected.