Merge "Remove methods added in TelephonyManager."

2 files changed, 0 insertions, 72 deletions

diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl
index 8b80bfa..baacb74 100644
--- a/telephony/java/com/android/internal/telephony/ITelephony.aidl
+++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl
@@ -21,8 +21,6 @@ import android.os.Bundle;
 import android.telephony.CellInfo;
 import android.telephony.NeighboringCellInfo;
 
-import com.android.internal.telephony.ITelephonyListener;
-
 import java.util.List;
 
 import java.util.List;
@@ -438,47 +436,4 @@ interface ITelephony {
      * @return true on success; false on any failure.
      */
     boolean setPreferredNetworkType(int networkType);
-
-    /**
-     * Put a call on hold.
-     */
-     void toggleHold();
-
-     /**
-      * Merge foreground and background calls.
-      */
-     void merge();
-
-     /**
-      * Swap foreground and background calls.
-      */
-     void swap();
-
-     /**
-      * Mute the phone.
-      */
-     void mute(boolean mute);
-
-    /**
-     * Start playing DTMF tone for the specified digit.
-     *
-     * @param digit the digit that corresponds with the desired tone.
-     * @param timedShortcode whether the specified digit should be played as a timed short code.
-     */
-     void playDtmfTone(char digit, boolean timedShortCode);
-
-     /**
-      * Stop playing DTMF tones.
-      */
-     void stopDtmfTone();
-
-     /**
-       * Register a callback.
-       */
-      void addListener(ITelephonyListener listener);
-
-      /**
-       * Unregister a callback.
-       */
-      void removeListener(ITelephonyListener listener);
 }
diff --git a/telephony/java/com/android/internal/telephony/ITelephonyListener.aidl b/telephony/java/com/android/internal/telephony/ITelephonyListener.aidl
deleted file mode 100644
index c226217..0000000
--- a/telephony/java/com/android/internal/telephony/ITelephonyListener.aidl
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.internal.telephony;
-
-/**
- * Interface used to register a listener that gets more detailed call state information than
- * {@link android.telephony.PhoneStateListener}
- *
- * {@hide}
- */
-oneway interface ITelephonyListener {
-    void onUpdate(int callId, int state, String number);
-}