diff options
| author | Dou,lilix <lilix.dou@intel.com> | 2015-01-29 16:45:33 +0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-11-07 05:40:43 -0800 |
| commit | c1745e857db5042b61153f19fe09c1926e277fa7 (patch) | |
| tree | 5694a514b89540bc8862e932011f00871b7c4d14 /services | |
| parent | 1bb0a456e10d3de863b9637ae914dd51e06c76c5 (diff) | |
| download | frameworks_base-c1745e857db5042b61153f19fe09c1926e277fa7.zip frameworks_base-c1745e857db5042b61153f19fe09c1926e277fa7.tar.gz frameworks_base-c1745e857db5042b61153f19fe09c1926e277fa7.tar.bz2 | |
Fix system_server crash issue.
Do not show mScrim if has not attached to Window.
As mScrim was created by system_server main thread.
If it has not been attached to Window, Calling this method may cause that
refreshing the View in ActivityManager thread.
Then CalledFromWrongThreadException is throwed.
Change-Id: Id22da7c769751a4b2869e3b59a90f1841513c6b7
Signed-off-by: Dou,lilix <lilix.dou@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java b/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java index 7ae3c79..936dcb1 100644 --- a/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java +++ b/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java @@ -364,7 +364,7 @@ public class KeyguardServiceDelegate { public void showScrim() { synchronized (mKeyguardState) { - if (!mKeyguardState.deviceHasKeyguard) return; + if (!mKeyguardState.deviceHasKeyguard || !mScrim.isAttachedToWindow()) return; mScrimHandler.post(new Runnable() { @Override public void run() { |