summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yang Sun <sunytt@google.com> 2023-12-12 08:55:02 +0000
committer Yang Sun <sunytt@google.com> 2023-12-12 08:55:02 +0000
commit109b135211ae030e8dd19ed79090cb29e55a7636 (patch)
tree3c8d7e1d65ae3466c464ec4faf5a34a5f289d63e
parentfc3f417f346b812827c18c04f5ff7433fb0bf4e3 (diff)
Revert "Add isHidlSupported Java API"
Revert submission 2866127-HwNoService Reason for revert: DroidMonitor: Potential culprit for Bug 315883998 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted. Reverted changes: /q/submissionid:2866127-HwNoService Change-Id: I4e98dfecdc3c7f1ecd10f713f45c8245769dd03e
-rw-r--r--core/java/android/os/HidlSupport.java7
-rw-r--r--core/jni/android_os_HidlSupport.cpp8
2 files changed, 1 insertions, 14 deletions
diff --git a/core/java/android/os/HidlSupport.java b/core/java/android/os/HidlSupport.java
index 77160557f5c2..91b796aba655 100644
--- a/core/java/android/os/HidlSupport.java
+++ b/core/java/android/os/HidlSupport.java
@@ -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() {}
}
diff --git a/core/jni/android_os_HidlSupport.cpp b/core/jni/android_os_HidlSupport.cpp
index 3e51e9315d89..e3602d8f5c72 100644
--- a/core/jni/android_os_HidlSupport.cpp
+++ b/core/jni/android_os_HidlSupport.cpp
@@ -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},
+ {"getPidIfSharable", "()I", (void*)android_os_HidlSupport_getPidIfSharable},
};
const char* const kHidlSupportPathName = "android/os/HidlSupport";