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

* commit '2c37f7b45522d908e1ffc5e63ffccfbe4cdea34b':
  Synchronize access to Locked methods. DO NOT MERGE
This commit is contained in:
Craig Mautner
2012-11-13 08:30:19 -08:00
committed by Android Git Automerger

View File

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