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

Merge "pass --locale argument to recovery" into jb-mr1-dev

Browse Source
This commit is contained in:
Doug Zongker
2012-08-23 13:17:25 -07:00
committed by Android (Google) Code Review
parent bb121d569c e33b4007ee
commit d8b6fa2931
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,6 +40,7 @@ import java.util.Enumeration;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
import java.util.zip.ZipFile; import java.util.zip.ZipFile;
@@ -326,7 +327,8 @@ public class RecoverySystem {
throws IOException { throws IOException {
String filename = packageFile.getCanonicalPath(); String filename = packageFile.getCanonicalPath();
Log.w(TAG, "!!! REBOOTING TO INSTALL " + filename + " !!!"); Log.w(TAG, "!!! REBOOTING TO INSTALL " + filename + " !!!");
String arg = "--update_package=" + filename; String arg = "--update_package=" + filename +
"\n--locale=" + Locale.getDefault().toString();
bootCommand(context, arg); bootCommand(context, arg);
} }
@@ -357,7 +359,7 @@ public class RecoverySystem {
// Block until the ordered broadcast has completed. // Block until the ordered broadcast has completed.
condition.block(); condition.block();
bootCommand(context, "--wipe_data"); bootCommand(context, "--wipe_data\n--locale=" + Locale.getDefault().toString());
} }
/** /**
@@ -365,7 +367,7 @@ public class RecoverySystem {
* @throws IOException if something goes wrong. * @throws IOException if something goes wrong.
*/ */
public static void rebootWipeCache(Context context) throws IOException { public static void rebootWipeCache(Context context) throws IOException {
bootCommand(context, "--wipe_cache"); bootCommand(context, "--wipe_cache\n--locale=" + Locale.getDefault().toString());
} }
/** /**