mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 22:00:47 +01:00
7534ebd2bf
This reverts commitdb30009304. Reason for revert: ... and it's out again :( Original change's description: > Reland "Reland "Delete old Android ADM."" > > This reverts commit38a28603fd. > > Reason for revert: Attempt to reland, now that WebRTC dependency cycle has been broken. > > Original change's description: > > Revert "Reland "Delete old Android ADM."" > > > > This reverts commit6e4d7e606c. > > > > 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 commit4ec3e9c988> > > > > > 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} > > Bug: webrtc:7452 > Change-Id: I6946d0fc28cf4c08387e451e6a07765f7410ce7c > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/266980 > Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> > Reviewed-by: Henrik Andreassson <henrika@webrtc.org> > Commit-Queue: Björn Terelius <terelius@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#37356} Bug: webrtc:7452 Change-Id: I1ef4004e89c8bea322bda0dc697a7ba45abeffcc No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/267067 Owners-Override: Björn Terelius <terelius@webrtc.org> Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Commit-Queue: Björn Terelius <terelius@webrtc.org> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/main@{#37359}
59 lines
1.8 KiB
C++
59 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
|