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

am 3ec54522: am 5c0aa11d: am fbcb50db: Merge "Add BIND_CONNECTION_SERVICE permission." into lmp-dev

Browse Source 
* commit '3ec545229af4be3a45583170a2509d9ad4161c04':
  Add BIND_CONNECTION_SERVICE permission.
This commit is contained in:
Tyler Gunn
2014-08-16 00:45:11 +00:00
committed by Android Git Automerger
parent fe2ee96947 af9011a73b
commit 19caa123d6
3 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/res/AndroidManifest.xml
View File

@@ -1265,6 +1265,14 @@
android:description="@string/permdesc_bind_call_service"
android:label="@string/permlab_bind_call_service" />
<!-- @SystemApi Allows an application to bind to ConnectionService implementations.
@hide -->
<permission android:name="android.permission.BIND_CONNECTION_SERVICE"
android:permissionGroup="android.permission-group.PHONE_CALLS"
android:protectionLevel="system|signature"
android:description="@string/permdesc_bind_connection_service"
android:label="@string/permlab_bind_connection_service" />
<!-- ================================== -->
<!-- Permissions for sdcard interaction -->
<!-- ================================== -->

5
core/res/res/values/strings.xml
View File

@@ -2116,6 +2116,11 @@
<!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permdesc_bind_call_service">Allows the app to control when and how the user sees the in-call screen.</string>
<!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permlab_bind_connection_service">interact with telephony services</string>
<!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permdesc_bind_connection_service">Allows the app to interact with telephony services to make/receive calls.</string>
<!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
<string name="permlab_readNetworkUsageHistory">read historical network usage</string>
<!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->

25
telecomm/java/android/telecomm/ConnectionService.java
View File

@@ -16,6 +16,7 @@
package android.telecomm;
import android.Manifest;
import android.annotation.SdkConstant;
import android.app.PendingIntent;
import android.app.Service;
@@ -26,6 +27,8 @@ import android.os.Handler;
import android.os.IBinder;
import android.os.Looper;
import android.os.Message;
import android.os.Parcel;
import android.os.RemoteException;
import android.telephony.DisconnectCause;
import com.android.internal.os.SomeArgs;
@@ -45,7 +48,6 @@ import java.util.Map;
* Android device.
*/
public abstract class ConnectionService extends Service {
/**
* The {@link Intent} that must be declared as handled by the service.
*/
@@ -81,6 +83,18 @@ public abstract class ConnectionService extends Service {
private final ConnectionServiceAdapter mAdapter = new ConnectionServiceAdapter();
private final IBinder mBinder = new IConnectionService.Stub() {
/**
* Enforces the requirement that all calls into the ConnectionService require the
* {@code BIND_CONNECTION_SERVICE} permission.
*/
@Override
public boolean onTransact(int code, Parcel data, Parcel reply,
int flags) throws RemoteException
{
enforceBindConnectionServicePermission();
return super.onTransact(code, data, reply, flags);
}
@Override
public void addConnectionServiceAdapter(IConnectionServiceAdapter adapter) {
mHandler.obtainMessage(MSG_ADD_CONNECTION_SERVICE_ADAPTER, adapter).sendToTarget();
@@ -617,7 +631,8 @@ public abstract class ConnectionService extends Service {
public void onError(String request, int code, String reason) {
// no-op
}
});
}
);
}
private void splitFromConference(String callId) {
@@ -830,4 +845,10 @@ public abstract class ConnectionService extends Service {
return Connection.getNullConnection();
}
/**
* Enforces the {@code BIND_CONNECTION_SERVICE} permission for connection service calls.
*/
private void enforceBindConnectionServicePermission() {
enforceCallingPermission(Manifest.permission.BIND_CONNECTION_SERVICE, null);
}
}