Revert "Revert "Create a HwNoService class that fakes hwservicem..."

Revert submission 2870060-revert-2866127-HwNoService-EIABNUAXKH

Reason for revert: Fixed robolectric tests with aosp/2874076

Reverted changes: /q/submissionid:2870060-revert-2866127-HwNoService-EIABNUAXKH

Change-Id: I0228877982f55ed8f53f5770ee43de7fad14922f
This commit is contained in:
Devin Moore 2023-12-13 18:51:12 +00:00
parent b480dead6a
commit 25cbbbc925
2 changed files with 64 additions and 0 deletions

View File

@ -18,6 +18,7 @@ package android.os;
import android.annotation.SystemApi;
import android.compat.annotation.UnsupportedAppUsage;
import android.util.Log;
import libcore.util.NativeAllocationRegistry;
@ -78,6 +79,17 @@ 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 */);
}
/**

View File

@ -0,0 +1,52 @@
/*
* 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;
}
}