ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Use proper platform version checks (libstats)" into rvc-dev

Browse source
This commit is contained in:
Ruchir Rastogi 2020-05-11 17:22:24 +00:00 • committed by Android (Google) Code Review
commit b797431342
2 changed files with 2 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libstats/push_compat/StatsEventCompat.cpp
View file

@ -28,17 +28,8 @@ using android::base::boot_clock;
using android::base::GetProperty; using android::base::GetProperty;
const static int kStatsEventTag = 1937006964; const static int kStatsEventTag = 1937006964;
/* Checking ro.build.version.release is fragile, as the release field is
* an opaque string without structural guarantees. However, testing confirms
* that on Q devices, the property is "10," and on R, it is "R." Until
* android_get_device_api_level() is updated, this is the only solution.
*
* TODO(b/146019024): migrate to android_get_device_api_level()
*/
const bool StatsEventCompat::mPlatformAtLeastR = const bool StatsEventCompat::mPlatformAtLeastR =
GetProperty("ro.build.version.codename", "") == "R" || android_get_device_api_level() >= __ANDROID_API_R__;
android_get_device_api_level() > __ANDROID_API_Q__;
// initializations of static class variables // initializations of static class variables
bool StatsEventCompat::mAttemptedLoad = false; bool StatsEventCompat::mAttemptedLoad = false;

11
libstats/push_compat/tests/StatsEventCompat_test.cpp
View file

@ -21,16 +21,7 @@
using android::base::GetProperty; using android::base::GetProperty;
/* Checking ro.build.version.release is fragile, as the release field is const static bool mPlatformAtLeastR = android_get_device_api_level() >= __ANDROID_API_R__;
* an opaque string without structural guarantees. However, testing confirms
* that on Q devices, the property is "10," and on R, it is "R." Until
* android_get_device_api_level() is updated, this is the only solution.
*
*
* TODO(b/146019024): migrate to android_get_device_api_level()
*/
const static bool mPlatformAtLeastR = GetProperty("ro.build.version.codename", "") == "R" ||
android_get_device_api_level() > __ANDROID_API_Q__;
TEST(StatsEventCompatTest, TestDynamicLoading) { TEST(StatsEventCompatTest, TestDynamicLoading) {
StatsEventCompat event; StatsEventCompat event;