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

Commit 4beb6be3 authored by Ruben Brunk's avatar Ruben Brunk
Browse files

Fix crash in ManagedApplicationService. 

- Prevent unbindService call in case where we
  are calling disconnect on a service that has crashed.

Bug: 27706497
Change-Id: Ibb24087685f5152b6d8e339bd1e9dfa29be2730b
parent 482c7da6

services/core/java/com/android/server/utils/ManagedApplicationService.java

+3 −2
Original line number Diff line number Diff line
@@ -62,8 +62,6 @@ public class ManagedApplicationService { 
    private IInterface mBoundInterface;

    private PendingEvent mPendingEvent;







    private ManagedApplicationService(final Context context, final ComponentName component,

            final int userId, int clientLabel, String settingsAction,

            BinderChecker binderChecker) {
@@ -211,6 +209,7 @@ public class ManagedApplicationService { 
                        } else {

                            // Service connection wasn't pending, must have been disconnected

                            mContext.unbindService(this);

                            return;

                        }



                        try {
@@ -242,6 +241,8 @@ public class ManagedApplicationService { 
                @Override

                public void onServiceDisconnected(ComponentName componentName) {

                    Slog.w(TAG, "Service disconnected: " + intent);

                    mConnection = null;

                    mBoundInterface = null;

                }

            };