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

Commit f7d119a4 authored by Devin Moore's avatar Devin Moore Committed by Android (Google) Code Review
Browse files

Merge "Remove VmManagerService" into main

parents 56289520 42c19881
Loading
Loading
Loading
Loading
+0 −3
Original line number Diff line number Diff line
@@ -45,9 +45,6 @@ public final class LazyJniRegistrar {
    /** Registers native methods for GameManagerService. */
    public static native void registerGameManagerService();

    /** Registers native methods for VrManagerService. */
    public static native void registerVrManagerService();

    /** Registers native methods for Vpn (the JNI counterpart for VpnManagerService). */
    public static native void registerVpn();
}
+0 −1444

File deleted.

Preview size limit exceeded, changes collapsed.

+0 −1
Original line number Diff line number Diff line
@@ -261,7 +261,6 @@ filegroup {
        "com_android_server_app_GameManagerService.cpp",
        "com_android_server_connectivity_Vpn.cpp",
        "com_android_server_utils_LazyJniRegistrar.cpp",
        "com_android_server_vr_VrManagerService.cpp",
    ],
}

+0 −6
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ namespace android {
int register_android_server_ConsumerIrService(JNIEnv* env);
int register_android_server_app_GameManagerService(JNIEnv* env);
int register_android_server_connectivity_Vpn(JNIEnv* env);
int register_android_server_vr_VrManagerService(JNIEnv* env);

namespace {

@@ -43,15 +42,10 @@ void registerVpn(JNIEnv* env, jclass) {
    register_android_server_connectivity_Vpn(env);
}

void registerVrManagerService(JNIEnv* env, jclass) {
    register_android_server_vr_VrManagerService(env);
}

static const JNINativeMethod sJniRegistrarMethods[] = {
        {"registerConsumerIrService", "()V", (void*)registerConsumerIrService},
        {"registerGameManagerService", "()V", (void*)registerGameManagerService},
        {"registerVpn", "()V", (void*)registerVpn},
        {"registerVrManagerService", "()V", (void*)registerVrManagerService},
};

} // namespace
+0 −48
Original line number Diff line number Diff line
/*
 * Copyright (C) 2016 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.
 */

#define LOG_TAG "VrManagerService"

#include <android_runtime/AndroidRuntime.h>
#include <jni.h>
#include <nativehelper/JNIHelp.h>
#include <utils/Errors.h>
#include <utils/Log.h>

namespace android {

static void init_native(JNIEnv* /* env */, jclass /* clazz */) {
    ALOGW("%s: Could not open IVr interface as it no longer supported", __FUNCTION__);
    return;
}

static void setVrMode_native(JNIEnv* /* env */, jclass /* clazz */, jboolean enabled) {
    ALOGW("%s: Could not use IVr interface as it no longer supported", __FUNCTION__);
    return;
}

static const JNINativeMethod method_table[] = {
    { "initializeNative", "()V", (void*)init_native },
    { "setVrModeNative", "(Z)V", (void*)setVrMode_native },
};

int register_android_server_vr_VrManagerService(JNIEnv *env)
{
    return jniRegisterNativeMethods(env, "com/android/server/vr/VrManagerService",
            method_table, NELEM(method_table));
}

}; // namespace android
Loading