tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use proper platform version checks (libstats)

Browse source 
Test: bit libstatspush_compat_test
Bug: 146019024
Change-Id: If99a7067944ddfbe30bb0ddfe586a337a94d4c07
This commit is contained in:
Ruchir Rastogi 2020-05-07 12:29:01 -07:00
parent 67a2bebf74
commit 4ae167e829
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;
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 =
GetProperty("ro.build.version.codename", "") == "R" ||
android_get_device_api_level() > __ANDROID_API_Q__;
android_get_device_api_level() >= __ANDROID_API_R__;
// initializations of static class variables
bool StatsEventCompat::mAttemptedLoad = false;

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

@ -21,16 +21,7 @@
using android::base::GetProperty;
/* 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 static bool mPlatformAtLeastR = GetProperty("ro.build.version.codename", "") == "R" ||
android_get_device_api_level() > __ANDROID_API_Q__;
const static bool mPlatformAtLeastR = android_get_device_api_level() >= __ANDROID_API_R__;
TEST(StatsEventCompatTest, TestDynamicLoading) {
StatsEventCompat event;