From 231cd85dda10c59a41c28d8033d293f86ef4a66a Mon Sep 17 00:00:00 2001 From: Maurice Lam Date: Fri, 12 Nov 2021 15:10:26 -0800 Subject: Make SAME_MANAGED_ACCOUNT the default policy Bug: 205850201 Test: Manual Change-Id: I7e8eebd0305274436cf986535ea96c1d9eb89507 --- .../java/com/android/server/devicepolicy/ActiveAdmin.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/ActiveAdmin.java b/services/devicepolicy/java/com/android/server/devicepolicy/ActiveAdmin.java index 37a84f3698c1..df9ab5003122 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/ActiveAdmin.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/ActiveAdmin.java @@ -16,7 +16,7 @@ package com.android.server.devicepolicy; -import static android.app.admin.DevicePolicyManager.NEARBY_STREAMING_DISABLED; +import static android.app.admin.DevicePolicyManager.NEARBY_STREAMING_SAME_MANAGED_ACCOUNT_ONLY; import static android.app.admin.DevicePolicyManager.PASSWORD_COMPLEXITY_NONE; import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED; @@ -161,10 +161,10 @@ class ActiveAdmin { int mPasswordComplexity = PASSWORD_COMPLEXITY_NONE; @DevicePolicyManager.NearbyStreamingPolicy - int mNearbyNotificationStreamingPolicy = NEARBY_STREAMING_DISABLED; + int mNearbyNotificationStreamingPolicy = NEARBY_STREAMING_SAME_MANAGED_ACCOUNT_ONLY; @DevicePolicyManager.NearbyStreamingPolicy - int mNearbyAppStreamingPolicy = NEARBY_STREAMING_DISABLED; + int mNearbyAppStreamingPolicy = NEARBY_STREAMING_SAME_MANAGED_ACCOUNT_ONLY; @Nullable FactoryResetProtectionPolicy mFactoryResetProtectionPolicy = null; @@ -553,11 +553,11 @@ class ActiveAdmin { if (mPasswordComplexity != PASSWORD_COMPLEXITY_NONE) { writeAttributeValueToXml(out, TAG_PASSWORD_COMPLEXITY, mPasswordComplexity); } - if (mNearbyNotificationStreamingPolicy != NEARBY_STREAMING_DISABLED) { + if (mNearbyNotificationStreamingPolicy != NEARBY_STREAMING_SAME_MANAGED_ACCOUNT_ONLY) { writeAttributeValueToXml(out, TAG_NEARBY_NOTIFICATION_STREAMING_POLICY, mNearbyNotificationStreamingPolicy); } - if (mNearbyAppStreamingPolicy != NEARBY_STREAMING_DISABLED) { + if (mNearbyAppStreamingPolicy != NEARBY_STREAMING_SAME_MANAGED_ACCOUNT_ONLY) { writeAttributeValueToXml(out, TAG_NEARBY_APP_STREAMING_POLICY, mNearbyAppStreamingPolicy); } -- cgit v1.2.3-59-g8ed1b