Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1261476 authored by Tianjie Xu's avatar Tianjie Xu Committed by android-build-merger
Browse files

Merge "Improved wipe reason information for RecoverySystem" am: c8f59810 am: 361d3792 

am: 3c4afc34

Change-Id: I643c75d5dd066ec4e82e53b5601ecb951e5a6a34
parents 9fc40e52 3c4afc34

core/java/android/os/RecoverySystem.java

+3 −1
Original line number Diff line number Diff line
@@ -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() ;