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

Commit 202cff3d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Only admin users may change private DNS settings" into tm-qpr-dev am:... 

Merge "Only admin users may change private DNS settings" into tm-qpr-dev am: a5a31037 am: 0369c601

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22414528



Change-Id: Ic449ec3db28b2c68933c851d4b3300ad3932b03a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a9469717 0369c601

src/com/android/settings/network/PrivateDnsPreferenceController.java

+2 −2
Original line number Diff line number Diff line
@@ -89,8 +89,8 @@ public class PrivateDnsPreferenceController extends BasePreferenceController 
            return UNSUPPORTED_ON_DEVICE;

        }

        final UserManager userManager = mContext.getSystemService(UserManager.class);

        if (userManager.isGuestUser()) return DISABLED_FOR_USER;

        return AVAILABLE;

        if (userManager.isAdminUser()) return AVAILABLE;

        return DISABLED_FOR_USER;

    }



    @Override