Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44e203a6 authored by Clay Murphy's avatar Clay Murphy Committed by android-build-merger
Browse files

am ef20147e: Merge branch \'lmp-mr1-dev\' of... 

am ef20147e: Merge branch \'lmp-mr1-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-mr1-dev
automerge: 3b3b378d

* commit '3b3b378d':
  Remove SystemApi annotations.
parents fd5e2e56 3b3b378d

telecomm/java/android/telecom/TelecomManager.java

+0 −5
Original line number Diff line number Diff line
@@ -587,7 +587,6 @@ public class TelecomManager { 
     *

     * @param account The complete {@link PhoneAccount}.

     */

    @SystemApi

    public void registerPhoneAccount(PhoneAccount account) {

        try {

            if (isServiceConnected()) {
@@ -603,7 +602,6 @@ public class TelecomManager { 
     *

     * @param accountHandle A {@link PhoneAccountHandle} for the {@link PhoneAccount} to unregister.

     */

    @SystemApi

    public void unregisterPhoneAccount(PhoneAccountHandle accountHandle) {

        try {

            if (isServiceConnected()) {
@@ -617,7 +615,6 @@ public class TelecomManager { 
    /**

     * Remove all Accounts that belong to the calling package from the system.

     */

    @SystemApi

    public void clearAccounts() {

        try {

            if (isServiceConnected()) {
@@ -671,7 +668,6 @@ public class TelecomManager { 
     * Requires permission: {@link android.Manifest.permission#READ_PHONE_STATE}

     * </p>

     */

    @SystemApi

    public boolean isInCall() {

        try {

            if (isServiceConnected()) {
@@ -823,7 +819,6 @@ public class TelecomManager { 
     * @param extras A bundle that will be passed through to

     *            {@link ConnectionService#onCreateIncomingConnection}.

     */

    @SystemApi

    public void addNewIncomingCall(PhoneAccountHandle phoneAccount, Bundle extras) {

        try {

            if (isServiceConnected()) {