diff options
| -rw-r--r-- | cmds/dumpstate/dumpstate.c | 7 | ||||
| -rw-r--r-- | docs/html/search.jd | 4 | ||||
| -rw-r--r-- | services/java/com/android/server/DockObserver.java | 23 |
3 files changed, 16 insertions, 18 deletions
diff --git a/cmds/dumpstate/dumpstate.c b/cmds/dumpstate/dumpstate.c index 1f14726..4dda68c 100644 --- a/cmds/dumpstate/dumpstate.c +++ b/cmds/dumpstate/dumpstate.c @@ -111,6 +111,13 @@ static void dumpstate(int full) { "PANIC CONSOLE"); dump_kernel_log("/data/dontpanic/apanic_threads", "PANIC THREADS"); + + PRINT("------ BACKLIGHTS ------"); + DUMP_PROMPT("LCD brightness=", "/sys/class/leds/lcd-backlight/brightness"); + DUMP_PROMPT("Button brightness=", "/sys/class/leds/button-backlight/brightness"); + DUMP_PROMPT("Keyboard brightness=", "/sys/class/leds/keyboard-backlight/brightness"); + DUMP_PROMPT("ALS mode=", "/sys/class/leds/lcd-backlight/als"); + DUMP_PROMPT("LCD driver registers:\n", "/sys/class/leds/lcd-backlight/registers"); } PRINT("========================================================"); PRINT("== build.prop"); diff --git a/docs/html/search.jd b/docs/html/search.jd index 838af03..8032b22 100644 --- a/docs/html/search.jd +++ b/docs/html/search.jd @@ -94,9 +94,9 @@ page.title=Search Results // when an event on the browser history occurs (back, forward, load) perform a search $(window).history(function(e, hash) { - var query = getQuery(hash); + var query = decodeURI(getQuery(hash)); searchControl.execute(query); - $("#searchTitle").html("search results for <em>" + decodeURI(query) + "</em>"); + $("#searchTitle").html("search results for <em>" + query + "</em>"); }); // forcefully regain key-up event control (previously jacked by search api) diff --git a/services/java/com/android/server/DockObserver.java b/services/java/com/android/server/DockObserver.java index aa9c243..f089de1 100644 --- a/services/java/com/android/server/DockObserver.java +++ b/services/java/com/android/server/DockObserver.java @@ -26,6 +26,7 @@ import android.os.Handler; import android.os.Message; import android.os.SystemClock; import android.os.UEventObserver; +import android.provider.Settings; import android.util.Log; import com.android.internal.widget.LockPatternUtils; @@ -154,26 +155,16 @@ class DockObserver extends UEventObserver { mHandler.sendEmptyMessage(0); } - private final void updateKeyguardLocked() { - if (!mLockPatternUtils.isLockPatternEnabled()) { - if (!mKeyguardDisabled && mDockState != Intent.EXTRA_DOCK_STATE_UNDOCKED) { - Log.d(TAG, "calling mKeyguardLock.disableKeyguard"); - mKeyguardLock.disableKeyguard(); - mKeyguardDisabled = true; - } else if (mKeyguardDisabled && mDockState == Intent.EXTRA_DOCK_STATE_UNDOCKED) { - Log.d(TAG, "calling mKeyguardLock.reenableKeyguard"); - mKeyguardLock.reenableKeyguard(); - mKeyguardDisabled = false; - } - } - } - private final Handler mHandler = new Handler() { @Override public void handleMessage(Message msg) { synchronized (this) { - updateKeyguardLocked(); - Log.d(TAG, "Broadcasting dock state " + mDockState); + Log.i(TAG, "Dock state changed: " + mDockState); + if (Settings.Secure.getInt(mContext.getContentResolver(), + Settings.Secure.DEVICE_PROVISIONED, 0) == 0) { + Log.i(TAG, "Device not provisioned, skipping dock broadcast"); + return; + } // Pack up the values and broadcast them to everyone mPowerManager.userActivityWithForce(SystemClock.uptimeMillis(), false, true); Intent intent = new Intent(Intent.ACTION_DOCK_EVENT); |