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

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

@@ -1,24 +0,0 @@
-/**
- * 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.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package android.service.vr;
-
-/** @hide */
-oneway interface IPersistentVrStateCallbacks {
-
-    void onPersistentVrStateChanged(in boolean enabled);
-
-}

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

@@ -17,7 +17,6 @@
 package android.service.vr;
 
 import android.service.vr.IVrStateCallbacks;
-import android.service.vr.IPersistentVrStateCallbacks;
 
 /** @hide */
 interface IVrManager {
@@ -36,20 +35,6 @@ 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.
      *