OSDN Git Service

am b684251e: Fix problems with KeyguardManager.exitKeyguardSecurely() and the FLAG_SH...
authorMike Lockwood <lockwood@android.com>
Wed, 2 Dec 2009 17:49:26 +0000 (09:49 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Dec 2009 17:49:26 +0000 (09:49 -0800)
commita492c9b07dc623c6c7beba7f9a90866053bf24f9
treed319ef1dbffd810d59c77fa8896833c2d271e8ec
parent90bca75513297c2e851638f06ecc821ce75fcbe5
parentb684251e8f1e85ea9483af2b80bc92f0fd8ded1c
am b684251e: Fix problems with KeyguardManager.exitKeyguardSecurely() and the FLAG_SHOW_WHEN_LOCKED window manager flag.

Merge commit 'b684251e8f1e85ea9483af2b80bc92f0fd8ded1c' into eclair-mr2

* commit 'b684251e8f1e85ea9483af2b80bc92f0fd8ded1c':
  Fix problems with KeyguardManager.exitKeyguardSecurely() and the FLAG_SHOW_WHEN_LOCKED window manager flag.
phone/com/android/internal/policy/impl/KeyguardViewMediator.java