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

Commit a9bf7a88 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fixed the incorrect permission for data/network service binding"

parents 79d3bf6e 063ed82e

telephony/java/android/telephony/NetworkService.java

+2 −2
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ import java.util.List; 
/**

 * Base class of network service. Services that extend NetworkService must register the service in

 * their AndroidManifest to be detected by the framework. They must be protected by the permission

 * "android.permission.BIND_NETWORK_SERVICE". The network service definition in the manifest must

 * follow the following format:

 * "android.permission.BIND_TELEPHONY_NETWORK_SERVICE". The network service definition in the

 * manifest must follow the following format:

 * ...

 * <service android:name=".xxxNetworkService"

 *     android:permission="android.permission.BIND_TELEPHONY_NETWORK_SERVICE" >

telephony/java/android/telephony/data/DataService.java

+3 −3
Original line number Diff line number Diff line
@@ -44,11 +44,11 @@ import java.util.List; 
/**

 * Base class of data service. Services that extend DataService must register the service in

 * their AndroidManifest to be detected by the framework. They must be protected by the permission

 * "android.permission.BIND_DATA_SERVICE". The data service definition in the manifest must follow

 * the following format:

 * "android.permission.BIND_TELEPHONY_DATA_SERVICE". The data service definition in the manifest

 * must follow the following format:

 * ...

 * <service android:name=".xxxDataService"

 *     android:permission="android.permission.BIND_DATA_SERVICE" >

 *     android:permission="android.permission.BIND_TELEPHONY_DATA_SERVICE" >

 *     <intent-filter>

 *         <action android:name="android.telephony.data.DataService" />

 *     </intent-filter>