diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-06-19 00:36:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-06-19 00:36:38 +0000 |
| commit | a9bf7a881056cda29ee2dc04179ed9a89e5884a0 (patch) | |
| tree | 29ed2efc1ba2d5fc38e12156f1995d9eb03edb51 | |
| parent | 79d3bf6e54b7651f228c7904da99a33655c4d712 (diff) | |
| parent | 063ed82eeffc7e9d2c466387f60b7b738ec1bea8 (diff) | |
Merge "Fixed the incorrect permission for data/network service binding"
| -rw-r--r-- | telephony/java/android/telephony/NetworkService.java | 4 | ||||
| -rw-r--r-- | telephony/java/android/telephony/data/DataService.java | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/telephony/java/android/telephony/NetworkService.java b/telephony/java/android/telephony/NetworkService.java index f7e6840f7580..4354314dac29 100644 --- a/telephony/java/android/telephony/NetworkService.java +++ b/telephony/java/android/telephony/NetworkService.java @@ -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" > diff --git a/telephony/java/android/telephony/data/DataService.java b/telephony/java/android/telephony/data/DataService.java index 4ca5ce3004be..1db58506bb1c 100644 --- a/telephony/java/android/telephony/data/DataService.java +++ b/telephony/java/android/telephony/data/DataService.java @@ -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> |