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

Make SAME_MANAGED_ACCOUNT the default policy

Browse Source 
Bug: 205850201
Test: Manual
Change-Id: I7e8eebd0305274436cf986535ea96c1d9eb89507
This commit is contained in:
Maurice Lam
2021-11-12 15:10:26 -08:00
parent 79cb218693
commit 231cd85dda
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/devicepolicy/java/com/android/server/devicepolicy/ActiveAdmin.java
View File

@@ -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);
}