Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea3a566d authored by Ruchir Rastogi's avatar Ruchir Rastogi Committed by Automerger Merge Worker
Browse files

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

Change-Id: I403446a3981375a13085894d637d4d67c2c65197
parents 8c271613 b7974313

libstats/push_compat/StatsEventCompat.cpp

+1 −10
Original line number Diff line number Diff line
@@ -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;

libstats/push_compat/tests/StatsEventCompat_test.cpp

+1 −10
Original line number Diff line number Diff line
@@ -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;