summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorTianjie Xu <xunchang@google.com>2019-02-13 19:18:01 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-02-13 19:18:01 +0000
commitc8f5981028c12747f92daefe7d4404884b2a0159 (patch)
treef30d499a04712e58591e80e0f76169579a338bbb /core/java/android
parent627900696f8033897af041069ece9c497cd525b3 (diff)
parent3835f6a4f9e7a52401cf3de49a6ddef8fd04e8c5 (diff)
Merge "Improved wipe reason information for RecoverySystem"
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/os/RecoverySystem.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/os/RecoverySystem.java b/core/java/android/os/RecoverySystem.java
index 8492b0cf58e2..3ee54ceebaa9 100644
--- a/core/java/android/os/RecoverySystem.java
+++ b/core/java/android/os/RecoverySystem.java
@@ -32,6 +32,7 @@ import android.content.pm.PackageManager;
import android.provider.Settings;
import android.telephony.euicc.EuiccManager;
import android.text.TextUtils;
+import android.text.format.DateFormat;
import android.util.Log;
import android.view.Display;
import android.view.WindowManager;
@@ -762,7 +763,8 @@ public class RecoverySystem {
String reasonArg = null;
if (!TextUtils.isEmpty(reason)) {
- reasonArg = "--reason=" + sanitizeArg(reason);
+ String timeStamp = DateFormat.format("yyyy-MM-ddTHH:mm:ssZ", System.currentTimeMillis()).toString();
+ reasonArg = "--reason=" + sanitizeArg(reason + "," + timeStamp);
}
final String localeArg = "--locale=" + Locale.getDefault().toLanguageTag() ;