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

Merge "Set security update label in framework" into nyc-dev

Browse Source
This commit is contained in:
Tianjie Xu
2016-05-02 17:38:50 +00:00
committed by Android (Google) Code Review
parent 5b7a097b22 ac75f1effa
commit 8ebedfd0d9
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/java/android/os/RecoverySystem.java
View File

@@ -434,6 +434,9 @@ public class RecoverySystem {
String filename = packageFile.getCanonicalPath(); String filename = packageFile.getCanonicalPath();
Log.w(TAG, "!!! REBOOTING TO INSTALL " + filename + " !!!"); Log.w(TAG, "!!! REBOOTING TO INSTALL " + filename + " !!!");
// If the package name ends with "_s.zip", it's a security update.
boolean securityUpdate = filename.endsWith("_s.zip");
// If the package is on the /data partition, the package needs to // If the package is on the /data partition, the package needs to
// be processed (i.e. uncrypt'd). The caller specifies if that has // be processed (i.e. uncrypt'd). The caller specifies if that has
// been done in 'processed' parameter. // been done in 'processed' parameter.
@@ -468,7 +471,12 @@ public class RecoverySystem {
final String filenameArg = "--update_package=" + filename + "\n"; final String filenameArg = "--update_package=" + filename + "\n";
final String localeArg = "--locale=" + Locale.getDefault().toString() + "\n"; final String localeArg = "--locale=" + Locale.getDefault().toString() + "\n";
final String command = filenameArg + localeArg; final String securityArg = "--security\n";
String command = filenameArg + localeArg;
if (securityUpdate) {
command += securityArg;
}
RecoverySystem rs = (RecoverySystem) context.getSystemService( RecoverySystem rs = (RecoverySystem) context.getSystemService(
Context.RECOVERY_SERVICE); Context.RECOVERY_SERVICE);
@@ -501,6 +509,7 @@ public class RecoverySystem {
public static void scheduleUpdateOnBoot(Context context, File packageFile) public static void scheduleUpdateOnBoot(Context context, File packageFile)
throws IOException { throws IOException {
String filename = packageFile.getCanonicalPath(); String filename = packageFile.getCanonicalPath();
boolean securityUpdate = filename.endsWith("_s.zip");
// If the package is on the /data partition, use the block map file as // If the package is on the /data partition, use the block map file as
// the package name instead. // the package name instead.
@@ -510,7 +519,12 @@ public class RecoverySystem {
final String filenameArg = "--update_package=" + filename + "\n"; final String filenameArg = "--update_package=" + filename + "\n";
final String localeArg = "--locale=" + Locale.getDefault().toString() + "\n"; final String localeArg = "--locale=" + Locale.getDefault().toString() + "\n";
final String command = filenameArg + localeArg; final String securityArg = "--security\n";
String command = filenameArg + localeArg;
if (securityUpdate) {
command += securityArg;
}
RecoverySystem rs = (RecoverySystem) context.getSystemService(Context.RECOVERY_SERVICE); RecoverySystem rs = (RecoverySystem) context.getSystemService(Context.RECOVERY_SERVICE);
if (!rs.setupBcb(command)) { if (!rs.setupBcb(command)) {