Merge "Deprecate TelephonyManager APIs which are present in TelecomManager."

am: a90205492f Change-Id: I1d15e13cb3ae8fa8caf098e34587e3599b5bc967
2017-09-11 03:40:47 +00:00
parent 24b36003d4 a90205492f
commit f0dd39f7d0
5 changed files with 33 additions and 14 deletions
--- a/telecomm/java/android/telecom/TelecomManager.java
+++ b/telecomm/java/android/telecom/TelecomManager.java
@@ -1345,10 +1345,7 @@ public class TelecomManager {

    /**
     * Returns whether TTY is supported on this device.
-     *
-     * @hide
     */
-    @SystemApi
    @RequiresPermission(anyOf = {
            android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE,
            android.Manifest.permission.READ_PHONE_STATE