Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Adding package name for vendor service verification" into udc-dev

Browse Source
This commit is contained in:
Sarah Chin
2023-02-24 05:31:28 +00:00
committed by Android (Google) Code Review
parent bc34045c05 9b47a53dfc
commit 29cb4ace10
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/etc/privapp-permissions-platform.xml
View File

@@ -122,6 +122,7 @@ applications that come with the platform
<permission name="android.permission.BIND_CARRIER_SERVICES"/> <permission name="android.permission.BIND_CARRIER_SERVICES"/>
<permission name="android.permission.BIND_CELL_BROADCAST_SERVICE"/> <permission name="android.permission.BIND_CELL_BROADCAST_SERVICE"/>
<permission name="android.permission.BIND_IMS_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_TELEPHONY_DATA_SERVICE"/>
<permission name="android.permission.BIND_VISUAL_VOICEMAIL_SERVICE"/> <permission name="android.permission.BIND_VISUAL_VOICEMAIL_SERVICE"/>
<permission name="android.permission.CALL_PRIVILEGED"/> <permission name="android.permission.CALL_PRIVILEGED"/>

7
telephony/java/android/telephony/satellite/stub/SatelliteService.java
View File

@@ -20,7 +20,8 @@ import android.annotation.SdkConstant;
import android.app.Service; import android.app.Service;
import android.content.Intent; import android.content.Intent;
import android.os.IBinder; import android.os.IBinder;
import android.util.Log;
import com.android.telephony.Rlog;
/** /**
* Main SatelliteService implementation, which binds via the Telephony SatelliteServiceController. * Main SatelliteService implementation, which binds via the Telephony SatelliteServiceController.
@@ -44,7 +45,7 @@ import android.util.Log;
* @hide * @hide
*/ */
public class SatelliteService extends Service { public class SatelliteService extends Service {
public static final String TAG = "SatelliteService"; private static final String TAG = "SatelliteService";
@SdkConstant(SdkConstant.SdkConstantType.SERVICE_ACTION) @SdkConstant(SdkConstant.SdkConstantType.SERVICE_ACTION)
public static final String SERVICE_INTERFACE = "android.telephony.satellite.SatelliteService"; public static final String SERVICE_INTERFACE = "android.telephony.satellite.SatelliteService";
@@ -55,7 +56,7 @@ public class SatelliteService extends Service {
@Override @Override
public IBinder onBind(Intent intent) { public IBinder onBind(Intent intent) {
if (SERVICE_INTERFACE.equals(intent.getAction())) { if (SERVICE_INTERFACE.equals(intent.getAction())) {
Log.e(TAG, "SatelliteService bound"); Rlog.d(TAG, "SatelliteService bound");
return new SatelliteImplBase(Runnable::run).getBinder(); return new SatelliteImplBase(Runnable::run).getBinder();
} }
return null; return null;