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

Commit b70845c7 authored by Steven Thomas's avatar Steven Thomas
Browse files

Revert "Revert "Add remote callbacks for persistent vr mode"" 

This reverts commit 2abf1c60.

We need the ability to register remote callbacks for persistent vr mode,
so vr flinger can register for persistent vr mode events.

Bug: 35885165

Test: Manually confirmed vr flinger can register and receive persistent
vr mode events.

Change-Id: I7713c4c8acae9a369fd0c06695ef712fddd12be8
parent 3b1ed1cb

Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -282,6 +282,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/IPersistentVrStateCallbacks.aidl \

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

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

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

services/core/java/com/android/server/vr/PersistentVrStateListener.java→core/java/android/service/vr/IPersistentVrStateCallbacks.aidl

+8 −15
Original line number Diff line number Diff line 
/**

 * Copyright (C) 2017 The Android Open Source Project

 * Copyright (c) 2017, The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.
@@ -13,19 +13,12 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.server.vr;



/**

 * Listener for state changes to persistent VR mode.

 *

 * @hide Only for use within system server.

 */

public abstract class PersistentVrStateListener {

package android.service.vr;



/** @hide */

oneway interface IPersistentVrStateCallbacks {



    void onPersistentVrStateChanged(in boolean enabled);



  /**

   * Called when the Persistent VR mode state changes.

   *

   * @param enabled {@code true} if persistent VR mode is enabled.

   */

    public abstract void onPersistentVrStateChanged(boolean enabled);

}

core/java/android/service/vr/IVrManager.aidl

+15 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.service.vr;



import android.service.vr.IVrStateCallbacks;

import android.service.vr.IPersistentVrStateCallbacks;



/** @hide */

interface IVrManager {
@@ -35,6 +36,20 @@ interface IVrManager { 
     */

    void unregisterListener(in IVrStateCallbacks cb);



    /**

     * Add a callback to be notified when persistent VR mode state changes.

     *

     * @param cb the callback instance to add.

     */

    void registerPersistentVrStateListener(in IPersistentVrStateCallbacks cb);



    /**

     * Remove the callack from the current set of registered callbacks.

     *

     * @param cb the callback to remove.

     */

    void unregisterPersistentVrStateListener(in IPersistentVrStateCallbacks cb);



    /**

     * Return current VR mode state.

     *

services/core/java/com/android/server/am/ActivityManagerService.java

+3 −3
Original line number Diff line number Diff line
@@ -296,6 +296,7 @@ import android.provider.Settings; 
import android.service.voice.IVoiceInteractionSession;

import android.service.voice.VoiceInteractionManagerInternal;

import android.service.voice.VoiceInteractionSession;

import android.service.vr.IPersistentVrStateCallbacks;

import android.telecom.TelecomManager;

import android.text.TextUtils;

import android.text.format.DateUtils;
@@ -368,7 +369,6 @@ import com.android.server.firewall.IntentFirewall; 
import com.android.server.pm.Installer;

import com.android.server.pm.Installer.InstallerException;

import com.android.server.statusbar.StatusBarManagerInternal;

import com.android.server.vr.PersistentVrStateListener;

import com.android.server.vr.VrManagerInternal;

import com.android.server.wm.WindowManagerService;










@@ -601,8 +601,8 @@ public class ActivityManagerService extends IActivityManager.Stub













    private int mVrState = NON_VR_MODE;















    private int mTopAppVrThreadTid = 0;















    private int mPersistentVrThreadTid = 0;













    final PersistentVrStateListener mPersistentVrModeListener =













            new PersistentVrStateListener() {













    final IPersistentVrStateCallbacks mPersistentVrModeListener =













            new IPersistentVrStateCallbacks.Stub() {















        @Override















        public void onPersistentVrStateChanged(boolean enabled) {















            synchronized(ActivityManagerService.this) {

































services/core/java/com/android/server/policy/PhoneWindowManager.java



+3
−3




























Original line number
Diff line number
Diff line








@@ -182,6 +182,7 @@ import android.provider.Settings;













import android.service.dreams.DreamManagerInternal;















import android.service.dreams.DreamService;















import android.service.dreams.IDreamManager;













import android.service.vr.IPersistentVrStateCallbacks;















import android.speech.RecognizerIntent;















import android.telecom.TelecomManager;















import android.util.DisplayMetrics;










@@ -236,7 +237,6 @@ import com.android.server.policy.keyguard.KeyguardStateMonitor.StateCallback;













import com.android.server.statusbar.StatusBarManagerInternal;















import com.android.server.wm.AppTransition;















import com.android.server.vr.VrManagerInternal;













import com.android.server.vr.PersistentVrStateListener;































import java.io.File;















import java.io.FileReader;










@@ -999,8 +999,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {













    }















    MyOrientationListener mOrientationListener;





























    final PersistentVrStateListener mPersistentVrModeListener =













            new PersistentVrStateListener() {













    final IPersistentVrStateCallbacks mPersistentVrModeListener =













            new IPersistentVrStateCallbacks.Stub() {















        @Override















        public void onPersistentVrStateChanged(boolean enabled) {















            mPersistentVrModeEnabled = enabled;