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

Commit fe197a7d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[CDM Bug] Fix a crash issue when serviceConnector is empty"

parents d09e15e7 366b07b9

services/companion/java/com/android/server/companion/CompanionApplicationController.java

+7 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.content.ComponentName; 
import android.content.Context;

import android.os.Handler;

import android.util.Log;

import android.util.Slog;

import android.util.SparseArray;



import com.android.internal.annotations.GuardedBy;
@@ -120,6 +121,12 @@ class CompanionApplicationController { 
            mBoundCompanionApplications.setValueForPackage(userId, packageName, serviceConnectors);

        }



        if (serviceConnectors.isEmpty()) {

            Slog.e(TAG, "Can't find CompanionDeviceService implementer in package: "

                    + packageName + ". Please check if they are correctly declared.");

            return;

        }



        // The first connector in the list is always the primary connector: set a listener to it.

        serviceConnectors.get(0).setListener(this::onPrimaryServiceBindingDied);