Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e24b9a6c authored by Ruben Brunk's avatar Ruben Brunk
Browse files

Add a VR listener service. 

Bug: 22855417
Bug: 26724891
Bug: 27364145

- Add an API for VrListenerService, which is bound/unbound
  from the framework when the system VR mode changes.
- Allow only a single bound VrListenerService at a time.
- Monitor allowed VrListenerService implementations from
  VrManagerService and evict services as needed when packages,
  users, or settings change.
- Remove previous VR functionality in NotificationListenerService.
- Add component target to Activity#setVrMode to allow
  explicit selection of the running VrListenerService from
  the current VR activity.

Change-Id: I776335f4441be0e793d3126f2d16faf86a8c621a
parent 8b030cce

Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -241,6 +241,7 @@ LOCAL_SRC_FILES += \ 
	core/java/android/service/notification/IStatusBarNotificationHolder.aidl \

	core/java/android/service/notification/IConditionListener.aidl \

	core/java/android/service/notification/IConditionProvider.aidl \

	core/java/android/service/vr/IVrListener.aidl \

	core/java/android/print/ILayoutResultCallback.aidl \

	core/java/android/print/IPrinterDiscoveryObserver.aidl \

	core/java/android/print/IPrintDocumentAdapter.aidl \

api/current.txt

+14 −2
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ package android { 
    field public static final java.lang.String BIND_TV_INPUT = "android.permission.BIND_TV_INPUT";

    field public static final java.lang.String BIND_VOICE_INTERACTION = "android.permission.BIND_VOICE_INTERACTION";

    field public static final java.lang.String BIND_VPN_SERVICE = "android.permission.BIND_VPN_SERVICE";

    field public static final java.lang.String BIND_VR_LISTENER_SERVICE = "android.permission.BIND_VR_LISTENER_SERVICE";

    field public static final java.lang.String BIND_WALLPAPER = "android.permission.BIND_WALLPAPER";

    field public static final java.lang.String BLUETOOTH = "android.permission.BLUETOOTH";

    field public static final java.lang.String BLUETOOTH_ADMIN = "android.permission.BLUETOOTH_ADMIN";
@@ -3604,7 +3605,7 @@ 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 void setVrModeEnabled(boolean, android.content.ComponentName) throws android.content.pm.PackageManager.NameNotFoundException;

    method public boolean shouldShowRequestPermissionRationale(java.lang.String);

    method public boolean shouldUpRecreateTask(android.content.Intent);

    method public boolean showAssist(android.os.Bundle);
@@ -32169,6 +32170,7 @@ package android.provider { 
    field public static final java.lang.String ACTION_VOICE_CONTROL_BATTERY_SAVER_MODE = "android.settings.VOICE_CONTROL_BATTERY_SAVER_MODE";

    field public static final java.lang.String ACTION_VOICE_CONTROL_DO_NOT_DISTURB_MODE = "android.settings.VOICE_CONTROL_DO_NOT_DISTURB_MODE";

    field public static final java.lang.String ACTION_VOICE_INPUT_SETTINGS = "android.settings.VOICE_INPUT_SETTINGS";

    field public static final java.lang.String ACTION_VR_LISTENER_SETTINGS = "android.settings.VR_LISTENER_SETTINGS";

    field public static final java.lang.String ACTION_WIFI_IP_SETTINGS = "android.settings.WIFI_IP_SETTINGS";

    field public static final java.lang.String ACTION_WIFI_SETTINGS = "android.settings.WIFI_SETTINGS";

    field public static final java.lang.String ACTION_WIRELESS_SETTINGS = "android.settings.WIRELESS_SETTINGS";
@@ -34486,7 +34488,6 @@ package android.service.notification { 
    method public static 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
@@ -34781,6 +34782,17 @@ package android.service.voice { 














}



























package android.service.vr {

























  public abstract class VrListenerService extends android.app.Service {













    ctor public VrListenerService();













    method public static final boolean isVrModePackageEnabled(android.content.Context, android.content.ComponentName);













    method public android.os.IBinder onBind(android.content.Intent);













    field public static final java.lang.String SERVICE_INTERFACE = "android.service.vr.VrListenerService";













  }

























}



























package android.service.wallpaper {





























  public abstract class WallpaperService extends android.app.Service {

























api/system-current.txt



+14
−2




























Original line number
Diff line number
Diff line








@@ -52,6 +52,7 @@ package android {













    field public static final java.lang.String BIND_TV_INPUT = "android.permission.BIND_TV_INPUT";















    field public static final java.lang.String BIND_VOICE_INTERACTION = "android.permission.BIND_VOICE_INTERACTION";















    field public static final java.lang.String BIND_VPN_SERVICE = "android.permission.BIND_VPN_SERVICE";













    field public static final java.lang.String BIND_VR_LISTENER_SERVICE = "android.permission.BIND_VR_LISTENER_SERVICE";















    field public static final java.lang.String BIND_WALLPAPER = "android.permission.BIND_WALLPAPER";















    field public static final java.lang.String BLUETOOTH = "android.permission.BLUETOOTH";















    field public static final java.lang.String BLUETOOTH_ADMIN = "android.permission.BLUETOOTH_ADMIN";










@@ -3721,7 +3722,7 @@ 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 void setVrModeEnabled(boolean, android.content.ComponentName) throws android.content.pm.PackageManager.NameNotFoundException;















    method public boolean shouldShowRequestPermissionRationale(java.lang.String);















    method public boolean shouldUpRecreateTask(android.content.Intent);















    method public boolean showAssist(android.os.Bundle);










@@ -34656,6 +34657,7 @@ package android.provider {













    field public static final java.lang.String ACTION_VOICE_CONTROL_BATTERY_SAVER_MODE = "android.settings.VOICE_CONTROL_BATTERY_SAVER_MODE";















    field public static final java.lang.String ACTION_VOICE_CONTROL_DO_NOT_DISTURB_MODE = "android.settings.VOICE_CONTROL_DO_NOT_DISTURB_MODE";















    field public static final java.lang.String ACTION_VOICE_INPUT_SETTINGS = "android.settings.VOICE_INPUT_SETTINGS";













    field public static final java.lang.String ACTION_VR_LISTENER_SETTINGS = "android.settings.VR_LISTENER_SETTINGS";















    field public static final java.lang.String ACTION_WIFI_IP_SETTINGS = "android.settings.WIFI_IP_SETTINGS";















    field public static final java.lang.String ACTION_WIFI_SETTINGS = "android.settings.WIFI_SETTINGS";















    field public static final java.lang.String ACTION_WIRELESS_SETTINGS = "android.settings.WIRELESS_SETTINGS";










@@ -37013,7 +37015,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










@@ -37366,6 +37367,17 @@ package android.service.voice {



























}



























package android.service.vr {

























  public abstract class VrListenerService extends android.app.Service {













    ctor public VrListenerService();













    method public static final boolean isVrModePackageEnabled(android.content.Context, android.content.ComponentName);













    method public android.os.IBinder onBind(android.content.Intent);













    field public static final java.lang.String SERVICE_INTERFACE = "android.service.vr.VrListenerService";













  }

























}



























package android.service.wallpaper {





























  public abstract class WallpaperService extends android.app.Service {

























api/test-current.txt



+14
−2




























Original line number
Diff line number
Diff line








@@ -38,6 +38,7 @@ package android {













    field public static final java.lang.String BIND_TV_INPUT = "android.permission.BIND_TV_INPUT";















    field public static final java.lang.String BIND_VOICE_INTERACTION = "android.permission.BIND_VOICE_INTERACTION";















    field public static final java.lang.String BIND_VPN_SERVICE = "android.permission.BIND_VPN_SERVICE";













    field public static final java.lang.String BIND_VR_LISTENER_SERVICE = "android.permission.BIND_VR_LISTENER_SERVICE";















    field public static final java.lang.String BIND_WALLPAPER = "android.permission.BIND_WALLPAPER";















    field public static final java.lang.String BLUETOOTH = "android.permission.BLUETOOTH";















    field public static final java.lang.String BLUETOOTH_ADMIN = "android.permission.BLUETOOTH_ADMIN";










@@ -3604,7 +3605,7 @@ 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 void setVrModeEnabled(boolean, android.content.ComponentName) throws android.content.pm.PackageManager.NameNotFoundException;















    method public boolean shouldShowRequestPermissionRationale(java.lang.String);















    method public boolean shouldUpRecreateTask(android.content.Intent);















    method public boolean showAssist(android.os.Bundle);










@@ -32184,6 +32185,7 @@ package android.provider {













    field public static final java.lang.String ACTION_VOICE_CONTROL_BATTERY_SAVER_MODE = "android.settings.VOICE_CONTROL_BATTERY_SAVER_MODE";















    field public static final java.lang.String ACTION_VOICE_CONTROL_DO_NOT_DISTURB_MODE = "android.settings.VOICE_CONTROL_DO_NOT_DISTURB_MODE";















    field public static final java.lang.String ACTION_VOICE_INPUT_SETTINGS = "android.settings.VOICE_INPUT_SETTINGS";













    field public static final java.lang.String ACTION_VR_LISTENER_SETTINGS = "android.settings.VR_LISTENER_SETTINGS";















    field public static final java.lang.String ACTION_WIFI_IP_SETTINGS = "android.settings.WIFI_IP_SETTINGS";















    field public static final java.lang.String ACTION_WIFI_SETTINGS = "android.settings.WIFI_SETTINGS";















    field public static final java.lang.String ACTION_WIRELESS_SETTINGS = "android.settings.WIRELESS_SETTINGS";










@@ -34503,7 +34505,6 @@ package android.service.notification {













    method public static 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










@@ -34798,6 +34799,17 @@ package android.service.voice {



























}



























package android.service.vr {

























  public abstract class VrListenerService extends android.app.Service {













    ctor public VrListenerService();













    method public static final boolean isVrModePackageEnabled(android.content.Context, android.content.ComponentName);













    method public android.os.IBinder onBind(android.content.Intent);













    field public static final java.lang.String SERVICE_INTERFACE = "android.service.vr.VrListenerService";













  }

























}



























package android.service.wallpaper {





























  public abstract class WallpaperService extends android.app.Service {

























core/java/android/app/Activity.java



+14
−4




























Original line number
Diff line number
Diff line








@@ -6177,14 +6177,24 @@ public class Activity extends ContextThemeWrapper













    /**















     * Enable or disable virtual reality (VR) mode.















     *













     * <p>VR mode is a hint to Android system services to switch to modes optimized for













     * high-performance stereoscopic rendering.</p>













     * <p>VR mode is a hint to Android system services to switch to a mode optimized for













     * high-performance stereoscopic rendering.  This mode will be enabled while this Activity has













     * focus.</p>















     *















     * @param enabled {@code true} to enable this mode.













     * @param requestedComponent the name of the component to use as a













     *        {@link android.service.vr.VrListenerService} while VR mode is enabled.













     *













     * @throws android.content.pm.PackageManager.NameNotFoundException;















     */













    public void setVrMode(boolean enabled) {













    public void setVrModeEnabled(boolean enabled, @NonNull ComponentName requestedComponent)













          throws PackageManager.NameNotFoundException {















        try {













            ActivityManagerNative.getDefault().setVrMode(mToken, enabled);













            if (ActivityManagerNative.getDefault().setVrMode(mToken, enabled, requestedComponent)













                    != 0) {













                throw new PackageManager.NameNotFoundException(













                        requestedComponent.flattenToString());













            }















        } catch (RemoteException e) {















            // pass















        }