diff options
| -rw-r--r-- | api/current.txt | 4 | ||||
| -rw-r--r-- | api/system-current.txt | 4 | ||||
| -rw-r--r-- | api/test-current.txt | 4 | ||||
| -rw-r--r-- | core/java/android/app/Activity.java | 2 | ||||
| -rw-r--r-- | core/java/android/content/pm/PackageManager.java | 4 | ||||
| -rw-r--r-- | core/java/android/service/notification/NotificationListenerService.java | 12 |
6 files changed, 8 insertions, 22 deletions
diff --git a/api/current.txt b/api/current.txt index f7a316d063e5..6d2ce8807b2d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -3602,7 +3602,6 @@ package android.app { method public deprecated void setTitleColor(int); method public void setVisible(boolean); method public final void setVolumeControlStream(int); - method public void setVrMode(boolean); method public boolean shouldShowRequestPermissionRationale(java.lang.String); method public boolean shouldUpRecreateTask(android.content.Intent); method public boolean showAssist(android.os.Bundle); @@ -9787,8 +9786,6 @@ package android.content.pm { field public static final java.lang.String FEATURE_USB_ACCESSORY = "android.hardware.usb.accessory"; field public static final java.lang.String FEATURE_USB_HOST = "android.hardware.usb.host"; field public static final java.lang.String FEATURE_VERIFIED_BOOT = "android.software.verified_boot"; - field public static final java.lang.String FEATURE_VR_MODE = "android.software.vr.mode"; - field public static final java.lang.String FEATURE_VR_MODE_HIGH_PERFORMANCE = "android.hardware.vr.high_performance"; field public static final java.lang.String FEATURE_VULKAN_HARDWARE_LEVEL = "android.hardware.vulkan.level"; field public static final java.lang.String FEATURE_VULKAN_HARDWARE_VERSION = "android.hardware.vulkan.version"; field public static final java.lang.String FEATURE_WATCH = "android.hardware.type.watch"; @@ -34555,7 +34552,6 @@ package android.service.notification { method public static final void requestRebind(android.content.ComponentName) throws android.os.RemoteException; method public final void requestUnbind() throws android.os.RemoteException; method public final void setNotificationsShown(java.lang.String[]); - field public static final java.lang.String CATEGORY_VR_NOTIFICATIONS = "android.intent.category.vr.notifications"; field public static final int HINT_HOST_DISABLE_EFFECTS = 1; // 0x1 field public static final int INTERRUPTION_FILTER_ALARMS = 4; // 0x4 field public static final int INTERRUPTION_FILTER_ALL = 1; // 0x1 diff --git a/api/system-current.txt b/api/system-current.txt index b2b59826f3bc..f795b133767f 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -3719,7 +3719,6 @@ package android.app { method public deprecated void setTitleColor(int); method public void setVisible(boolean); method public final void setVolumeControlStream(int); - method public void setVrMode(boolean); method public boolean shouldShowRequestPermissionRationale(java.lang.String); method public boolean shouldUpRecreateTask(android.content.Intent); method public boolean showAssist(android.os.Bundle); @@ -10152,8 +10151,6 @@ package android.content.pm { field public static final java.lang.String FEATURE_USB_ACCESSORY = "android.hardware.usb.accessory"; field public static final java.lang.String FEATURE_USB_HOST = "android.hardware.usb.host"; field public static final java.lang.String FEATURE_VERIFIED_BOOT = "android.software.verified_boot"; - field public static final java.lang.String FEATURE_VR_MODE = "android.software.vr.mode"; - field public static final java.lang.String FEATURE_VR_MODE_HIGH_PERFORMANCE = "android.hardware.vr.high_performance"; field public static final java.lang.String FEATURE_VULKAN_HARDWARE_LEVEL = "android.hardware.vulkan.level"; field public static final java.lang.String FEATURE_VULKAN_HARDWARE_VERSION = "android.hardware.vulkan.version"; field public static final java.lang.String FEATURE_WATCH = "android.hardware.type.watch"; @@ -37098,7 +37095,6 @@ package android.service.notification { method public final void setNotificationsShown(java.lang.String[]); method public final void setOnNotificationPostedTrim(int); method public void unregisterAsSystemService() throws android.os.RemoteException; - field public static final java.lang.String CATEGORY_VR_NOTIFICATIONS = "android.intent.category.vr.notifications"; field public static final int HINT_HOST_DISABLE_EFFECTS = 1; // 0x1 field public static final int INTERRUPTION_FILTER_ALARMS = 4; // 0x4 field public static final int INTERRUPTION_FILTER_ALL = 1; // 0x1 diff --git a/api/test-current.txt b/api/test-current.txt index 472daf698b74..da5798153538 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -3602,7 +3602,6 @@ package android.app { method public deprecated void setTitleColor(int); method public void setVisible(boolean); method public final void setVolumeControlStream(int); - method public void setVrMode(boolean); method public boolean shouldShowRequestPermissionRationale(java.lang.String); method public boolean shouldUpRecreateTask(android.content.Intent); method public boolean showAssist(android.os.Bundle); @@ -9795,8 +9794,6 @@ package android.content.pm { field public static final java.lang.String FEATURE_USB_ACCESSORY = "android.hardware.usb.accessory"; field public static final java.lang.String FEATURE_USB_HOST = "android.hardware.usb.host"; field public static final java.lang.String FEATURE_VERIFIED_BOOT = "android.software.verified_boot"; - field public static final java.lang.String FEATURE_VR_MODE = "android.software.vr.mode"; - field public static final java.lang.String FEATURE_VR_MODE_HIGH_PERFORMANCE = "android.hardware.vr.high_performance"; field public static final java.lang.String FEATURE_VULKAN_HARDWARE_LEVEL = "android.hardware.vulkan.level"; field public static final java.lang.String FEATURE_VULKAN_HARDWARE_VERSION = "android.hardware.vulkan.version"; field public static final java.lang.String FEATURE_WATCH = "android.hardware.type.watch"; @@ -34570,7 +34567,6 @@ package android.service.notification { method public static final void requestRebind(android.content.ComponentName) throws android.os.RemoteException; method public final void requestUnbind() throws android.os.RemoteException; method public final void setNotificationsShown(java.lang.String[]); - field public static final java.lang.String CATEGORY_VR_NOTIFICATIONS = "android.intent.category.vr.notifications"; field public static final int HINT_HOST_DISABLE_EFFECTS = 1; // 0x1 field public static final int INTERRUPTION_FILTER_ALARMS = 4; // 0x4 field public static final int INTERRUPTION_FILTER_ALL = 1; // 0x1 diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 32751b2b47fe..e5a1f7b9a1d6 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -6212,6 +6212,8 @@ public class Activity extends ContextThemeWrapper * high-performance stereoscopic rendering.</p> * * @param enabled {@code true} to enable this mode. + * + * @hide */ public void setVrMode(boolean enabled) { try { diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java index 4dd8155f1b10..8e5eb2320320 100644 --- a/core/java/android/content/pm/PackageManager.java +++ b/core/java/android/content/pm/PackageManager.java @@ -2119,6 +2119,8 @@ public abstract class PackageManager { * The device implements a an optimized mode for virtual reality (VR) applications that handles * stereoscopic rendering of notifications, and may potentially also include optimizations to * reduce latency in the graphics, display, and sensor stacks. + * + * @hide */ @SdkConstant(SdkConstantType.FEATURE) public static final String FEATURE_VR_MODE = "android.software.vr.mode"; @@ -2132,6 +2134,8 @@ public abstract class PackageManager { * {@link #FEATURE_HIFI_SENSORS} with a low sensor latency, implements an optimized render path * to minimize latency to draw to the device's main display, and includes optimizations to * lower display persistence to an acceptable level. + * + * @hide */ @SdkConstant(SdkConstantType.FEATURE) public static final String FEATURE_VR_MODE_HIGH_PERFORMANCE diff --git a/core/java/android/service/notification/NotificationListenerService.java b/core/java/android/service/notification/NotificationListenerService.java index b4332e181fc4..d4bf6585116f 100644 --- a/core/java/android/service/notification/NotificationListenerService.java +++ b/core/java/android/service/notification/NotificationListenerService.java @@ -64,16 +64,6 @@ import java.util.List; * <action android:name="android.service.notification.NotificationListenerService" /> * </intent-filter> * </service></pre> - * <p> Typically, while enabled in user settings, this service will be bound on boot or when a - * settings change occurs that could affect whether this service should run. However, for some - * system usage modes, the you may instead specify that this service is instead bound and unbound - * in response to mode changes by including a category in the intent filter. Currently - * supported categories are: - * <ul> - * <li>{@link #CATEGORY_VR_NOTIFICATIONS} - this service is bound when an Activity has enabled - * VR mode. {@see android.app.Activity#setVrMode(boolean)}.</li> - * </ul> - * </p> */ public abstract class NotificationListenerService extends Service { // TAG = "NotificationListenerService[MySubclass]" @@ -190,6 +180,8 @@ public abstract class NotificationListenerService extends Service { * than the normal lifecycle for a notification service. * * {@see android.app.Activity#setVrMode(boolean)} + * + * @hide */ @SdkConstant(SdkConstant.SdkConstantType.INTENT_CATEGORY) public static final String CATEGORY_VR_NOTIFICATIONS = |