4 files changed, 55 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index a4a4a09..63f546a 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -28792,6 +28792,8 @@ package android.telecomm {
     method public void setAudioRoute(int);
     method public void stopDtmfTone(java.lang.String);
     method public void swapWithBackgroundCall(java.lang.String);
+    method public void turnProximitySensorOff(boolean);
+    method public void turnProximitySensorOn();
     method public void unholdCall(java.lang.String);
   }
 
@@ -28842,6 +28844,8 @@ package android.telecomm {
     method public final void removeListener(android.telecomm.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/telecomm/InCallAdapter.java b/telecomm/java/android/telecomm/InCallAdapter.java
index 816c456..964686a 100644
--- a/telecomm/java/android/telecomm/InCallAdapter.java
+++ b/telecomm/java/android/telecomm/InCallAdapter.java
@@ -252,4 +252,28 @@ public final class InCallAdapter {
         } catch (RemoteException ignored) {
         }
     }
+
+    /**
+     * Instructs Telecomm to turn the proximity sensor on.
+     */
+    public void turnProximitySensorOn() {
+        try {
+            mAdapter.turnOnProximitySensor();
+        } catch (RemoteException ignored) {
+        }
+    }
+
+    /**
+     * Instructs Telecomm to turn the proximity sensor off.
+     *
+     * @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.
+     */
+    public void turnProximitySensorOff(boolean screenOnImmediately) {
+        try {
+            mAdapter.turnOffProximitySensor(screenOnImmediately);
+        } catch (RemoteException ignored) {
+        }
+    }
 }
diff --git a/telecomm/java/android/telecomm/Phone.java b/telecomm/java/android/telecomm/Phone.java
index ce95acf..b4c8a80 100644
--- a/telecomm/java/android/telecomm/Phone.java
+++ b/telecomm/java/android/telecomm/Phone.java
@@ -210,6 +210,29 @@ public final class Phone {
     }
 
     /**
+     * Turns the proximity sensor on. When this request is made, the proximity sensor will
+     * 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.
+     */
+    public final void setProximitySensorOn() {
+        mInCallAdapter.turnProximitySensorOn();
+    }
+
+    /**
+     * Turns the proximity sensor off. When this request is made, the proximity sensor will
+     * become inactive, and no longer affect the touch screen and display. This operation is a
+     * no-op on devices that do not have a proximity sensor.
+     *
+     * @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.
+     */
+    public final void setProximitySensorOff(boolean screenOnImmediately) {
+        mInCallAdapter.turnProximitySensorOff(screenOnImmediately);
+    }
+
+    /**
      * Obtains the current phone call audio state of the {@code Phone}.
      *
      * @return An object encapsulating the audio state.
diff --git a/telecomm/java/com/android/internal/telecomm/IInCallAdapter.aidl b/telecomm/java/com/android/internal/telecomm/IInCallAdapter.aidl
index 17e14aa..fc09a3a 100644
--- a/telecomm/java/com/android/internal/telecomm/IInCallAdapter.aidl
+++ b/telecomm/java/com/android/internal/telecomm/IInCallAdapter.aidl
@@ -56,4 +56,8 @@ oneway interface IInCallAdapter {
     void splitFromConference(String callId);
 
     void swapWithBackgroundCall(String callId);
+
+    void turnOnProximitySensor();
+
+    void turnOffProximitySensor(boolean screenOnImmediately);
 }