Merge "Check the ACTIVATE_ON_DOCK setting in DockObserver." into jb-mr1-dev (ec0feefd) · Commits · e / os / android_frameworks_base

services/java/com/android/server/DockObserver.java

+15 −4

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package com.android.server;

		import static android.provider.Settings.Secure.SCREENSAVER_ACTIVATE_ON_DOCK;

		import com.android.server.power.PowerManagerService;

		import android.bluetooth.BluetoothAdapter;
		@@ -51,6 +53,8 @@ class DockObserver extends UEventObserver {
		private static final String DOCK_UEVENT_MATCH = "DEVPATH=/devices/virtual/switch/dock";
		private static final String DOCK_STATE_PATH = "/sys/class/switch/dock/state";

		private static final int DEFAULT_DOCK = 1;

		private static final int MSG_DOCK_STATE = 0;

		private int mDockState = Intent.EXTRA_DOCK_STATE_UNDOCKED;
		@@ -131,6 +135,11 @@ class DockObserver extends UEventObserver {
		mHandler.sendEmptyMessage(MSG_DOCK_STATE);
		}

		private static boolean isScreenSaverActivatedOnDock(Context context) {
		return 0 != Settings.Secure.getInt(
		context.getContentResolver(), SCREENSAVER_ACTIVATE_ON_DOCK, DEFAULT_DOCK);
		}

		private final Handler mHandler = new Handler() {
		@Override
		public void handleMessage(Message msg) {
		@@ -210,12 +219,14 @@ class DockObserver extends UEventObserver {
		Slog.w(TAG, "Unable to awaken!", e);
		}
		} else {
		if (isScreenSaverActivatedOnDock(mContext)) {
		try {
		mgr.dream();
		} catch (RemoteException e) {
		Slog.w(TAG, "Unable to dream!", e);
		}
		}
		}
		} else {
		// dreams feature not enabled, send legacy intent
		mContext.sendStickyBroadcast(intent);