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

Commit 774f972f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Settings: Add Meta Info in Developer Options Panel"

parents 0d71ccae 3862f561

res/values-zh-rCN/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -2755,4 +2755,5 @@ 
    <string name="imei_information_title" msgid="8499085421609752290">"IMEI信息"</string>

    <string name="imei_information_summary" msgid="2074095606556565233">"IMEI相关信息"</string>

    <string name="slot_number" msgid="3762676044904653577">"（插槽<xliff:g id="SLOT_NUM">%1$d</xliff:g>）"</string>

    <string name="meta_info">软件版本</string>

</resources>

res/values/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -6346,4 +6346,5 @@ 
   <string name="imei_information_summary">IMEI relative information</string>

   <string name="slot_number">(Slot<xliff:g id="slot_num">%1$d</xliff:g>)</string>



    <string name="meta_info">Software version</string>

</resources>

res/xml/development_prefs.xml

+4 −0
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ 


<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"

        android:title="@string/development_settings_title">

    <!-- Meta Info -->

    <Preference android:key="meta_info"

        android:title="@string/meta_info" />



    <com.android.settings.BugreportPreference

            android:key="bugreport"

            android:title="@*android:string/bugreport_title"

src/com/android/settings/DevelopmentSettings.java

+23 −2
Original line number Diff line number Diff line
@@ -75,6 +75,9 @@ import com.android.settings.search.Index; 
import com.android.settings.search.Indexable;

import com.android.settings.widget.SwitchBar;



import java.io.BufferedReader;

import java.io.FileReader;

import java.io.IOException;

import java.security.SecureRandom;

import java.security.NoSuchAlgorithmException;

import java.security.InvalidKeyException;
@@ -82,6 +85,7 @@ import java.util.ArrayList; 
import java.util.Arrays;

import java.util.HashSet;

import java.util.List;



import javax.crypto.BadPaddingException;

import javax.crypto.Cipher;

import javax.crypto.IllegalBlockSizeException;
@@ -163,7 +167,8 @@ public class DevelopmentSettings extends SettingsPreferenceFragment 
    private static final String SELECT_LOGD_SIZE_KEY = "select_logd_size";

    private static final String SELECT_LOGD_SIZE_PROPERTY = "persist.logd.size";

    private static final String SELECT_LOGD_DEFAULT_SIZE_PROPERTY = "ro.logd.size";



    private static final String FILENAME_META_VERSION = "/firmware/verinfo/ver_info.txt";

    private static final String KEY_META_VERSION = "meta_info";

    private static final String OPENGL_TRACES_KEY = "enable_opengl_traces";



    private static final String IMMEDIATELY_DESTROY_ACTIVITIES_KEY
@@ -305,7 +310,13 @@ public class DevelopmentSettings extends SettingsPreferenceFragment 


        final PreferenceGroup debugDebuggingCategory = (PreferenceGroup)

                findPreference(DEBUG_DEBUGGING_CATEGORY_KEY);



        Preference metaInfo = findPreference(KEY_META_VERSION);

        try {

            String meta = readLine(FILENAME_META_VERSION);

            metaInfo.setSummary(meta);

        } catch (IOException e) {

            Log.e(TAG, "IO Exception when getting meta version for Device Info screen", e);

        }

        mEnableAdb = findAndInitSwitchPref(ENABLE_ADB);

        mClearAdbKeys = findPreference(CLEAR_ADB_KEYS);

        if (!SystemProperties.getBoolean("ro.adb.secure", false)) {
@@ -406,6 +417,16 @@ public class DevelopmentSettings extends SettingsPreferenceFragment 
        mAllPrefs.add(mProcessStats);



    }



    private static String readLine(String filename) throws IOException {

        BufferedReader reader = new BufferedReader(new FileReader(filename), 256);

        try {

            return reader.readLine();

        } finally {

            reader.close();

        }

    }



    private SwitchPreference findAndInitCheckboxPref(String key) {

                SwitchPreference pref = (SwitchPreference) findPreference(key);

        if (pref == null) {