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

Commit 574b298e authored Jun 18, 2018 by Jack Yu Committed by android-build-merger Jun 18, 2018

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

am: 65c04cd4

Change-Id: I67a28d628e14798dc8d31a20536f2248c8cc0b8f

parents fae24f5a 65c04cd4

telephony/java/android/telephony/NetworkService.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -35,8 +35,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
		@@ -43,11 +43,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>