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

Merge "Make SAME_MANAGED_ACCOUNT the default policy"

Browse Source
This commit is contained in:
TreeHugger Robot
2021-11-16 22:12:50 +00:00
committed by Android (Google) Code Review
parent 15b2e036ee 231cd85dda
commit fbeb7661a5
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);
}