commit 3c4afc34eec61f4ab097a628419093dadb87bc47
author Tianjie Xu <xunchang@google.com> Wed Feb 13 11:55:34 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Feb 13 11:55:34 2019 -0800
tree 2f3bbd79b3023a4782574cdbb537ecbd61a72d4e
parent ceba42dca983e79b1a1255e78e51a3d85d3b8f9e
parent 361d379280010976ff1d4df58ac8f317f28299c0

Merge "Improved wipe reason information for RecoverySystem" am: c8f5981028
am: 361d379280

Change-Id: I224a98abd065bf5437d4a2ea242f146e91740ef1

core/java/android/os/RecoverySystem.java

diff --git a/core/java/android/os/RecoverySystem.java b/core/java/android/os/RecoverySystem.java
index 8492b0c..3ee54ce 100644
--- a/core/java/android/os/RecoverySystem.java
+++ b/core/java/android/os/RecoverySystem.java
@@ -32,6 +32,7 @@
 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 @@
 
         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() ;