PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 435d6f2e: am b20e1b6c: am c9d5bfcb: am 5d187aa4: am ffe701dc: Present the security patch date in a human-friendly format

Browse Source 
* commit '435d6f2ea0572a90c90096a71529a02b2e2c9aaa':
  Present the security patch date in a human-friendly format
This commit is contained in:
Christopher Tate
2015-08-22 01:38:14 +00:00
committed by Android Git Automerger
parent 494bcecba5 435d6f2ea0
commit 51b3b8a20e
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/DeviceInfoSettings.java
View File

@@ -37,8 +37,10 @@ import android.provider.SearchIndexableResource;
import android.provider.Settings; import android.provider.Settings;
import android.telephony.CarrierConfigManager; import android.telephony.CarrierConfigManager;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.format.DateFormat;
import android.util.Log; import android.util.Log;
import android.widget.Toast; import android.widget.Toast;
import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.MetricsLogger;
import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Index; import com.android.settings.search.Index;
@@ -47,9 +49,13 @@ import com.android.settings.search.Indexable;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.FileReader; import java.io.FileReader;
import java.io.IOException; import java.io.IOException;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
@@ -105,6 +111,14 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In
findPreference(KEY_FIRMWARE_VERSION).setEnabled(true); findPreference(KEY_FIRMWARE_VERSION).setEnabled(true);
String patch = Build.VERSION.SECURITY_PATCH; String patch = Build.VERSION.SECURITY_PATCH;
if (!"".equals(patch)) { if (!"".equals(patch)) {
try {
SimpleDateFormat template = new SimpleDateFormat("yyyy-MM-dd");
Date patchDate = template.parse(patch);
String format = DateFormat.getBestDateTimePattern(Locale.getDefault(), "dMMMMyyyy");
patch = DateFormat.format(format, patchDate).toString();
} catch (ParseException e) {
// broken parse; fall through and use the raw string
}
setStringSummary(KEY_SECURITY_PATCH, patch); setStringSummary(KEY_SECURITY_PATCH, patch);
} else { } else {
getPreferenceScreen().removePreference(findPreference(KEY_SECURITY_PATCH)); getPreferenceScreen().removePreference(findPreference(KEY_SECURITY_PATCH));