Merge "Annotate @SystemApi with required permissions." into oc-dev am: c1406978a4

am: 7a2e4a8486

Change-Id: Ib629e25dbf047c110feaf03e4ff744b5c6df9aeb
This commit is contained in:
Jeff Sharkey
2017-06-06 15:48:24 +00:00
committed by android-build-merger
94 changed files with 549 additions and 314 deletions

View File

@@ -18,6 +18,7 @@ import android.Manifest;
import android.annotation.RequiresPermission;
import android.annotation.SuppressAutoDoc;
import android.annotation.SystemApi;
import android.annotation.SystemService;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -48,6 +49,7 @@ import java.util.List;
* descriptions.
*/
@SuppressAutoDoc
@SystemService(Context.TELECOM_SERVICE)
public class TelecomManager {
/**
@@ -1245,6 +1247,7 @@ public class TelecomManager {
* @hide
*/
@SystemApi
@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
public boolean endCall() {
try {
if (isServiceConnected()) {