Skip to content

Commit

Permalink
fix vendor image mismatch Thx Myself5
Browse files Browse the repository at this point in the history
  • Loading branch information
munchycool committed Apr 27, 2018
1 parent 76ef8b0 commit 4256c66
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions core/java/android/os/Build.java
Expand Up @@ -875,9 +875,12 @@ public static void ensureFingerprintProperty() {
*
* @hide
*/
public static final boolean IS_TREBLE_ENABLED =
/** Getting a warning in RR of vendor image mismatch on bootup. Vendor Image and Build
keys in sync. removing commented piece of code to fix it
*/
/** public static final boolean IS_TREBLE_ENABLED =
SystemProperties.getBoolean("ro.treble.enabled", false);

*/
/**
* Verifies the current flash of the device is consistent with what
* was expected at build time.
Expand All @@ -894,7 +897,7 @@ public static void ensureFingerprintProperty() {
public static boolean isBuildConsistent() {
// Don't care on eng builds. Incremental build may trigger false negative.
if (IS_ENG) return true;

/**
if (IS_TREBLE_ENABLED) {
int result = VintfObject.verify(new String[0]);
Expand All @@ -905,7 +908,7 @@ public static boolean isBuildConsistent() {
return result == 0;
}

*/
final String system = SystemProperties.get("ro.build.fingerprint");
final String vendor = SystemProperties.get("ro.vendor.build.fingerprint");
final String bootimage = SystemProperties.get("ro.bootimage.build.fingerprint");
Expand Down

0 comments on commit 4256c66

Please sign in to comment.