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

Commit d7eed491 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Adding package name for vendor service verification" into udc-dev am: 29cb4ace 

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



Change-Id: I3e09f60ab89d8d6f76b35643e80189ade239c6c3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents de8242e7 29cb4ace

data/etc/privapp-permissions-platform.xml

+1 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ applications that come with the platform 
        <permission name="android.permission.BIND_CARRIER_SERVICES"/>

        <permission name="android.permission.BIND_CELL_BROADCAST_SERVICE"/>

        <permission name="android.permission.BIND_IMS_SERVICE"/>

        <permission name="android.permission.BIND_SATELLITE_SERVICE"/>

        <permission name="android.permission.BIND_TELEPHONY_DATA_SERVICE"/>

        <permission name="android.permission.BIND_VISUAL_VOICEMAIL_SERVICE"/>

        <permission name="android.permission.CALL_PRIVILEGED"/>

telephony/java/android/telephony/satellite/stub/SatelliteService.java

+4 −3
Original line number Diff line number Diff line
@@ -20,7 +20,8 @@ import android.annotation.SdkConstant; 
import android.app.Service;

import android.content.Intent;

import android.os.IBinder;

import android.util.Log;



import com.android.telephony.Rlog;



/**

 * Main SatelliteService implementation, which binds via the Telephony SatelliteServiceController.
@@ -44,7 +45,7 @@ import android.util.Log; 
 * @hide

 */

public class SatelliteService extends Service {

    public static final String TAG = "SatelliteService";

    private static final String TAG = "SatelliteService";



    @SdkConstant(SdkConstant.SdkConstantType.SERVICE_ACTION)

    public static final String SERVICE_INTERFACE = "android.telephony.satellite.SatelliteService";
@@ -55,7 +56,7 @@ public class SatelliteService extends Service { 
    @Override

    public IBinder onBind(Intent intent) {

        if (SERVICE_INTERFACE.equals(intent.getAction())) {

            Log.e(TAG, "SatelliteService bound");

            Rlog.d(TAG, "SatelliteService bound");

            return new SatelliteImplBase(Runnable::run).getBinder();

        }

        return null;