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

Commit 010d3ff9 authored by Vinit Nayak's avatar Vinit Nayak Committed by Automerger Merge Worker
Browse files

Merge "Rebind OverviewProxyService for only TouchInteractionService component"... 

Merge "Rebind OverviewProxyService for only TouchInteractionService component" into udc-dev am: a30e71c8

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



Change-Id: I7db8c8dd460be1b153490105513ab4cdf45c5dd2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 834c4343 a30e71c8

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

+30 −14
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.systemui.recents;



import static android.content.Intent.ACTION_PACKAGE_ADDED;

import static android.content.Intent.EXTRA_CHANGED_COMPONENT_NAME_LIST;

import static android.content.pm.PackageManager.MATCH_SYSTEM_ONLY;

import static android.view.MotionEvent.ACTION_CANCEL;
@@ -48,6 +49,7 @@ import android.content.Context; 
import android.content.Intent;

import android.content.IntentFilter;

import android.content.ServiceConnection;

import android.content.pm.ResolveInfo;

import android.graphics.Region;

import android.hardware.input.InputManager;

import android.hardware.input.InputManagerGlobal;
@@ -114,6 +116,7 @@ import dagger.Lazy; 
import java.io.PrintWriter;

import java.util.ArrayList;

import java.util.List;

import java.util.Objects;

import java.util.Optional;

import java.util.concurrent.CountDownLatch;

import java.util.concurrent.Executor;
@@ -393,20 +396,29 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis 
    private final BroadcastReceiver mLauncherStateChangedReceiver = new BroadcastReceiver() {

        @Override

        public void onReceive(Context context, Intent intent) {

            StringBuilder extraComponentList = new StringBuilder(" components: ");

            if (intent.hasExtra(EXTRA_CHANGED_COMPONENT_NAME_LIST)) {

                String[] comps = intent.getStringArrayExtra(EXTRA_CHANGED_COMPONENT_NAME_LIST);

                if (comps != null) {

                    for (String c : comps) {

                        extraComponentList.append(c).append(", ");

                    }

            // If adding, bind immediately

            if (Objects.equals(intent.getAction(), ACTION_PACKAGE_ADDED)) {

                updateEnabledAndBinding();

                return;

            }



            // ACTION_PACKAGE_CHANGED

            String[] compsList = intent.getStringArrayExtra(EXTRA_CHANGED_COMPONENT_NAME_LIST);

            if (compsList == null) {

                return;

            }

            Log.d(TAG_OPS, "launcherStateChanged intent: " + intent + extraComponentList);

            updateEnabledState();



            // Reconnect immediately, instead of waiting for resume to arrive.

            startConnectionToCurrentUser();

            // Only rebind for TouchInteractionService component from launcher

            ResolveInfo ri = context.getPackageManager()

                    .resolveService(new Intent(ACTION_QUICKSTEP), 0);

            String interestingComponent = ri.serviceInfo.name;

            for (String component : compsList) {

                if (interestingComponent.equals(component)) {

                    Log.i(TAG_OPS, "Rebinding for component [" + component + "] change");

                    updateEnabledAndBinding();

                    return;

                }

            }

        }

    };
@@ -621,8 +633,7 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis 
        screenLifecycle.addObserver(mScreenLifecycleObserver);

        wakefulnessLifecycle.addObserver(mWakefulnessLifecycleObserver);

        // Connect to the service

        updateEnabledState();

        startConnectionToCurrentUser();

        updateEnabledAndBinding();



        // Listen for assistant changes

        assistUtils.registerVoiceInteractionSessionListener(mVoiceInteractionSessionListener);
@@ -651,6 +662,11 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis 
        }

    }



    private void updateEnabledAndBinding() {

        updateEnabledState();

        startConnectionToCurrentUser();

    }



    private void updateSystemUiStateFlags() {

        final NavigationBar navBarFragment =

                mNavBarControllerLazy.get().getDefaultNavigationBar();