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

Merge branch 'lmp-mr1-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev

Browse Source
This commit is contained in:
Clay Murphy
2014-10-23 22:58:41 +00:00
committed by Android Git Automerger
parent bc3b343901 db7fc1e833
commit ef20147e2b
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -587,7 +587,6 @@ public class TelecomManager {
* *
* @param account The complete {@link PhoneAccount}. * @param account The complete {@link PhoneAccount}.
*/ */
@SystemApi
public void registerPhoneAccount(PhoneAccount account) { public void registerPhoneAccount(PhoneAccount account) {
try { try {
if (isServiceConnected()) { if (isServiceConnected()) {
@@ -603,7 +602,6 @@ public class TelecomManager {
* *
* @param accountHandle A {@link PhoneAccountHandle} for the {@link PhoneAccount} to unregister. * @param accountHandle A {@link PhoneAccountHandle} for the {@link PhoneAccount} to unregister.
*/ */
@SystemApi
public void unregisterPhoneAccount(PhoneAccountHandle accountHandle) { public void unregisterPhoneAccount(PhoneAccountHandle accountHandle) {
try { try {
if (isServiceConnected()) { if (isServiceConnected()) {
@@ -617,7 +615,6 @@ public class TelecomManager {
/** /**
* Remove all Accounts that belong to the calling package from the system. * Remove all Accounts that belong to the calling package from the system.
*/ */
@SystemApi
public void clearAccounts() { public void clearAccounts() {
try { try {
if (isServiceConnected()) { if (isServiceConnected()) {
@@ -671,7 +668,6 @@ public class TelecomManager {
* Requires permission: {@link android.Manifest.permission#READ_PHONE_STATE} * Requires permission: {@link android.Manifest.permission#READ_PHONE_STATE}
* </p> * </p>
*/ */
@SystemApi
public boolean isInCall() { public boolean isInCall() {
try { try {
if (isServiceConnected()) { if (isServiceConnected()) {
@@ -823,7 +819,6 @@ public class TelecomManager {
* @param extras A bundle that will be passed through to * @param extras A bundle that will be passed through to
* {@link ConnectionService#onCreateIncomingConnection}. * {@link ConnectionService#onCreateIncomingConnection}.
*/ */
@SystemApi
public void addNewIncomingCall(PhoneAccountHandle phoneAccount, Bundle extras) { public void addNewIncomingCall(PhoneAccountHandle phoneAccount, Bundle extras) {
try { try {
if (isServiceConnected()) { if (isServiceConnected()) {