summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/hiddenapi-light-greylist.txt45
-rw-r--r--config/hiddenapi-vendor-list.txt8
-rw-r--r--core/java/android/service/dreams/DreamService.java9
-rw-r--r--core/java/android/service/euicc/EuiccProfileInfo.java2
-rw-r--r--core/java/android/service/euicc/GetDefaultDownloadableSubscriptionListResult.java2
-rw-r--r--core/java/android/service/euicc/GetDownloadableSubscriptionMetadataResult.java2
-rw-r--r--core/java/android/service/notification/NotificationListenerService.java8
-rw-r--r--core/java/android/service/notification/StatusBarNotification.java13
-rw-r--r--core/java/android/service/notification/ZenModeConfig.java16
-rw-r--r--core/java/android/service/voice/AlwaysOnHotwordDetector.java2
-rw-r--r--core/java/android/service/voice/VoiceInteractionService.java2
-rw-r--r--core/java/android/service/vr/VrListenerService.java2
-rw-r--r--core/java/android/service/wallpaper/WallpaperService.java4
-rw-r--r--media/java/android/service/media/MediaBrowserService.java3
14 files changed, 65 insertions, 53 deletions
diff --git a/config/hiddenapi-light-greylist.txt b/config/hiddenapi-light-greylist.txt
index c55cd20aaecf..d1217ae9fc37 100644
--- a/config/hiddenapi-light-greylist.txt
+++ b/config/hiddenapi-light-greylist.txt
@@ -3986,10 +3986,6 @@ Landroid/security/KeystoreArguments;->CREATOR:Landroid/os/Parcelable$Creator;
Landroid/security/net/config/RootTrustManager;->checkServerTrusted([Ljava/security/cert/X509Certificate;Ljava/lang/String;Ljava/lang/String;)Ljava/util/List;
Landroid/service/carrier/ICarrierMessagingCallback$Stub;-><init>()V
Landroid/service/carrier/ICarrierMessagingService;->filterSms(Landroid/service/carrier/MessagePdu;Ljava/lang/String;IILandroid/service/carrier/ICarrierMessagingCallback;)V
-Landroid/service/dreams/DreamService;->getDozeScreenBrightness()I
-Landroid/service/dreams/DreamService;->setDozeScreenBrightness(I)V
-Landroid/service/dreams/DreamService;->setDozeScreenState(I)V
-Landroid/service/dreams/DreamService;->setWindowless(Z)V
Landroid/service/dreams/IDreamManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/service/dreams/IDreamManager;
Landroid/service/dreams/IDreamManager;->awaken()V
Landroid/service/dreams/IDreamManager;->dream()V
@@ -4013,46 +4009,8 @@ Landroid/service/media/IMediaBrowserServiceCallbacks;->onConnect(Ljava/lang/Stri
Landroid/service/media/IMediaBrowserServiceCallbacks;->onConnectFailed()V
Landroid/service/media/IMediaBrowserServiceCallbacks;->onLoadChildren(Ljava/lang/String;Landroid/content/pm/ParceledListSlice;)V
Landroid/service/media/IMediaBrowserServiceCallbacks;->onLoadChildrenWithOptions(Ljava/lang/String;Landroid/content/pm/ParceledListSlice;Landroid/os/Bundle;)V
-Landroid/service/media/MediaBrowserService$Result;->mFlags:I
-Landroid/service/media/MediaBrowserService;->KEY_MEDIA_ITEM:Ljava/lang/String;
Landroid/service/notification/INotificationListener$Stub;-><init>()V
-Landroid/service/notification/NotificationListenerService$Ranking;->getVisibilityOverride()I
-Landroid/service/notification/NotificationListenerService;->getNotificationInterface()Landroid/app/INotificationManager;
-Landroid/service/notification/NotificationListenerService;->isBound()Z
-Landroid/service/notification/NotificationListenerService;->mHandler:Landroid/os/Handler;
-Landroid/service/notification/NotificationListenerService;->mNoMan:Landroid/app/INotificationManager;
-Landroid/service/notification/NotificationListenerService;->mWrapper:Landroid/service/notification/NotificationListenerService$NotificationListenerWrapper;
-Landroid/service/notification/NotificationListenerService;->TAG:Ljava/lang/String;
-Landroid/service/notification/StatusBarNotification;->getInitialPid()I
-Landroid/service/notification/StatusBarNotification;->getOpPkg()Ljava/lang/String;
-Landroid/service/notification/StatusBarNotification;->getPackageContext(Landroid/content/Context;)Landroid/content/Context;
-Landroid/service/notification/StatusBarNotification;->getUid()I
-Landroid/service/notification/StatusBarNotification;->id:I
-Landroid/service/notification/StatusBarNotification;->initialPid:I
-Landroid/service/notification/StatusBarNotification;->notification:Landroid/app/Notification;
-Landroid/service/notification/StatusBarNotification;->pkg:Ljava/lang/String;
-Landroid/service/notification/StatusBarNotification;->postTime:J
-Landroid/service/notification/StatusBarNotification;->tag:Ljava/lang/String;
-Landroid/service/notification/StatusBarNotification;->uid:I
-Landroid/service/notification/StatusBarNotification;->user:Landroid/os/UserHandle;
-Landroid/service/notification/ZenModeConfig$ScheduleInfo;->days:[I
-Landroid/service/notification/ZenModeConfig$ScheduleInfo;->endHour:I
-Landroid/service/notification/ZenModeConfig$ScheduleInfo;->endMinute:I
-Landroid/service/notification/ZenModeConfig$ScheduleInfo;->startHour:I
-Landroid/service/notification/ZenModeConfig$ScheduleInfo;->startMinute:I
-Landroid/service/notification/ZenModeConfig$ZenRule;->conditionId:Landroid/net/Uri;
-Landroid/service/notification/ZenModeConfig$ZenRule;->creationTime:J
-Landroid/service/notification/ZenModeConfig$ZenRule;->enabled:Z
-Landroid/service/notification/ZenModeConfig$ZenRule;->name:Ljava/lang/String;
-Landroid/service/notification/ZenModeConfig$ZenRule;->snoozing:Z
-Landroid/service/notification/ZenModeConfig$ZenRule;->zenMode:I
-Landroid/service/notification/ZenModeConfig;-><init>()V
-Landroid/service/notification/ZenModeConfig;->allowAlarms:Z
-Landroid/service/notification/ZenModeConfig;->automaticRules:Landroid/util/ArrayMap;
-Landroid/service/notification/ZenModeConfig;->tryParseScheduleConditionId(Landroid/net/Uri;)Landroid/service/notification/ZenModeConfig$ScheduleInfo;
Landroid/service/persistentdata/IPersistentDataBlockService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/service/persistentdata/IPersistentDataBlockService;
-Landroid/service/voice/AlwaysOnHotwordDetector$EventPayload;->getCaptureSession()Ljava/lang/Integer;
-Landroid/service/voice/VoiceInteractionService;->isKeyphraseAndLocaleSupportedForHotword(Ljava/lang/String;Ljava/util/Locale;)Z
Landroid/service/vr/IVrManager$Stub;->asInterface(Landroid/os/IBinder;)Landroid/service/vr/IVrManager;
Landroid/service/vr/IVrManager;->getVr2dDisplayId()I
Landroid/service/vr/IVrManager;->getVrModeState()Z
@@ -4063,9 +4021,6 @@ Landroid/service/wallpaper/IWallpaperEngine;->dispatchWallpaperCommand(Ljava/lan
Landroid/service/wallpaper/IWallpaperEngine;->setDesiredSize(II)V
Landroid/service/wallpaper/IWallpaperEngine;->setVisibility(Z)V
Landroid/service/wallpaper/IWallpaperService$Stub;->asInterface(Landroid/os/IBinder;)Landroid/service/wallpaper/IWallpaperService;
-Landroid/service/wallpaper/WallpaperService$Engine;->mPendingXOffset:F
-Landroid/service/wallpaper/WallpaperService$Engine;->setFixedSizeAllowed(Z)V
-Landroid/service/wallpaper/WallpaperService;->MSG_WINDOW_RESIZED:I
Landroid/speech/IRecognitionListener;->onEvent(ILandroid/os/Bundle;)V
Landroid/system/Int32Ref;->value:I
Landroid/system/OsConstants;-><init>()V
diff --git a/config/hiddenapi-vendor-list.txt b/config/hiddenapi-vendor-list.txt
index dcaa2616b0c4..9cc8f7143a78 100644
--- a/config/hiddenapi-vendor-list.txt
+++ b/config/hiddenapi-vendor-list.txt
@@ -363,14 +363,6 @@ Landroid/provider/Telephony$Mms;->isEmailAddress(Ljava/lang/String;)Z
Landroid/provider/Telephony$Sms$Draft;->addMessage(Landroid/content/ContentResolver;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;)Landroid/net/Uri;
Landroid/provider/Telephony$Sms$Outbox;->addMessage(Landroid/content/ContentResolver;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;ZJ)Landroid/net/Uri;
Landroid/R$styleable;->CheckBoxPreference:[I
-Landroid/service/dreams/DreamService;->canDoze()Z
-Landroid/service/dreams/DreamService;->isDozing()Z
-Landroid/service/dreams/DreamService;->startDozing()V
-Landroid/service/dreams/DreamService;->stopDozing()V
-Landroid/service/euicc/EuiccProfileInfo;-><init>(Ljava/lang/String;[Landroid/telephony/UiccAccessRule;Ljava/lang/String;)V
-Landroid/service/euicc/GetDefaultDownloadableSubscriptionListResult;->result:I
-Landroid/service/euicc/GetDownloadableSubscriptionMetadataResult;->result:I
-Landroid/service/vr/VrListenerService;->onCurrentVrActivityChanged(Landroid/content/ComponentName;ZI)V
Landroid/system/NetlinkSocketAddress;-><init>(II)V
Landroid/system/Os;->bind(Ljava/io/FileDescriptor;Ljava/net/SocketAddress;)V
Landroid/system/Os;->connect(Ljava/io/FileDescriptor;Ljava/net/SocketAddress;)V
diff --git a/core/java/android/service/dreams/DreamService.java b/core/java/android/service/dreams/DreamService.java
index 2b114d568045..15b2aaebd1c0 100644
--- a/core/java/android/service/dreams/DreamService.java
+++ b/core/java/android/service/dreams/DreamService.java
@@ -21,6 +21,7 @@ import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SdkConstant;
import android.annotation.SdkConstant.SdkConstantType;
+import android.annotation.UnsupportedAppUsage;
import android.app.AlarmManager;
import android.app.Service;
import android.content.Intent;
@@ -601,6 +602,7 @@ public class DreamService extends Service implements Window.Callback {
*
* @hide
*/
+ @UnsupportedAppUsage
public void setWindowless(boolean windowless) {
mWindowless = windowless;
}
@@ -624,6 +626,7 @@ public class DreamService extends Service implements Window.Callback {
* @see #startDozing
* @hide For use by system UI components only.
*/
+ @UnsupportedAppUsage
public boolean canDoze() {
return mCanDoze;
}
@@ -657,6 +660,7 @@ public class DreamService extends Service implements Window.Callback {
* @see #stopDozing
* @hide For use by system UI components only.
*/
+ @UnsupportedAppUsage
public void startDozing() {
if (mCanDoze && !mDozing) {
mDozing = true;
@@ -690,6 +694,7 @@ public class DreamService extends Service implements Window.Callback {
* @see #startDozing
* @hide For use by system UI components only.
*/
+ @UnsupportedAppUsage
public void stopDozing() {
if (mDozing) {
mDozing = false;
@@ -711,6 +716,7 @@ public class DreamService extends Service implements Window.Callback {
* @see #setDozing(boolean)
* @hide For use by system UI components only.
*/
+ @UnsupportedAppUsage
public boolean isDozing() {
return mDozing;
}
@@ -767,6 +773,7 @@ public class DreamService extends Service implements Window.Callback {
*
* @hide For use by system UI components only.
*/
+ @UnsupportedAppUsage
public void setDozeScreenState(int state) {
if (mDozeScreenState != state) {
mDozeScreenState = state;
@@ -785,6 +792,7 @@ public class DreamService extends Service implements Window.Callback {
* @see #setDozeScreenBrightness
* @hide For use by system UI components only.
*/
+ @UnsupportedAppUsage
public int getDozeScreenBrightness() {
return mDozeScreenBrightness;
}
@@ -816,6 +824,7 @@ public class DreamService extends Service implements Window.Callback {
*
* @hide For use by system UI components only.
*/
+ @UnsupportedAppUsage
public void setDozeScreenBrightness(int brightness) {
if (brightness != PowerManager.BRIGHTNESS_DEFAULT) {
brightness = clampAbsoluteBrightness(brightness);
diff --git a/core/java/android/service/euicc/EuiccProfileInfo.java b/core/java/android/service/euicc/EuiccProfileInfo.java
index 4bbee616dca0..4a3978242a11 100644
--- a/core/java/android/service/euicc/EuiccProfileInfo.java
+++ b/core/java/android/service/euicc/EuiccProfileInfo.java
@@ -18,6 +18,7 @@ package android.service.euicc;
import android.annotation.IntDef;
import android.annotation.Nullable;
import android.annotation.SystemApi;
+import android.annotation.UnsupportedAppUsage;
import android.os.Parcel;
import android.os.Parcelable;
import android.service.carrier.CarrierIdentifier;
@@ -143,6 +144,7 @@ public final class EuiccProfileInfo implements Parcelable {
* @deprecated - Do not use.
*/
@Deprecated
+ @UnsupportedAppUsage
public EuiccProfileInfo(String iccid, @Nullable UiccAccessRule[] accessRules,
@Nullable String nickname) {
if (!TextUtils.isDigitsOnly(iccid)) {
diff --git a/core/java/android/service/euicc/GetDefaultDownloadableSubscriptionListResult.java b/core/java/android/service/euicc/GetDefaultDownloadableSubscriptionListResult.java
index e2171ae6bc76..bd91ca00145d 100644
--- a/core/java/android/service/euicc/GetDefaultDownloadableSubscriptionListResult.java
+++ b/core/java/android/service/euicc/GetDefaultDownloadableSubscriptionListResult.java
@@ -17,6 +17,7 @@ package android.service.euicc;
import android.annotation.Nullable;
import android.annotation.SystemApi;
+import android.annotation.UnsupportedAppUsage;
import android.os.Parcel;
import android.os.Parcelable;
import android.telephony.euicc.DownloadableSubscription;
@@ -49,6 +50,7 @@ public final class GetDefaultDownloadableSubscriptionListResult implements Parce
* @deprecated - Do no use. Use getResult() instead.
*/
@Deprecated
+ @UnsupportedAppUsage
public final int result;
@Nullable
diff --git a/core/java/android/service/euicc/GetDownloadableSubscriptionMetadataResult.java b/core/java/android/service/euicc/GetDownloadableSubscriptionMetadataResult.java
index 1edb5398add4..71f1d22d603d 100644
--- a/core/java/android/service/euicc/GetDownloadableSubscriptionMetadataResult.java
+++ b/core/java/android/service/euicc/GetDownloadableSubscriptionMetadataResult.java
@@ -17,6 +17,7 @@ package android.service.euicc;
import android.annotation.Nullable;
import android.annotation.SystemApi;
+import android.annotation.UnsupportedAppUsage;
import android.os.Parcel;
import android.os.Parcelable;
import android.telephony.euicc.DownloadableSubscription;
@@ -46,6 +47,7 @@ public final class GetDownloadableSubscriptionMetadataResult implements Parcelab
* @deprecated - Do no use. Use getResult() instead.
*/
@Deprecated
+ @UnsupportedAppUsage
public final int result;
@Nullable
diff --git a/core/java/android/service/notification/NotificationListenerService.java b/core/java/android/service/notification/NotificationListenerService.java
index a7d70d01b04a..5fc858f42692 100644
--- a/core/java/android/service/notification/NotificationListenerService.java
+++ b/core/java/android/service/notification/NotificationListenerService.java
@@ -21,6 +21,7 @@ import android.annotation.NonNull;
import android.annotation.SdkConstant;
import android.annotation.SystemApi;
import android.annotation.TestApi;
+import android.annotation.UnsupportedAppUsage;
import android.app.ActivityManager;
import android.app.INotificationManager;
import android.app.Notification;
@@ -93,6 +94,7 @@ import java.util.List;
*/
public abstract class NotificationListenerService extends Service {
+ @UnsupportedAppUsage
private final String TAG = getClass().getSimpleName();
/**
@@ -274,9 +276,11 @@ public abstract class NotificationListenerService extends Service {
private final Object mLock = new Object();
+ @UnsupportedAppUsage
private Handler mHandler;
/** @hide */
+ @UnsupportedAppUsage
protected NotificationListenerWrapper mWrapper = null;
private boolean isConnected = false;
@@ -286,6 +290,7 @@ public abstract class NotificationListenerService extends Service {
/**
* @hide
*/
+ @UnsupportedAppUsage
protected INotificationManager mNoMan;
/**
@@ -507,6 +512,7 @@ public abstract class NotificationListenerService extends Service {
}
/** @hide */
+ @UnsupportedAppUsage
protected final INotificationManager getNotificationInterface() {
if (mNoMan == null) {
mNoMan = INotificationManager.Stub.asInterface(
@@ -1065,6 +1071,7 @@ public abstract class NotificationListenerService extends Service {
}
/** @hide */
+ @UnsupportedAppUsage
protected boolean isBound() {
if (mWrapper == null) {
Log.w(TAG, "Notification listener service not yet bound.");
@@ -1461,6 +1468,7 @@ public abstract class NotificationListenerService extends Service {
* no such preference has been expressed.
* @hide
*/
+ @UnsupportedAppUsage
public int getVisibilityOverride() {
return mVisibilityOverride;
}
diff --git a/core/java/android/service/notification/StatusBarNotification.java b/core/java/android/service/notification/StatusBarNotification.java
index d1ebc6eca214..dd97d524d829 100644
--- a/core/java/android/service/notification/StatusBarNotification.java
+++ b/core/java/android/service/notification/StatusBarNotification.java
@@ -16,6 +16,7 @@
package android.service.notification;
+import android.annotation.UnsupportedAppUsage;
import android.app.Notification;
import android.app.NotificationChannel;
import android.content.Context;
@@ -30,18 +31,26 @@ import android.os.UserHandle;
* the status bar and any {@link android.service.notification.NotificationListenerService}s.
*/
public class StatusBarNotification implements Parcelable {
+ @UnsupportedAppUsage
private final String pkg;
+ @UnsupportedAppUsage
private final int id;
+ @UnsupportedAppUsage
private final String tag;
private final String key;
private String groupKey;
private String overrideGroupKey;
+ @UnsupportedAppUsage
private final int uid;
private final String opPkg;
+ @UnsupportedAppUsage
private final int initialPid;
+ @UnsupportedAppUsage
private final Notification notification;
+ @UnsupportedAppUsage
private final UserHandle user;
+ @UnsupportedAppUsage
private final long postTime;
private Context mContext; // used for inflation & icon expansion
@@ -269,16 +278,19 @@ public class StatusBarNotification implements Parcelable {
}
/** The notifying app's calling uid. @hide */
+ @UnsupportedAppUsage
public int getUid() {
return uid;
}
/** The package used for AppOps tracking. @hide */
+ @UnsupportedAppUsage
public String getOpPkg() {
return opPkg;
}
/** @hide */
+ @UnsupportedAppUsage
public int getInitialPid() {
return initialPid;
}
@@ -346,6 +358,7 @@ public class StatusBarNotification implements Parcelable {
/**
* @hide
*/
+ @UnsupportedAppUsage
public Context getPackageContext(Context context) {
if (mContext == null) {
try {
diff --git a/core/java/android/service/notification/ZenModeConfig.java b/core/java/android/service/notification/ZenModeConfig.java
index 5546e803342b..f6749ee66bb4 100644
--- a/core/java/android/service/notification/ZenModeConfig.java
+++ b/core/java/android/service/notification/ZenModeConfig.java
@@ -20,6 +20,7 @@ import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_FULL_SCRE
import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_LIGHTS;
import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_PEEK;
+import android.annotation.UnsupportedAppUsage;
import android.app.ActivityManager;
import android.app.AlarmManager;
import android.app.NotificationManager;
@@ -145,6 +146,7 @@ public class ZenModeConfig implements Parcelable {
private static final String RULE_ATT_CREATION_TIME = "creationTime";
private static final String RULE_ATT_ENABLER = "enabler";
+ @UnsupportedAppUsage
public boolean allowAlarms = DEFAULT_ALLOW_ALARMS;
public boolean allowMedia = DEFAULT_ALLOW_MEDIA;
public boolean allowSystem = DEFAULT_ALLOW_SYSTEM;
@@ -161,8 +163,10 @@ public class ZenModeConfig implements Parcelable {
public int version;
public ZenRule manualRule;
+ @UnsupportedAppUsage
public ArrayMap<String, ZenRule> automaticRules = new ArrayMap<>();
+ @UnsupportedAppUsage
public ZenModeConfig() { }
public ZenModeConfig(Parcel source) {
@@ -1007,6 +1011,7 @@ public class ZenModeConfig implements Parcelable {
return true;
}
+ @UnsupportedAppUsage
public static ScheduleInfo tryParseScheduleConditionId(Uri conditionId) {
final boolean isSchedule = conditionId != null
&& conditionId.getScheme().equals(Condition.SCHEME)
@@ -1032,10 +1037,15 @@ public class ZenModeConfig implements Parcelable {
}
public static class ScheduleInfo {
+ @UnsupportedAppUsage
public int[] days;
+ @UnsupportedAppUsage
public int startHour;
+ @UnsupportedAppUsage
public int startMinute;
+ @UnsupportedAppUsage
public int endHour;
+ @UnsupportedAppUsage
public int endMinute;
public boolean exitAtAlarm;
public long nextAlarm;
@@ -1253,14 +1263,20 @@ public class ZenModeConfig implements Parcelable {
}
public static class ZenRule implements Parcelable {
+ @UnsupportedAppUsage
public boolean enabled;
+ @UnsupportedAppUsage
public boolean snoozing; // user manually disabled this instance
+ @UnsupportedAppUsage
public String name; // required for automatic
+ @UnsupportedAppUsage
public int zenMode;
+ @UnsupportedAppUsage
public Uri conditionId; // required for automatic
public Condition condition; // optional
public ComponentName component; // optional
public String id; // required for automatic (unique)
+ @UnsupportedAppUsage
public long creationTime; // required for automatic
public String enabler; // package name, only used for manual rules.
diff --git a/core/java/android/service/voice/AlwaysOnHotwordDetector.java b/core/java/android/service/voice/AlwaysOnHotwordDetector.java
index 76d89ef039c8..bd953cad2b75 100644
--- a/core/java/android/service/voice/AlwaysOnHotwordDetector.java
+++ b/core/java/android/service/voice/AlwaysOnHotwordDetector.java
@@ -19,6 +19,7 @@ package android.service.voice;
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
+import android.annotation.UnsupportedAppUsage;
import android.app.Activity;
import android.content.Intent;
import android.hardware.soundtrigger.IRecognitionStatusCallback;
@@ -266,6 +267,7 @@ public class AlwaysOnHotwordDetector {
* @hide
*/
@Nullable
+ @UnsupportedAppUsage
public Integer getCaptureSession() {
if (mCaptureAvailable) {
return mCaptureSession;
diff --git a/core/java/android/service/voice/VoiceInteractionService.java b/core/java/android/service/voice/VoiceInteractionService.java
index 8f79bcffa776..0bbc07e8063e 100644
--- a/core/java/android/service/voice/VoiceInteractionService.java
+++ b/core/java/android/service/voice/VoiceInteractionService.java
@@ -17,6 +17,7 @@
package android.service.voice;
import android.annotation.SdkConstant;
+import android.annotation.UnsupportedAppUsage;
import android.app.Service;
import android.content.ComponentName;
import android.content.Context;
@@ -294,6 +295,7 @@ public class VoiceInteractionService extends Service {
* @return true if the keyphrase and locale combination is supported, false otherwise.
* @hide
*/
+ @UnsupportedAppUsage
public final boolean isKeyphraseAndLocaleSupportedForHotword(String keyphrase, Locale locale) {
if (mKeyphraseEnrollmentInfo == null) {
return false;
diff --git a/core/java/android/service/vr/VrListenerService.java b/core/java/android/service/vr/VrListenerService.java
index fa3d065d28a7..3c384955a578 100644
--- a/core/java/android/service/vr/VrListenerService.java
+++ b/core/java/android/service/vr/VrListenerService.java
@@ -18,6 +18,7 @@ package android.service.vr;
import android.annotation.NonNull;
import android.annotation.SdkConstant;
+import android.annotation.UnsupportedAppUsage;
import android.app.ActivityManager;
import android.app.Service;
import android.content.ComponentName;
@@ -139,6 +140,7 @@ public abstract class VrListenerService extends Service {
* @see android.R.attr#enableVrMode
* @hide
*/
+ @UnsupportedAppUsage
public void onCurrentVrActivityChanged(
ComponentName component, boolean running2dInVr, int pid) {
// Override to implement. Default to old behaviour of sending null for 2D.
diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java
index 7f75f0a68660..0dfd7633b2ff 100644
--- a/core/java/android/service/wallpaper/WallpaperService.java
+++ b/core/java/android/service/wallpaper/WallpaperService.java
@@ -19,6 +19,7 @@ package android.service.wallpaper;
import android.annotation.Nullable;
import android.annotation.SdkConstant;
import android.annotation.SdkConstant.SdkConstantType;
+import android.annotation.UnsupportedAppUsage;
import android.app.Service;
import android.app.WallpaperColors;
import android.app.WallpaperManager;
@@ -108,6 +109,7 @@ public abstract class WallpaperService extends Service {
private static final int MSG_VISIBILITY_CHANGED = 10010;
private static final int MSG_WALLPAPER_OFFSETS = 10020;
private static final int MSG_WALLPAPER_COMMAND = 10025;
+ @UnsupportedAppUsage
private static final int MSG_WINDOW_RESIZED = 10030;
private static final int MSG_WINDOW_MOVED = 10035;
private static final int MSG_TOUCH_EVENT = 10040;
@@ -190,6 +192,7 @@ public abstract class WallpaperService extends Service {
final Object mLock = new Object();
boolean mOffsetMessageEnqueued;
+ @UnsupportedAppUsage
float mPendingXOffset;
float mPendingYOffset;
float mPendingXOffsetStep;
@@ -479,6 +482,7 @@ public abstract class WallpaperService extends Service {
}
/** {@hide} */
+ @UnsupportedAppUsage
public void setFixedSizeAllowed(boolean allowed) {
mFixedSizeAllowed = allowed;
}
diff --git a/media/java/android/service/media/MediaBrowserService.java b/media/java/android/service/media/MediaBrowserService.java
index ca7ab7ec6e64..5a60ac10fd82 100644
--- a/media/java/android/service/media/MediaBrowserService.java
+++ b/media/java/android/service/media/MediaBrowserService.java
@@ -21,6 +21,7 @@ import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SdkConstant;
import android.annotation.SdkConstant.SdkConstantType;
+import android.annotation.UnsupportedAppUsage;
import android.app.Service;
import android.content.Intent;
import android.content.pm.PackageManager;
@@ -89,6 +90,7 @@ public abstract class MediaBrowserService extends Service {
* A key for passing the MediaItem to the ResultReceiver in getItem.
* @hide
*/
+ @UnsupportedAppUsage
public static final String KEY_MEDIA_ITEM = "media_item";
private static final int RESULT_FLAG_OPTION_NOT_HANDLED = 1 << 0;
@@ -149,6 +151,7 @@ public abstract class MediaBrowserService extends Service {
private Object mDebug;
private boolean mDetachCalled;
private boolean mSendResultCalled;
+ @UnsupportedAppUsage
private int mFlags;
Result(Object debug) {