From 38715228da99594ba30dc0c3f3901a648d64cdff Mon Sep 17 00:00:00 2001 From: Tianjie Xu Date: Wed, 22 Mar 2017 12:00:16 -0700 Subject: improve the format of locale argument when calling recovery Switch the locale argument from Locale.toString() to Locale.toLanguageTag(). The new format is more readable and less error prone. Bug: 35215015 Test: recovery processes sr-Latn correctly Change-Id: I47e1cf54434cb841652d4b259e0e829104fb19a2 --- core/java/android/os/RecoverySystem.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'core/java/android/os/RecoverySystem.java') diff --git a/core/java/android/os/RecoverySystem.java b/core/java/android/os/RecoverySystem.java index d48431afe691..3ac6019dcb47 100644 --- a/core/java/android/os/RecoverySystem.java +++ b/core/java/android/os/RecoverySystem.java @@ -483,7 +483,7 @@ public class RecoverySystem { } final String filenameArg = "--update_package=" + filename + "\n"; - final String localeArg = "--locale=" + Locale.getDefault().toString() + "\n"; + final String localeArg = "--locale=" + Locale.getDefault().toLanguageTag() + "\n"; final String securityArg = "--security\n"; String command = filenameArg + localeArg; @@ -531,7 +531,7 @@ public class RecoverySystem { } final String filenameArg = "--update_package=" + filename + "\n"; - final String localeArg = "--locale=" + Locale.getDefault().toString() + "\n"; + final String localeArg = "--locale=" + Locale.getDefault().toLanguageTag() + "\n"; final String securityArg = "--security\n"; String command = filenameArg + localeArg; @@ -646,7 +646,7 @@ public class RecoverySystem { reasonArg = "--reason=" + sanitizeArg(reason); } - final String localeArg = "--locale=" + Locale.getDefault().toString(); + final String localeArg = "--locale=" + Locale.getDefault().toLanguageTag() ; bootCommand(context, shutdownArg, "--wipe_data", reasonArg, localeArg); } @@ -665,7 +665,7 @@ public class RecoverySystem { reasonArg = "--reason=" + sanitizeArg(reason); } - final String localeArg = "--locale=" + Locale.getDefault().toString(); + final String localeArg = "--locale=" + Locale.getDefault().toLanguageTag() ; bootCommand(context, "--wipe_cache", reasonArg, localeArg); } @@ -690,7 +690,7 @@ public class RecoverySystem { final String filename = packageFile.getCanonicalPath(); final String filenameArg = "--wipe_package=" + filename; - final String localeArg = "--locale=" + Locale.getDefault().toString(); + final String localeArg = "--locale=" + Locale.getDefault().toLanguageTag() ; bootCommand(context, "--wipe_ab", filenameArg, reasonArg, localeArg); } -- cgit v1.2.3