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

Merge "Strict-related commands porting"

Browse Source 
am: ff9159b1df

Change-Id: Id90549f222a78664e79e2b4284fb9f2269d6803f
This commit is contained in:
Luke Huang
2018-08-13 00:10:47 -07:00
committed by android-build-merger
parent d21d855932 ff9159b1df
commit 0f148251c4
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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