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

Merge "Give Doclava our manifest; more permission docs." into oc-dev am: 65d4cbba37

Browse Source 
am: 67cb5f5210

Change-Id: Ic4c30cdb8bbfda5b3703eb3c7c36c1bf8ab3a216
This commit is contained in:
Jeff Sharkey
2017-06-06 16:17:39 +00:00
committed by android-build-merger
parent 3de8df76b5 67cb5f5210
commit 28f6dc9512
8 changed files with 74 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
telecomm/java/android/telecom/TelecomManager.java
View File

@@ -17,6 +17,7 @@ package android.telecom;
import android.Manifest;
import android.annotation.RequiresPermission;
import android.annotation.SuppressAutoDoc;
import android.annotation.SuppressLint;
import android.annotation.SystemApi;
import android.annotation.SystemService;
import android.content.ComponentName;
@@ -765,6 +766,10 @@ public class TelecomManager {
* @hide
*/
@SystemApi
@RequiresPermission(anyOf = {
android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
android.Manifest.permission.READ_PHONE_STATE
})
public List<PhoneAccountHandle> getPhoneAccountsSupportingScheme(String uriScheme) {
try {
if (isServiceConnected()) {
@@ -846,6 +851,7 @@ public class TelecomManager {
* @hide
*/
@SystemApi
@SuppressLint("Doclava125")
public List<PhoneAccountHandle> getPhoneAccountsForPackage() {
try {
if (isServiceConnected()) {
@@ -973,6 +979,7 @@ public class TelecomManager {
* @hide
*/
@SystemApi
@SuppressLint("Doclava125")
public void clearPhoneAccounts() {
clearAccounts();
}
@@ -982,6 +989,7 @@ public class TelecomManager {
* @hide
*/
@SystemApi
@SuppressLint("Doclava125")
public void clearAccounts() {
try {
if (isServiceConnected()) {
@@ -1013,6 +1021,7 @@ public class TelecomManager {
* @hide
*/
@SystemApi
@SuppressLint("Doclava125")
public ComponentName getDefaultPhoneApp() {
try {
if (isServiceConnected()) {
@@ -1229,6 +1238,10 @@ public class TelecomManager {
* @hide
*/
@SystemApi
@RequiresPermission(anyOf = {
android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
android.Manifest.permission.READ_PHONE_STATE
})
public boolean isRinging() {
try {
if (isServiceConnected()) {
@@ -1327,6 +1340,10 @@ public class TelecomManager {
* @hide
*/
@SystemApi
@RequiresPermission(anyOf = {
android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
android.Manifest.permission.READ_PHONE_STATE
})
public boolean isTtySupported() {
try {
if (isServiceConnected()) {
@@ -1605,6 +1622,7 @@ public class TelecomManager {
* @hide
*/
@SystemApi
@RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE)
public void enablePhoneAccount(PhoneAccountHandle handle, boolean isEnabled) {
ITelecomService service = getTelecomService();
if (service != null) {