Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Cleanup unsupported appusage in Telecom apis."

Browse Source 
am: 90723afa47

Change-Id: If983c7a0351138fcfb35d9060b0c17c7b9e2c69f
This commit is contained in:
Tyler Gunn
2019-03-15 16:51:04 -07:00
committed by android-build-merger
parent f713c1ff26 90723afa47
commit 545bace60f
4 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
telecomm/java/android/telecom/AudioState.java
View File

@@ -18,6 +18,7 @@ package android.telecom;
import android.annotation.SystemApi; import android.annotation.SystemApi;
import android.annotation.UnsupportedAppUsage; import android.annotation.UnsupportedAppUsage;
import android.os.Build;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
@@ -54,11 +55,11 @@ public class AudioState implements Parcelable {
private static final int ROUTE_ALL = ROUTE_EARPIECE | ROUTE_BLUETOOTH | ROUTE_WIRED_HEADSET | private static final int ROUTE_ALL = ROUTE_EARPIECE | ROUTE_BLUETOOTH | ROUTE_WIRED_HEADSET |
ROUTE_SPEAKER; ROUTE_SPEAKER;
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 127403196)
private final boolean isMuted; private final boolean isMuted;
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 127403196)
private final int route; private final int route;
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 127403196)
private final int supportedRouteMask; private final int supportedRouteMask;
public AudioState(boolean muted, int route, int supportedRouteMask) { public AudioState(boolean muted, int route, int supportedRouteMask) {

13
telecomm/java/android/telecom/Phone.java
View File

@@ -19,6 +19,7 @@ package android.telecom;
import android.annotation.SystemApi; import android.annotation.SystemApi;
import android.annotation.UnsupportedAppUsage; import android.annotation.UnsupportedAppUsage;
import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothDevice;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.RemoteException; import android.os.RemoteException;
import android.util.ArrayMap; import android.util.ArrayMap;
@@ -328,10 +329,12 @@ public final class Phone {
* become active, and the touch screen and display will be turned off when the user's face * 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 * 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. * that do not have a proximity sensor.
* * <p>
* This API does not actually turn on the proximity sensor; apps should do this on their own if
* required.
* @hide * @hide
*/ */
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 127403196)
public final void setProximitySensorOn() { public final void setProximitySensorOn() {
mInCallAdapter.turnProximitySensorOn(); mInCallAdapter.turnProximitySensorOn();
} }
@@ -344,10 +347,12 @@ public final class Phone {
* @param screenOnImmediately If true, the screen will be turned on immediately if it was * @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 * previously off. Otherwise, the screen will only be turned on after the proximity sensor
* is no longer triggered. * is no longer triggered.
* * <p>
* This API does not actually turn of the proximity sensor; apps should do this on their own if
* required.
* @hide * @hide
*/ */
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 127403196)
public final void setProximitySensorOff(boolean screenOnImmediately) { public final void setProximitySensorOff(boolean screenOnImmediately) {
mInCallAdapter.turnProximitySensorOff(screenOnImmediately); mInCallAdapter.turnProximitySensorOff(screenOnImmediately);
} }

2
telecomm/java/android/telecom/PhoneAccountHandle.java
View File

@@ -42,7 +42,7 @@ import java.util.Objects;
* See {@link PhoneAccount}, {@link TelecomManager}. * See {@link PhoneAccount}, {@link TelecomManager}.
*/ */
public final class PhoneAccountHandle implements Parcelable { public final class PhoneAccountHandle implements Parcelable {
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 127403196)
private final ComponentName mComponentName; private final ComponentName mComponentName;
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023) @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)
private final String mId; private final String mId;

3
telecomm/java/android/telecom/VideoCallImpl.java
View File

@@ -18,6 +18,7 @@ package android.telecom;
import android.annotation.UnsupportedAppUsage; import android.annotation.UnsupportedAppUsage;
import android.net.Uri; import android.net.Uri;
import android.os.Build;
import android.os.Handler; import android.os.Handler;
import android.os.IBinder; import android.os.IBinder;
import android.os.Looper; import android.os.Looper;
@@ -218,7 +219,7 @@ public class VideoCallImpl extends VideoCall {
mTargetSdkVersion = sdkVersion; mTargetSdkVersion = sdkVersion;
} }
@UnsupportedAppUsage @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 127403196)
public void destroy() { public void destroy() {
unregisterCallback(mCallback); unregisterCallback(mCallback);
} }