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

Commit dce3bc68 authored by Felix's avatar Felix Committed by android-build-merger
Browse files

Merge "core/Build: ro.system when comparing fingerprint" am: 82fee584 

am: 13973373

Change-Id: I3af5fa835de85906b1ab01e92856d93e82afb51c
parents a4b7bf2d 13973373

core/java/android/os/Build.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -1078,7 +1078,7 @@ public class Build { 
            return result == 0;

            return result == 0;

        }

        }





        final String system = SystemProperties.get("ro.build.fingerprint");

        final String system = SystemProperties.get("ro.system.build.fingerprint");

        final String vendor = SystemProperties.get("ro.vendor.build.fingerprint");

        final String vendor = SystemProperties.get("ro.vendor.build.fingerprint");

        final String bootimage = SystemProperties.get("ro.bootimage.build.fingerprint");

        final String bootimage = SystemProperties.get("ro.bootimage.build.fingerprint");

        final String requiredBootloader = SystemProperties.get("ro.build.expect.bootloader");

        final String requiredBootloader = SystemProperties.get("ro.build.expect.bootloader");
@@ -1087,7 +1087,7 @@ public class Build { 
        final String currentRadio = SystemProperties.get("gsm.version.baseband");

        final String currentRadio = SystemProperties.get("gsm.version.baseband");





        if (TextUtils.isEmpty(system)) {

        if (TextUtils.isEmpty(system)) {

            Slog.e(TAG, "Required ro.build.fingerprint is empty!");

            Slog.e(TAG, "Required ro.system.build.fingerprint is empty!");

            return false;

            return false;

        }

        }