Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ec0feefd: Merge "Check the ACTIVATE_ON_DOCK setting in DockObserver." into jb-mr1-dev

Browse Source 
* commit 'ec0feefd4422db1151aee722732d8c9528f6dfa8':
  Check the ACTIVATE_ON_DOCK setting in DockObserver.
This commit is contained in:
John Spurlock
2012-08-08 08:50:43 -07:00
committed by Android Git Automerger
parent cd500c670d ec0feefd44
commit 62293d8dd6
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
services/java/com/android/server/DockObserver.java
View File

@@ -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,10 +219,12 @@ class DockObserver extends UEventObserver {
Slog.w(TAG, "Unable to awaken!", e);
}
} else {
try {
mgr.dream();
} catch (RemoteException e) {
Slog.w(TAG, "Unable to dream!", e);
if (isScreenSaverActivatedOnDock(mContext)) {
try {
mgr.dream();
} catch (RemoteException e) {
Slog.w(TAG, "Unable to dream!", e);
}
}
}
} else {