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

Commit 57aa97e0 authored by Andrea Ambu's avatar Andrea Ambu Committed by Automerger Merge Worker
Browse files

Merge "speech: Check componentName maps to RecognitionService" into sc-dev am: 2578be81 

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

Change-Id: Ic446b34fe74d59f336580218d5e03330b5ea6095
parents 9a8c0ebf 2578be81

services/core/java/com/android/server/speech/SpeechRecognitionManagerServiceImpl.java

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

import android.content.ComponentName;

import android.content.Intent;

import android.content.Intent;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.content.pm.ServiceInfo;

import android.content.pm.ServiceInfo;

import android.os.Binder;

import android.os.Binder;

import android.os.IBinder;

import android.os.IBinder;
@@ -31,6 +32,7 @@ import android.os.RemoteException; 
import android.speech.IRecognitionListener;

import android.speech.IRecognitionListener;

import android.speech.IRecognitionService;

import android.speech.IRecognitionService;

import android.speech.IRecognitionServiceManagerCallback;

import android.speech.IRecognitionServiceManagerCallback;

import android.speech.RecognitionService;

import android.speech.SpeechRecognizer;

import android.speech.SpeechRecognizer;

import android.util.Slog;

import android.util.Slog;
@@ -39,6 +41,7 @@ import com.android.server.infra.AbstractPerUserSystemService; 




import java.util.HashMap;

import java.util.HashMap;

import java.util.HashSet;

import java.util.HashSet;

import java.util.List;

import java.util.Map;

import java.util.Map;

import java.util.Optional;

import java.util.Optional;

import java.util.Set;

import java.util.Set;
@@ -225,6 +228,10 @@ final class SpeechRecognitionManagerServiceImpl extends 
                }

                }

            }

            }





            if (serviceComponent != null && !componentMapsToRecognitionService(serviceComponent)) {

                return null;

            }



            RemoteSpeechRecognitionService service =

            RemoteSpeechRecognitionService service =

                    new RemoteSpeechRecognitionService(

                    new RemoteSpeechRecognitionService(

                            getContext(), serviceComponent, getUserId(), callingUid);

                            getContext(), serviceComponent, getUserId(), callingUid);
@@ -241,6 +248,25 @@ final class SpeechRecognitionManagerServiceImpl extends 
        }

        }

    }

    }





    private boolean componentMapsToRecognitionService(@NonNull ComponentName serviceComponent) {

        List<ResolveInfo> resolveInfos =

                getContext().getPackageManager().queryIntentServices(

                        new Intent(RecognitionService.SERVICE_INTERFACE), 0);

        if (resolveInfos == null) {

            return false;

        }



        for (ResolveInfo ri : resolveInfos) {

            if (ri.serviceInfo != null

                    && serviceComponent.equals(ri.serviceInfo.getComponentName())) {

                return true;

            }

        }



        Slog.w(TAG, "serviceComponent is not RecognitionService: " + serviceComponent);

        return false;

    }



    private void removeService(int callingUid, RemoteSpeechRecognitionService service) {

    private void removeService(int callingUid, RemoteSpeechRecognitionService service) {

        synchronized (mLock) {

        synchronized (mLock) {

            Set<RemoteSpeechRecognitionService> valuesByCaller =

            Set<RemoteSpeechRecognitionService> valuesByCaller =