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

Commit 7378d289 authored by Winson Chung's avatar Winson Chung
Browse files

Disconnect from overview service if process dies prior to connecting 

Bug: 130812774
Test: None, not reproducible
Change-Id: I656af59ba116b78cd341747f002ca789238e5747
parent 83f228f6

packages/SystemUI/src/com/android/systemui/recents/OverviewProxyService.java

+9 −5
Original line number Diff line number Diff line
@@ -354,17 +354,22 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis 
    private final ServiceConnection mOverviewServiceConnection = new ServiceConnection() {

        @Override

        public void onServiceConnected(ComponentName name, IBinder service) {

            mHandler.removeCallbacks(mDeferredConnectionCallback);

            mCurrentBoundedUserId = mDeviceProvisionedController.getCurrentUser();

            mConnectionBackoffAttempts = 0;

            mOverviewProxy = IOverviewProxy.Stub.asInterface(service);

            // Listen for launcher's death

            mHandler.removeCallbacks(mDeferredConnectionCallback);

            try {

                service.linkToDeath(mOverviewServiceDeathRcpt, 0);

            } catch (RemoteException e) {

                // Failed to link to death (process may have died between binding and connecting),

                // just unbind the service for now and retry again

                Log.e(TAG_OPS, "Lost connection to launcher service", e);

                disconnectFromLauncherService();

                retryConnectionWithBackoff();

                return;

            }



            mCurrentBoundedUserId = mDeviceProvisionedController.getCurrentUser();

            mOverviewProxy = IOverviewProxy.Stub.asInterface(service);



            Bundle params = new Bundle();

            params.putBinder(KEY_EXTRA_SYSUI_PROXY, mSysUiProxy.asBinder());

            params.putFloat(KEY_EXTRA_WINDOW_CORNER_RADIUS, mWindowCornerRadius);
@@ -550,7 +555,6 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis 
            mHandler.post(()-> {

                StatusBar bar = SysUiServiceProvider.getComponent(mContext, StatusBar.class);

                if (bar != null) {

                    System.out.println("MERONG dispatchNotificationPanelTouchEvent");

                    mStatusBarGestureDownEvent.setAction(MotionEvent.ACTION_CANCEL);

                    bar.dispatchNotificationsPanelTouchEvent(mStatusBarGestureDownEvent);

                    mStatusBarGestureDownEvent.recycle();