Merge "Add @TestApi to createLaunchEmergencyDialerIntent" into rvc-dev am: b9c9917810 am: 64750d74ea am: f22d19b1ff

Change-Id: I08894c15529d735edf0c308e4f576b674d69cf65
This commit is contained in:
Fan Zhang
2020-04-28 16:55:43 +00:00
committed by Automerger Merge Worker
2 changed files with 2 additions and 0 deletions

View File

@@ -3691,6 +3691,7 @@ package android.telecom {
}
public class TelecomManager {
method @NonNull public android.content.Intent createLaunchEmergencyDialerIntent(@Nullable String);
method @NonNull @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public java.util.List<android.telecom.PhoneAccountHandle> getCallCapablePhoneAccounts(boolean);
method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public int getCurrentTtyMode();
method @Nullable @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public String getDefaultDialerPackage(@NonNull android.os.UserHandle);

View File

@@ -2215,6 +2215,7 @@ public class TelecomManager {
* @hide
*/
@SystemApi
@TestApi
@NonNull
public Intent createLaunchEmergencyDialerIntent(@Nullable String number) {
ITelecomService service = getTelecomService();