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

Add shell command to query Restricted Mode state

Browse Source 
This will be used in the CTS test to query the state of the Restricted
Mode.

Test: adb shell cmd netpolicy get restricted-mode
Bug: 170323671
Bug: 175281879
Change-Id: Ic25b5835d48a4b54eb9f2b4817244651ea09bd60
This commit is contained in:
Patrick Rohr
2021-01-11 12:24:31 +01:00
parent 8b6082b585
commit ce9f94d956
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/net/NetworkPolicyManagerService.java
View File

@@ -3864,6 +3864,13 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
} }
} }
@VisibleForTesting
boolean isRestrictedModeEnabled() {
synchronized (mUidRulesFirstLock) {
return mRestrictedNetworkingMode;
}
}
/** /**
* updates restricted mode state / access for all apps * updates restricted mode state / access for all apps
* Called on initialization and when restricted mode is enabled / disabled. * Called on initialization and when restricted mode is enabled / disabled.

9
services/core/java/com/android/server/net/NetworkPolicyManagerShellCommand.java
View File

@@ -119,6 +119,8 @@ class NetworkPolicyManagerShellCommand extends ShellCommand {
switch(type) { switch(type) {
case "restrict-background": case "restrict-background":
return getRestrictBackground(); return getRestrictBackground();
case "restricted-mode":
return getRestrictedModeState();
} }
pw.println("Error: unknown get type '" + type + "'"); pw.println("Error: unknown get type '" + type + "'");
return -1; return -1;
@@ -255,6 +257,13 @@ class NetworkPolicyManagerShellCommand extends ShellCommand {
return listUidList("App Idle whitelisted UIDs", uids); return listUidList("App Idle whitelisted UIDs", uids);
} }
private int getRestrictedModeState() {
final PrintWriter pw = getOutPrintWriter();
pw.print("Restricted mode status: ");
pw.println(mInterface.isRestrictedModeEnabled() ? "enabled" : "disabled");
return 0;
}
private int getRestrictBackground() throws RemoteException { private int getRestrictBackground() throws RemoteException {
final PrintWriter pw = getOutPrintWriter(); final PrintWriter pw = getOutPrintWriter();
pw.print("Restrict background status: "); pw.print("Restrict background status: ");