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

Commit 106a6927 authored by Craig Mautner's avatar Craig Mautner Committed by Android (Google) Code Review
Browse files

Merge "Keep callback reference from being null." into jb-mr1-dev

parents 3ff8e1a8 00baebe1

policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java

+3 −2
Original line number Diff line number Diff line
@@ -164,8 +164,9 @@ public class KeyguardViewManager { 
    }



    private void inflateKeyguardView() {

        if (mKeyguardView != null) {

            mKeyguardHost.removeView(mKeyguardView);

        View v = mKeyguardHost.findViewById(R.id.keyguard_host_view);

        if (v != null) {

            mKeyguardHost.removeView(v);

        }

        // TODO: Remove once b/7094175 is fixed

        Slog.d(TAG, "inflateKeyguardView: b/7094175 mContext.config="