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

Commit 4ddacb90 authored by Kyeongkab.Nam's avatar Kyeongkab.Nam
Browse files

Fix hardware TvInputService binding issue 

Bind to hardware TvInputService even after disabled and enabled the
service.

Bug: 204469566
Test: manual
Change-Id: I9d009077a19612fbcaf13b3edc6249a85566c3ef
parent 27c03c7f

services/core/java/com/android/server/tv/TvInputManagerService.java

+11 −0
Original line number Diff line number Diff line
@@ -315,6 +315,7 @@ public final class TvInputManagerService extends SystemService { 
                PackageManager.GET_SERVICES | PackageManager.GET_META_DATA,

                userId);

        List<TvInputInfo> inputList = new ArrayList<>();

        List<ComponentName> hardwareComponents = new ArrayList<>();

        for (ResolveInfo ri : services) {

            ServiceInfo si = ri.serviceInfo;

            if (!android.Manifest.permission.BIND_TV_INPUT.equals(si.permission)) {
@@ -325,6 +326,7 @@ public final class TvInputManagerService extends SystemService { 


            ComponentName component = new ComponentName(si.packageName, si.name);

            if (hasHardwarePermission(pm, component)) {

                hardwareComponents.add(component);

                ServiceState serviceState = userState.serviceStateMap.get(component);

                if (serviceState == null) {

                    // New hardware input found. Create a new ServiceState and connect to the
@@ -397,6 +399,15 @@ public final class TvInputManagerService extends SystemService { 
            }

        }



        // Clean up ServiceState corresponding to the removed hardware inputs

        Iterator<ServiceState> it = userState.serviceStateMap.values().iterator();

        while (it.hasNext()) {

            ServiceState serviceState = it.next();

            if (serviceState.isHardware && !hardwareComponents.contains(serviceState.component)) {

                it.remove();

            }

        }



        userState.inputMap.clear();

        userState.inputMap = inputMap;

    }