Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32dfe1b7 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android Git Automerger
Browse files

am 9ce35c2c: am db6db412: am 0657f9f3: am 4a0e791c: Workaround View.post... 

am 9ce35c2c: am db6db412: am 0657f9f3: am 4a0e791c: Workaround View.post issues to fix runtime crash

* commit '9ce35c2c':
  Workaround View.post issues to fix runtime crash
parents 0e252720 9ce35c2c

services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java

+5 −2
Original line number Original line Diff line number Diff line
@@ -8,6 +8,7 @@ import android.content.pm.ActivityInfo; 
import android.content.res.Resources;

import android.content.res.Resources;

import android.graphics.PixelFormat;

import android.graphics.PixelFormat;

import android.os.Bundle;

import android.os.Bundle;

import android.os.Handler;

import android.os.IBinder;

import android.os.IBinder;

import android.os.RemoteException;

import android.os.RemoteException;

import android.os.UserHandle;

import android.os.UserHandle;
@@ -34,6 +35,7 @@ public class KeyguardServiceDelegate { 
    protected KeyguardServiceWrapper mKeyguardService;

    protected KeyguardServiceWrapper mKeyguardService;

    private final Context mContext;

    private final Context mContext;

    private final View mScrim; // shown if keyguard crashes

    private final View mScrim; // shown if keyguard crashes

    private final Handler mScrimHandler;

    private final KeyguardState mKeyguardState = new KeyguardState();

    private final KeyguardState mKeyguardState = new KeyguardState();

    private DrawnListener mDrawnListenerWhenConnect;

    private DrawnListener mDrawnListenerWhenConnect;
@@ -103,6 +105,7 @@ public class KeyguardServiceDelegate { 
    public KeyguardServiceDelegate(Context context) {

    public KeyguardServiceDelegate(Context context) {

        mContext = context;

        mContext = context;

        mScrim = createScrim(context);

        mScrim = createScrim(context);

        mScrimHandler = new Handler();

    }

    }





    public void bindService(Context context) {

    public void bindService(Context context) {
@@ -337,7 +340,7 @@ public class KeyguardServiceDelegate { 
    public void showScrim() {

    public void showScrim() {

        synchronized (mKeyguardState) {

        synchronized (mKeyguardState) {

            if (!mKeyguardState.deviceHasKeyguard) return;

            if (!mKeyguardState.deviceHasKeyguard) return;

            mScrim.post(new Runnable() {

            mScrimHandler.post(new Runnable() {

                @Override

                @Override

                public void run() {

                public void run() {

                    mScrim.setVisibility(View.VISIBLE);

                    mScrim.setVisibility(View.VISIBLE);
@@ -347,7 +350,7 @@ public class KeyguardServiceDelegate { 
    }

    }





    public void hideScrim() {

    public void hideScrim() {

        mScrim.post(new Runnable() {

        mScrimHandler.post(new Runnable() {

            @Override

            @Override

            public void run() {

            public void run() {

                mScrim.setVisibility(View.GONE);

                mScrim.setVisibility(View.GONE);