From 2287a01bb9fd1d417e376e50d7fad41fd895ad3d Mon Sep 17 00:00:00 2001 From: Yorke Lee Date: Tue, 14 Apr 2015 15:48:19 -0700 Subject: [PATCH] DO NOT MERGE Remove proximity methods in TelecomManager Bug: 20160495 Change-Id: Ib0156cf170d16b48f97e08027c912fc3f45691fb --- api/system-current.txt | 2 -- telecomm/java/android/telecom/Phone.java | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/api/system-current.txt b/api/system-current.txt index 84c0b87b28158..e063648dbb3a3 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -30382,8 +30382,6 @@ package android.telecom { method public final void removeListener(android.telecom.Phone.Listener); method public final void setAudioRoute(int); method public final void setMuted(boolean); - method public final void setProximitySensorOff(boolean); - method public final void setProximitySensorOn(); } public static abstract class Phone.Listener { diff --git a/telecomm/java/android/telecom/Phone.java b/telecomm/java/android/telecom/Phone.java index 63441816f98a2..cc731095f9c07 100644 --- a/telecomm/java/android/telecom/Phone.java +++ b/telecomm/java/android/telecom/Phone.java @@ -244,6 +244,8 @@ public final class Phone { * become active, and the touch screen and display will be turned off when the user's face * is detected to be in close proximity to the screen. This operation is a no-op on devices * that do not have a proximity sensor. + * + * @hide */ public final void setProximitySensorOn() { mInCallAdapter.turnProximitySensorOn(); @@ -257,6 +259,8 @@ public final class Phone { * @param screenOnImmediately If true, the screen will be turned on immediately if it was * previously off. Otherwise, the screen will only be turned on after the proximity sensor * is no longer triggered. + * + * @hide */ public final void setProximitySensorOff(boolean screenOnImmediately) { mInCallAdapter.turnProximitySensorOff(screenOnImmediately);