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

Commit 9c476c5b authored by Devin Moore's avatar Devin Moore Committed by Automerger Merge Worker
Browse files

Merge changes from topic "revert-2866127-HwNoService-EIABNUAXKH" into main am: a0c16dc1 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2870060



Change-Id: I2fe5182ffdb066bf6f7928d11bdc827234cb0f04
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 422e3933 a0c16dc1

core/java/android/os/HidlSupport.java

+0 −7
Original line number Diff line number Diff line
@@ -218,13 +218,6 @@ public class HidlSupport { 
    @SystemApi

    public static native int getPidIfSharable();



    /**

     * Return true if HIDL is supported on this device and false if not.

     *

     * @hide

     */

    public static native boolean isHidlSupported();



    /** @hide */

    public HidlSupport() {}

}

core/java/android/os/HwBinder.java

+0 −12
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package android.os; 


import android.annotation.SystemApi;

import android.compat.annotation.UnsupportedAppUsage;

import android.util.Log;



import libcore.util.NativeAllocationRegistry;
@@ -79,17 +78,6 @@ public abstract class HwBinder implements IHwBinder { 
            String iface,

            String serviceName)

        throws RemoteException, NoSuchElementException {

        if (!HidlSupport.isHidlSupported()

                && (iface.equals("android.hidl.manager@1.0::IServiceManager")

                        || iface.equals("android.hidl.manager@1.1::IServiceManager")

                        || iface.equals("android.hidl.manager@1.2::IServiceManager"))) {

            Log.i(

                    TAG,

                    "Replacing Java hwservicemanager with a fake HwNoService"

                            + " because HIDL is not supported on this device.");

            return new HwNoService();

        }



        return getService(iface, serviceName, false /* retry */);

    }

    /**

core/java/android/os/HwNoService.java

deleted100644 → 0
+0 −52
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 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.os;



/**

 * A fake hwservicemanager that is used locally when HIDL isn't supported on the device.

 *

 * @hide

 */

final class HwNoService implements IHwBinder, IHwInterface {

    /** @hide */

    @Override

    public void transact(int code, HwParcel request, HwParcel reply, int flags) {}



    /** @hide */

    @Override

    public IHwInterface queryLocalInterface(String descriptor) {

        return new HwNoService();

    }



    /** @hide */

    @Override

    public boolean linkToDeath(DeathRecipient recipient, long cookie) {

        return true;

    }



    /** @hide */

    @Override

    public boolean unlinkToDeath(DeathRecipient recipient) {

        return true;

    }



    /** @hide */

    @Override

    public IHwBinder asBinder() {

        return this;

    }

}

core/jni/android_os_HidlSupport.cpp

+1 −7
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
 */



#include <hidl/HidlTransportSupport.h>

#include <hidl/ServiceManagement.h>

#include <nativehelper/JNIHelp.h>



#include "core_jni_helpers.h"
@@ -25,13 +24,8 @@ static jint android_os_HidlSupport_getPidIfSharable(JNIEnv*, jclass) { 
    return android::hardware::details::getPidIfSharable();

}



static jboolean android_os_HidlSupport_isHidlSupported(JNIEnv*, jclass) {

    return android::hardware::isHidlSupported();

}



static const JNINativeMethod gHidlSupportMethods[] = {

    {"getPidIfSharable", "()I", (void*)android_os_HidlSupport_getPidIfSharable},

        {"isHidlSupported", "()Z", (void*)android_os_HidlSupport_isHidlSupported},

};



const char* const kHidlSupportPathName = "android/os/HidlSupport";