Merge "Synchronize access to Locked methods. DO NOT MERGE" into jb-mr1.1-dev

This commit is contained in:
Craig Mautner
2012-11-13 08:27:22 -08:00
committed by Android (Google) Code Review

View File

@@ -129,6 +129,10 @@ public class KeyguardViewManager {
@Override @Override
protected void onConfigurationChanged(Configuration newConfig) { protected void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig); super.onConfigurationChanged(newConfig);
post(new Runnable() {
@Override
public void run() {
synchronized (KeyguardViewManager.this) {
if (mKeyguardHost.getVisibility() == View.VISIBLE) { if (mKeyguardHost.getVisibility() == View.VISIBLE) {
// only propagate configuration messages if we're currently showing // only propagate configuration messages if we're currently showing
maybeCreateKeyguardLocked(shouldEnableScreenRotation(), true, null); maybeCreateKeyguardLocked(shouldEnableScreenRotation(), true, null);
@@ -136,6 +140,9 @@ public class KeyguardViewManager {
if (DEBUG) Log.v(TAG, "onConfigurationChanged: view not visible"); if (DEBUG) Log.v(TAG, "onConfigurationChanged: view not visible");
} }
} }
}
});
}
@Override @Override
public boolean dispatchKeyEvent(KeyEvent event) { public boolean dispatchKeyEvent(KeyEvent event) {