Preventing shortcut updates if user is locked. (cf755e81) · Commits · e / os / android_packages_apps_DeskClock

src/com/android/deskclock/LogUtils.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -54,6 +54,10 @@ public class LogUtils {
		DEFAULT_LOGGER.wtf(message, args);
		}

		public static void wtf(Throwable e) {
		DEFAULT_LOGGER.wtf(e);
		}

		public final static class Logger {

		/**
		@@ -123,5 +127,11 @@ public class LogUtils {
		: String.format(message, args));
		}
		}

		public void wtf(Throwable e) {
		if (isWtfLoggable()) {
		Log.wtf(logTag, e);
		}
		}
		}
		}
		No newline at end of file

src/com/android/deskclock/controller/ShortcutController.java

+24 −7

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ import android.provider.AlarmClock;
		import com.android.deskclock.DeskClock;
		import com.android.deskclock.HandleApiCalls;
		import com.android.deskclock.HandleDeskClockApiCalls;
		import com.android.deskclock.LogUtils;
		import com.android.deskclock.R;
		import com.android.deskclock.ScreensaverActivity;
		import com.android.deskclock.data.DataModel;
		@@ -62,11 +63,20 @@ class ShortcutController {
		}

		void updateShortcuts() {
		if (!mUserManager.isUserUnlocked()) {
		LogUtils.i("Skipping shortcut update because user is locked.");
		return;
		}
		try {
		final ShortcutInfo alarm = createNewAlarmShortcut();
		final ShortcutInfo timer = createNewTimerShortcut();
		final ShortcutInfo stopwatch = createStopwatchShortcut();
		final ShortcutInfo screensaver = createScreensaverShortcut();
		mShortcutManager.setDynamicShortcuts(Arrays.asList(alarm, timer, stopwatch, screensaver));
		mShortcutManager.setDynamicShortcuts(
		Arrays.asList(alarm, timer, stopwatch, screensaver));
		} catch (IllegalStateException e) {
		LogUtils.wtf(e);
		}
		}

		private ShortcutInfo createNewAlarmShortcut() {
		@@ -152,13 +162,20 @@ class ShortcutController {

		@Override
		public void stopwatchUpdated(Stopwatch before, Stopwatch after) {
		if (mUserManager.isUserUnlocked()) {
		if (!mUserManager.isUserUnlocked()) {
		LogUtils.i("Skipping stopwatch shortcut update because user is locked.");
		return;
		}
		try {
		mShortcutManager.updateShortcuts(
		Collections.singletonList(createStopwatchShortcut()));
		} catch (IllegalStateException e) {
		LogUtils.wtf(e);
		}
		}

		@Override
		public void lapAdded(Lap lap) {}
		public void lapAdded(Lap lap) {
		}
		}
		}