Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 231cd85d authored by Maurice Lam's avatar Maurice Lam
Browse files

Make SAME_MANAGED_ACCOUNT the default policy 

Bug: 205850201
Test: Manual
Change-Id: I7e8eebd0305274436cf986535ea96c1d9eb89507
parent 79cb2186

services/devicepolicy/java/com/android/server/devicepolicy/ActiveAdmin.java

+5 −5
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ 




package com.android.server.devicepolicy;

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_COMPLEXITY_NONE;

import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;

import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
@@ -161,10 +161,10 @@ class ActiveAdmin { 
    int mPasswordComplexity = PASSWORD_COMPLEXITY_NONE;

    int mPasswordComplexity = PASSWORD_COMPLEXITY_NONE;





    @DevicePolicyManager.NearbyStreamingPolicy

    @DevicePolicyManager.NearbyStreamingPolicy

    int mNearbyNotificationStreamingPolicy = NEARBY_STREAMING_DISABLED;

    int mNearbyNotificationStreamingPolicy = NEARBY_STREAMING_SAME_MANAGED_ACCOUNT_ONLY;





    @DevicePolicyManager.NearbyStreamingPolicy

    @DevicePolicyManager.NearbyStreamingPolicy

    int mNearbyAppStreamingPolicy = NEARBY_STREAMING_DISABLED;

    int mNearbyAppStreamingPolicy = NEARBY_STREAMING_SAME_MANAGED_ACCOUNT_ONLY;





    @Nullable

    @Nullable

    FactoryResetProtectionPolicy mFactoryResetProtectionPolicy = null;

    FactoryResetProtectionPolicy mFactoryResetProtectionPolicy = null;
@@ -553,11 +553,11 @@ class ActiveAdmin { 
        if (mPasswordComplexity != PASSWORD_COMPLEXITY_NONE) {

        if (mPasswordComplexity != PASSWORD_COMPLEXITY_NONE) {

            writeAttributeValueToXml(out, TAG_PASSWORD_COMPLEXITY, mPasswordComplexity);

            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,

            writeAttributeValueToXml(out, TAG_NEARBY_NOTIFICATION_STREAMING_POLICY,

                    mNearbyNotificationStreamingPolicy);

                    mNearbyNotificationStreamingPolicy);

        }

        }

        if (mNearbyAppStreamingPolicy != NEARBY_STREAMING_DISABLED) {

        if (mNearbyAppStreamingPolicy != NEARBY_STREAMING_SAME_MANAGED_ACCOUNT_ONLY) {

            writeAttributeValueToXml(out, TAG_NEARBY_APP_STREAMING_POLICY,

            writeAttributeValueToXml(out, TAG_NEARBY_APP_STREAMING_POLICY,

                    mNearbyAppStreamingPolicy);

                    mNearbyAppStreamingPolicy);

        }

        }