| commit | 033fea5b8d76143e96117ddd7943f2d4fbfc8830 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Fri Jun 14 17:05:46 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 14 17:05:46 2024 +0000 |
| tree | 48ef365ec78a0c1b34a36748b94cf43476e6ffc9 | |
| parent | f2c155a3d5430de4ed328b4bc59df9eaa70775b4 [diff] | |
| parent | e3db116cfdfda26d180b336bbd2b694c6ef86964 [diff] |
Merge "Add assist content admin control" into aosp-main-future am: e3db116cfd Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/27736995 Change-Id: I8a551b111e91c75549ad5175cb37b28aa7d341b3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/PolicyDefinition.java b/services/devicepolicy/java/com/android/server/devicepolicy/PolicyDefinition.java index 901cafa..84d2b7f 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/PolicyDefinition.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/PolicyDefinition.java
@@ -545,7 +545,7 @@ USER_RESTRICTION_FLAGS.put( UserManager.DISALLOW_THREAD_NETWORK, POLICY_FLAG_GLOBAL_ONLY_POLICY); } - + USER_RESTRICTION_FLAGS.put(UserManager.DISALLOW_ASSIST_CONTENT, /* flags= */ 0); for (String key : USER_RESTRICTION_FLAGS.keySet()) { createAndAddUserRestrictionPolicyDefinition(key, USER_RESTRICTION_FLAGS.get(key)); }