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

Commit f98f28b6 authored Jul 28, 2015 by Roman Birg Committed by Gerrit Code Review Jul 31, 2015

SystemUI: update to use new Profiles LockSettings obj



CYNGNOS-620
Change-Id: I5fc974da129b34f8f6b0e8cce540e8580e6cfbef
Signed-off-by: Roman Birg <roman@cyngn.com>

parent beb92db7

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -795,7 +795,7 @@ public class KeyguardViewMediator extends SystemUI {
		}
		Profile profile = mProfileManager.getActiveProfile();
		if (profile != null) {
		if (profile.getScreenLockMode() == Profile.LockMode.DISABLE) {
		if (profile.getScreenLockMode().getValue() == Profile.LockMode.DISABLE) {
		if (DEBUG) Log.d(TAG, "isKeyguardDisabled: keyguard is disabled by profile");
		return true;
		}

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -455,7 +455,7 @@ public class StatusBarKeyguardViewManager {
		return Profile.LockMode.DEFAULT;
		}
		final Profile profile = ProfileManager.getInstance(mContext).getActiveProfile();
		return profile == null ? Profile.LockMode.DEFAULT : profile.getScreenLockMode();
		return profile == null ? Profile.LockMode.DEFAULT : profile.getScreenLockMode().getValue();
		}

		public DevicePolicyManager getDevicePolicyManager() {