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

Commit 2aa32299 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

Merge "Fix bug #15335840 "Safety information" search suggestion shown though... 

Merge "Fix bug #15335840 "Safety information" search suggestion shown though ..."Safety information" setting is not available in settings app" into lmp-preview-dev
parents d711b221 b2385ea4

res/xml/device_info_settings.xml

+0 −9
Original line number Diff line number Diff line
@@ -80,15 +80,6 @@ 
            <intent android:action="android.settings.SAFETY" />

        </PreferenceScreen>



        <!-- Contributors -->

        <!-- 

        <PreferenceScreen

                android:key="contributors"

                android:title="@string/contributors_title">

            <intent android:action="android.settings.TEAM" />

        </PreferenceScreen>

        -->



        <PreferenceScreen

                android:key="regulatory_info"

                android:title="@string/regulatory_information">

src/com/android/settings/DeviceInfoSettings.java

+88 −10
Original line number Diff line number Diff line
@@ -35,27 +35,30 @@ import android.os.UserManager; 
import android.preference.Preference;

import android.preference.PreferenceGroup;

import android.preference.PreferenceScreen;

import android.provider.SearchIndexableResource;

import android.provider.Settings;

import android.text.TextUtils;

import android.util.Log;

import android.widget.Toast;

import com.android.settings.search.BaseSearchIndexProvider;

import com.android.settings.search.Indexable;



import java.io.BufferedReader;

import java.io.FileReader;

import java.io.IOException;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;

import java.util.regex.Matcher;

import java.util.regex.Pattern;



public class DeviceInfoSettings extends SettingsPreferenceFragment {

public class DeviceInfoSettings extends SettingsPreferenceFragment implements Indexable {



    private static final String LOG_TAG = "DeviceInfoSettings";

    private static final String FILENAME_PROC_VERSION = "/proc/version";

    private static final String FILENAME_MSV = "/sys/board_properties/soc/msv";



    private static final String KEY_CONTAINER = "container";

    private static final String KEY_TEAM = "team";

    private static final String KEY_CONTRIBUTORS = "contributors";

    private static final String KEY_REGULATORY_INFO = "regulatory_info";

    private static final String KEY_TERMS = "terms";

    private static final String KEY_LICENSE = "license";
@@ -73,6 +76,7 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment { 
    private static final String KEY_EQUIPMENT_ID = "fcc_equipment_id";

    private static final String PROPERTY_EQUIPMENT_ID = "ro.ril.fccid";

    private static final String KEY_DEVICE_FEEDBACK = "device_feedback";

    private static final String KEY_SAFETY_LEGAL = "safetylegal";



    static final int TAPS_TO_BE_A_DEVELOPER = 7;
@@ -109,7 +113,7 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment { 
                PROPERTY_SELINUX_STATUS);



        // Remove Safety information preference if PROPERTY_URL_SAFETYLEGAL is not set

        removePreferenceIfPropertyMissing(getPreferenceScreen(), "safetylegal",

        removePreferenceIfPropertyMissing(getPreferenceScreen(), KEY_SAFETY_LEGAL,

                PROPERTY_URL_SAFETYLEGAL);



        // Remove Equipment id preference if FCC ID is not set by RIL
@@ -139,8 +143,6 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment { 
                Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);

        Utils.updatePreferenceToSpecificActivityOrRemove(act, parentPreference, KEY_COPYRIGHT,

                Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);

        Utils.updatePreferenceToSpecificActivityOrRemove(act, parentPreference, KEY_TEAM,

                Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);



        // These are contained by the root preference screen

        parentPreference = getPreferenceScreen();
@@ -152,8 +154,6 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment { 
            // Remove for secondary users

            removePreference(KEY_SYSTEM_UPDATE_SETTINGS);

        }

        Utils.updatePreferenceToSpecificActivityOrRemove(act, parentPreference, KEY_CONTRIBUTORS,

                Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY);



        // Read platform settings for additional system update setting

        removePreferenceIfBoolFalse(KEY_UPDATE_SETTING,
@@ -365,7 +365,7 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment { 
    }



    private static String getFeedbackReporterPackage(Context context) {

        String feedbackReporter =

        final String feedbackReporter =

                context.getResources().getString(R.string.oem_preferred_feedback_reporter);

        if (TextUtils.isEmpty(feedbackReporter)) {

            // Reporter not configured. Return.
@@ -373,7 +373,7 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment { 
        }

        // Additional checks to ensure the reporter is on system image, and reporter is

        // configured to listen to the intent. Otherwise, dont show the "send feedback" option.

        Intent intent = new Intent(Intent.ACTION_BUG_REPORT);

        final Intent intent = new Intent(Intent.ACTION_BUG_REPORT);



        PackageManager pm = context.getPackageManager();

        List<ResolveInfo> resolvedPackages =
@@ -398,5 +398,83 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment { 
        }

        return null;

    }



    /**

     * For Search.

     */

    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =

        new BaseSearchIndexProvider() {



            @Override

            public List<SearchIndexableResource> getXmlResourcesToIndex(

                    Context context, boolean enabled) {

                final SearchIndexableResource sir = new SearchIndexableResource(context);

                sir.xmlResId = R.xml.device_info_settings;

                return Arrays.asList(sir);

            }



            @Override

            public List<String> getNonIndexableKeys(Context context) {

                final List<String> keys = new ArrayList<String>();

                if (isPropertyMissing(PROPERTY_SELINUX_STATUS)) {

                    keys.add(KEY_SELINUX_STATUS);

                }

                if (isPropertyMissing(PROPERTY_URL_SAFETYLEGAL)) {

                    keys.add(KEY_SAFETY_LEGAL);

                }

                if (isPropertyMissing(PROPERTY_EQUIPMENT_ID)) {

                    keys.add(KEY_EQUIPMENT_ID);

                }

                // Remove Baseband version if wifi-only device

                if (Utils.isWifiOnly(context)) {

                    keys.add((KEY_BASEBAND_VERSION));

                }

                // Dont show feedback option if there is no reporter.

                if (TextUtils.isEmpty(getFeedbackReporterPackage(context))) {

                    keys.add(KEY_DEVICE_FEEDBACK);

                }

                if (!checkIntentAction(context, "android.settings.TERMS")) {

                    keys.add(KEY_TERMS);

                }

                if (!checkIntentAction(context, "android.settings.LICENSE")) {

                    keys.add(KEY_LICENSE);

                }

                if (!checkIntentAction(context, "android.settings.COPYRIGHT")) {

                    keys.add(KEY_COPYRIGHT);

                }

                if (UserHandle.myUserId() != UserHandle.USER_OWNER) {

                    keys.add(KEY_SYSTEM_UPDATE_SETTINGS);

                }

                if (!context.getResources().getBoolean(

                        R.bool.config_additional_system_update_setting_enable)) {

                    keys.add(KEY_UPDATE_SETTING);

                }

                return keys;

            }



            private boolean isPropertyMissing(String property) {

                return SystemProperties.get(property).equals("");

            }



            private boolean checkIntentAction(Context context, String action) {

                final Intent intent = new Intent(action);



                // Find the activity that is in the system image

                final PackageManager pm = context.getPackageManager();

                final List<ResolveInfo> list = pm.queryIntentActivities(intent, 0);

                final int listSize = list.size();



                for (int i = 0; i < listSize; i++) {

                    ResolveInfo resolveInfo = list.get(i);

                    if ((resolveInfo.activityInfo.applicationInfo.flags &

                            ApplicationInfo.FLAG_SYSTEM) != 0) {

                        return true;

                    }

                }



                return false;

            }

        };



}

src/com/android/settings/search/SearchIndexableResources.java

+1 −1
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ public final class SearchIndexableResources { 
        sResMap.put(DeviceInfoSettings.class.getName(),

                new SearchIndexableResource(

                        Ranking.getRankForClassName(DeviceInfoSettings.class.getName()),

                        R.xml.device_info_settings,

                        NO_DATA_RES_ID,

                        DeviceInfoSettings.class.getName(),

                        R.drawable.ic_settings_about));

    }

src/com/android/settings/search/Index.java

+2 −2

File changed.

Contains only whitespace changes.