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

Commit 7199baa0 authored by Chavi Weingarten's avatar Chavi Weingarten Committed by Automerger Merge Worker
Browse files

Merge "Toast: Fix JE caused by service not bind" am: ddf2f52d am: 3f03d585... 

Merge "Toast: Fix JE caused by service not bind" am: ddf2f52d am: 3f03d585 am: 913bec9f am: 5e747139 am: 158e720b

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2092527



Change-Id: I3621896e9d0359b1e8458557b1ccbb2648585539
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8e40ded4 158e720b

services/core/java/com/android/server/wm/DisplayHashController.java

+5 −4
Original line number Original line Diff line number Diff line
@@ -369,9 +369,6 @@ public class DisplayHashController { 
            if (mServiceConnection == null) {

            if (mServiceConnection == null) {

                if (DEBUG) Slog.v(TAG, "creating connection");

                if (DEBUG) Slog.v(TAG, "creating connection");





                // Create the connection

                mServiceConnection = new DisplayHashingServiceConnection();



                final ComponentName component = getServiceComponentName();

                final ComponentName component = getServiceComponentName();

                if (DEBUG) Slog.v(TAG, "binding to: " + component);

                if (DEBUG) Slog.v(TAG, "binding to: " + component);

                if (component != null) {

                if (component != null) {
@@ -379,6 +376,8 @@ public class DisplayHashController { 
                    intent.setComponent(component);

                    intent.setComponent(component);

                    final long token = Binder.clearCallingIdentity();

                    final long token = Binder.clearCallingIdentity();

                    try {

                    try {

                        // Create the connection

                        mServiceConnection = new DisplayHashingServiceConnection();

                        mContext.bindService(intent, mServiceConnection, Context.BIND_AUTO_CREATE);

                        mContext.bindService(intent, mServiceConnection, Context.BIND_AUTO_CREATE);

                        if (DEBUG) Slog.v(TAG, "bound");

                        if (DEBUG) Slog.v(TAG, "bound");

                    } finally {

                    } finally {
@@ -387,9 +386,11 @@ public class DisplayHashController { 
                }

                }

            }

            }





            if (mServiceConnection != null) {

                mServiceConnection.runCommandLocked(command);

                mServiceConnection.runCommandLocked(command);

            }

            }

        }

        }

    }





    @Nullable

    @Nullable

    private ServiceInfo getServiceInfo() {

    private ServiceInfo getServiceInfo() {