Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am a5705a4a: Merge "[partition checking] re-enable bootimage/bootloader, add recovery" into mnc-dev

Browse Source 
* commit 'a5705a4ada8e719ebf73ed757c514b74785e7ae3':
  [partition checking] re-enable bootimage/bootloader, add recovery
This commit is contained in:
Andres Morales
2015-05-29 02:22:33 +00:00
committed by Android Git Automerger
parent 98e8890022 a5705a4ada
commit 8d61ab0003
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/os/Build.java
View File

@@ -685,6 +685,8 @@ public class Build {
final String bootimage = SystemProperties.get("ro.bootimage.build.fingerprint");
final String requiredBootloader = SystemProperties.get("ro.build.expect.bootloader");
final String currentBootloader = SystemProperties.get("ro.bootloader");
final String requiredRecovery = SystemProperties.get("ro.expect.recovery_id");
final String currentRecovery = SystemProperties.get("ro.recovery_id");
final String requiredRadio = SystemProperties.get("ro.build.expect.baseband");
final String currentRadio = SystemProperties.get("gsm.version.baseband");
@@ -701,7 +703,6 @@ public class Build {
}
}
/* TODO: Figure out issue with checks failing
if (!TextUtils.isEmpty(bootimage)) {
if (!Objects.equals(system, bootimage)) {
Slog.e(TAG, "Mismatched fingerprints; system reported " + system
@@ -718,6 +719,15 @@ public class Build {
}
}
if (!TextUtils.isEmpty(requiredRecovery)) {
if (!Objects.equals(currentRecovery, requiredRecovery)) {
Slog.e(TAG, "Mismatched recovery version: build requires " + requiredRecovery
+ " but runtime reports " + currentRecovery);
return false;
}
}
/* TODO: uncomment when new bootloader lands b/20860620
if (!TextUtils.isEmpty(requiredRadio)) {
if (!Objects.equals(currentRadio, requiredRadio)) {
Slog.e(TAG, "Mismatched radio version: build requires " + requiredRadio