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

Commit 86bcd37b authored by hupeng3's avatar hupeng3
Browse files

Toast: Fix JE caused by service not bind 



Before calling unbindService, we need to call bindService,
but there are some logic problems in DisplayHashController,
which cause this problem to occur. Add the control variable mBound.

Bug: 232001919

Test: atest DisplayHashManagerTest

Signed-off-by: default avatarhupeng3 <hp121520@gmail.com>
Change-Id: I84cd1542af345d5078ef40ab282d2d405e967e8e
parent aca9b26c

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

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

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



                // Create the connection

                mServiceConnection = new DisplayHashingServiceConnection();



                final ComponentName component = getServiceComponentName();

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

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

                    final long token = Binder.clearCallingIdentity();

                    try {

                        // Create the connection

                        mServiceConnection = new DisplayHashingServiceConnection();

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

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

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

            }



            if (mServiceConnection != null) {

                mServiceConnection.runCommandLocked(command);

            }

        }

    }



    @Nullable

    private ServiceInfo getServiceInfo() {