summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorJay Shrauner <shrauner@google.com>2015-04-09 15:15:43 -0700
committerJay Shrauner <shrauner@google.com>2015-04-15 14:42:24 -0700
commit1cf9b6bec12c027a0d551540a6e01f3ac2d0a9d4 (patch)
tree778c8c7388aaa2d147bc547b5a06ba817a16dc0e /telephony
parent383932ad8ee756d01f0a12aeca7adaf4b3e542fa (diff)
downloadframeworks_base-1cf9b6bec12c027a0d551540a6e01f3ac2d0a9d4.zip
frameworks_base-1cf9b6bec12c027a0d551540a6e01f3ac2d0a9d4.tar.gz
frameworks_base-1cf9b6bec12c027a0d551540a6e01f3ac2d0a9d4.tar.bz2
DO NOT MERGE Make Telecom/InCallUI APIs public
Bug:20260870 Change-Id: Ie3a2db0685664f2f1ceea8f40b1249d01e9385b8
Diffstat (limited to 'telephony')
-rw-r--r--telephony/java/android/telephony/TelephonyManager.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index e1a3de7..d0a1dc2 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -162,7 +162,6 @@ public class TelephonyManager {
* Returns 1 for Single standby mode (Single SIM functionality)
* Returns 2 for Dual standby mode.(Dual SIM functionality)
*/
- /** {@hide} */
public int getPhoneCount() {
int phoneCount = 1;
switch (getMultiSimConfiguration()) {
@@ -639,7 +638,6 @@ public class TelephonyManager {
*
* @param slotId of which deviceID is returned
*/
- /** {@hide} */
public String getDeviceId(int slotId) {
// FIXME this assumes phoneId == slotId
try {