38a28603fd
This reverts commit 6e4d7e606c4327eaa9298193e22794fcb9b30218. Reason for revert: Still breaks downstream build (though in a different way this time) Original change's description: > Reland "Delete old Android ADM." > > This is a reland of commit 4ec3e9c98873520b3171d40ab0426b2f05edbbd2 > > Original change's description: > > Delete old Android ADM. > > > > The schedule move Android ADM code to sdk directory have been around > > for several years, but the old code still not delete. > > > > Bug: webrtc:7452 > > Change-Id: I0f75c680f71f0b2ce614de6cbd9f124c2a59d453 > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/264620 > > Reviewed-by: Magnus Jedvert <magjed@webrtc.org> > > Commit-Queue: Henrik Andreassson <henrika@webrtc.org> > > Reviewed-by: Henrik Andreassson <henrika@webrtc.org> > > Cr-Commit-Position: refs/heads/main@{#37174} > > Bug: webrtc:7452 > Change-Id: Icabad23e72c8258a854b7809a93811161517266c > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/265872 > Reviewed-by: Henrik Andreassson <henrika@webrtc.org> > Commit-Queue: Björn Terelius <terelius@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#37236} Bug: webrtc:7452 Change-Id: Ide8fbd55fadd7aed9989053afff7c63c04f1320f No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/266023 Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Commit-Queue: Björn Terelius <terelius@webrtc.org> Owners-Override: Björn Terelius <terelius@webrtc.org> Cr-Commit-Position: refs/heads/main@{#37242}
60 lines
1.8 KiB
C++
60 lines
1.8 KiB
C++
/*
|
|
* Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "modules/audio_device/android/build_info.h"
|
|
|
|
#include "modules/utility/include/helpers_android.h"
|
|
|
|
namespace webrtc {
|
|
|
|
BuildInfo::BuildInfo()
|
|
: j_environment_(JVM::GetInstance()->environment()),
|
|
j_build_info_(
|
|
JVM::GetInstance()->GetClass("org/webrtc/voiceengine/BuildInfo")) {}
|
|
|
|
std::string BuildInfo::GetStringFromJava(const char* name) {
|
|
jmethodID id = j_build_info_.GetStaticMethodId(name, "()Ljava/lang/String;");
|
|
jstring j_string =
|
|
static_cast<jstring>(j_build_info_.CallStaticObjectMethod(id));
|
|
return j_environment_->JavaToStdString(j_string);
|
|
}
|
|
|
|
std::string BuildInfo::GetDeviceModel() {
|
|
return GetStringFromJava("getDeviceModel");
|
|
}
|
|
|
|
std::string BuildInfo::GetBrand() {
|
|
return GetStringFromJava("getBrand");
|
|
}
|
|
|
|
std::string BuildInfo::GetDeviceManufacturer() {
|
|
return GetStringFromJava("getDeviceManufacturer");
|
|
}
|
|
|
|
std::string BuildInfo::GetAndroidBuildId() {
|
|
return GetStringFromJava("getAndroidBuildId");
|
|
}
|
|
|
|
std::string BuildInfo::GetBuildType() {
|
|
return GetStringFromJava("getBuildType");
|
|
}
|
|
|
|
std::string BuildInfo::GetBuildRelease() {
|
|
return GetStringFromJava("getBuildRelease");
|
|
}
|
|
|
|
SdkCode BuildInfo::GetSdkVersion() {
|
|
jmethodID id = j_build_info_.GetStaticMethodId("getSdkVersion", "()I");
|
|
jint j_version = j_build_info_.CallStaticIntMethod(id);
|
|
return static_cast<SdkCode>(j_version);
|
|
}
|
|
|
|
} // namespace webrtc
|