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

Commit 127bfcfe authored by Jayachandran C's avatar Jayachandran C
Browse files

Remove connectivity monitor switch from developer options 

Test: Verify connectivity monitor switch is no more shown
      under developer options

Bug: 79255514
Change-Id: I755885398b92a726b0b979815c33793abe01ea66
parent d9f1e1c0

res/values/config.xml

+0 −3
Original line number Diff line number Diff line
@@ -38,9 +38,6 @@ 
    <!-- When true enable color temperature setting. -->

    <bool name="config_enableColorTemperature">false</bool>



    <!-- Whether to show Connectivity Monitor switch in Developer Options -->

    <bool name="config_show_connectivity_monitor">false</bool>



    <!-- Whether to show Camera laser sensor switch in Developer Options -->

    <bool name="config_show_camera_laser_sensor">false</bool>

res/values/strings.xml

+0 −9
Original line number Diff line number Diff line
@@ -9095,15 +9095,6 @@ 
    <!-- Toast message letting the user know the color temperature setting is not immediate -->

    <string name="color_temperature_toast">To apply color change, turn off screen</string>









    <!-- UI debug setting: title for ConnectivityMonitor switch [CHAR LIMIT=50] -->









    <string name="connectivity_monitor_switch">Connectivity Monitor</string>

















    <!-- UI debug setting: summary for switch of ConnectivityMonitor [CHAR LIMIT=500] -->









    <string name="connectivity_monitor_switch_summary">ConnectivityMonitor will collect logs when it detects a connectivity problem and prompt notification to user to file a bug</string>

















    <!-- Toast message letting the user know the how to apply connectivity monitor change -->









    <string name="connectivity_monitor_toast">To apply connectivity monitor change, reboot device</string>

















    <!-- Title for Camera laser sensor switch [CHAR LIMIT=NONE] -->









    <string name="camera_laser_sensor_switch">Camera Laser Sensor</string>

































res/xml/development_settings.xml



+0
−5






























Original line number
Diff line number
Diff line







@@ -183,11 +183,6 @@







            android:entries="@array/select_logpersist_titles"









            android:entryValues="@array/select_logpersist_values" />



















        <SwitchPreference









            android:key="connectivity_monitor_switch"









            android:title="@string/connectivity_monitor_switch"









            android:summary="@string/connectivity_monitor_switch_summary" />



















        <SwitchPreference









            android:key="camera_laser_sensor_switch"









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
































src/com/android/settings/development/ConnectivityMonitorPreferenceController.java
deleted100644 → 0



+0
−100






























Original line number
Diff line number
Diff line









/*









 * Copyright (C) 2017 The Android Open Source Project









 *









 * Licensed under the Apache License, Version 2.0 (the "License");









 * you may not use this file except in compliance with the License.









 * You may obtain a copy of the License at









 *









 *      http://www.apache.org/licenses/LICENSE-2.0









 *









 * Unless required by applicable law or agreed to in writing, software









 * distributed under the License is distributed on an "AS IS" BASIS,









 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.









 * See the License for the specific language governing permissions and









 * limitations under the License.









 */



















package com.android.settings.development;



















import android.content.Context;









import android.os.SystemProperties;









import androidx.preference.SwitchPreference;









import androidx.preference.Preference;









import android.text.TextUtils;









import android.widget.Toast;



















import com.android.internal.annotations.VisibleForTesting;









import com.android.settings.R;









import com.android.settings.core.PreferenceControllerMixin;









import com.android.settingslib.development.DeveloperOptionsPreferenceController;



















public class ConnectivityMonitorPreferenceController extends DeveloperOptionsPreferenceController









        implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {



















    private static final String KEY_CONNECTIVITY_MONITOR_SWITCH = "connectivity_monitor_switch";









    @VisibleForTesting









    static final String BUILD_TYPE = "ro.build.type";









    @VisibleForTesting









    static final String PROPERTY_CONNECTIVITY_MONITOR = "persist.radio.enable_tel_mon";



















    @VisibleForTesting









    static final String ENABLED_STATUS = "enabled";









    @VisibleForTesting









    static final String DISABLED_STATUS = "disabled";









    @VisibleForTesting









    static final String USER_ENABLED_STATUS = "user_enabled";









    @VisibleForTesting









    static final String USER_DISABLED_STATUS = "user_disabled";



















    @VisibleForTesting









    static final String USERDEBUG_BUILD = "userdebug";









    @VisibleForTesting









    static final String ENG_BUILD = "eng";



















    public ConnectivityMonitorPreferenceController(Context context) {









        super(context);









    }



















    @Override









    public String getPreferenceKey() {









        return KEY_CONNECTIVITY_MONITOR_SWITCH;









    }



















    @Override









    public boolean isAvailable() {









        final String buildType = SystemProperties.get(BUILD_TYPE);









        return mContext.getResources().getBoolean(R.bool.config_show_connectivity_monitor)









                && (TextUtils.equals(buildType, USERDEBUG_BUILD)









                || TextUtils.equals(buildType, ENG_BUILD));









    }



















    @Override









    public boolean onPreferenceChange(Preference preference, Object newValue) {









        final boolean isEnabled = (Boolean) newValue;









        SystemProperties.set(PROPERTY_CONNECTIVITY_MONITOR,









                isEnabled ? USER_ENABLED_STATUS : USER_DISABLED_STATUS);









        Toast.makeText(mContext, R.string.connectivity_monitor_toast,









                Toast.LENGTH_LONG).show();









        return true;









    }



















    @Override









    public void updateState(Preference preference) {









        final boolean enabled = isConnectivityMonitorEnabled();









        ((SwitchPreference) mPreference).setChecked(enabled);









    }



















    @Override









    protected void onDeveloperOptionsSwitchDisabled() {









        super.onDeveloperOptionsSwitchDisabled();









        SystemProperties.set(PROPERTY_CONNECTIVITY_MONITOR, USER_DISABLED_STATUS);









        ((SwitchPreference) mPreference).setChecked(false);









    }



















    private boolean isConnectivityMonitorEnabled() {









        final String cmStatus = SystemProperties.get(PROPERTY_CONNECTIVITY_MONITOR,









                DISABLED_STATUS);









        return TextUtils.equals(ENABLED_STATUS, cmStatus) || TextUtils.equals(USER_ENABLED_STATUS,









                cmStatus);









    }









}
























src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java



+0
−1






























Original line number
Diff line number
Diff line







@@ -405,7 +405,6 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra







        controllers.add(new VerifyAppsOverUsbPreferenceController(context));









        controllers.add(new LogdSizePreferenceController(context));









        controllers.add(new LogPersistPreferenceController(context, fragment, lifecycle));









        controllers.add(new ConnectivityMonitorPreferenceController(context));









        controllers.add(new CameraLaserSensorPreferenceController(context));









        controllers.add(new LogicalCameraDefaultPreferenceController(context));









        controllers.add(new WifiDisplayCertificationPreferenceController(context));