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

Commit 308b1d2c authored by Brint E. Kriebel's avatar Brint E. Kriebel Committed by LuK1337
Browse files

development: Add setting for updating recovery 

When enabled, the recovery of the device will be updated with the
version of the installed system.

This squashes the following commits from cm-13.0:
c5a41263 development: Add setting for updating recovery
4a78446c DevelopmentSettings: Add an opt-out for recovery updater

Change-Id: I519905341b9cba9c2ab09f5d9c6e88f4025a73a7
parent a4819446

res/values/cm_strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -141,4 +141,10 @@ 
    <!-- Touchscreen hovering -->

    <string name="touchscreen_hovering_title">Touchscreen hovering</string>

    <string name="touchscreen_hovering_summary">Allows you to hover the screen like a mouse in web browsers, remote desktops, etc</string>



    <!-- Update recovery -->

    <string name="update_recovery_title">Update recovery</string>

    <string name="update_recovery_summary">Update the built-in recovery with system updates</string>

    <string name="update_recovery_on_warning">NOTICE: When this feature is enabled, your installed recovery will be replaced by one included with the current version of the running OS.\n\nYour recovery will be updated along with upgrades to your system, helping to ensure compatibility with future versions.\n\nWould you like to enable this feature?</string>

    <string name="update_recovery_off_warning">WARNING: When this feature is disabled, your installed recovery will not be updated with OS upgrades.\n\nFuture OS updates may not install with outdated or custom recovery versions.\n\nDo you really want to disable this feature?</string>

</resources>

res/xml/development_settings.xml

+5 −0
Original line number Diff line number Diff line
@@ -136,6 +136,11 @@ 
        android:key="security_setting_trust_lost_locks_screen"

        android:title="@string/trust_lost_locks_screen_title"

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



    <SwitchPreference

        android:key="update_recovery"

        android:title="@string/update_recovery_title"

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

    </PreferenceCategory>



    <PreferenceCategory

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

+16 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ import java.util.List; 
public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFragment

        implements SwitchBar.OnSwitchChangeListener, OemUnlockDialogHost, AdbDialogHost,

        WirelessAdbDialogHost, AdbClearKeysDialogHost, LogPersistDialogHost,

        UpdateRecoveryDialogHost,

        BluetoothA2dpHwOffloadRebootDialog.OnA2dpHwDialogConfirmedListener {



    private static final String TAG = "DevSettingsDashboard";
@@ -299,6 +300,20 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra 
        controller.onDisableLogPersistDialogRejected();

    }



    @Override

    public void onUpdateRecoveryDialogConfirmed() {

        final UpdateRecoveryPreferenceController controller = getDevelopmentOptionsController(

                UpdateRecoveryPreferenceController.class);

        controller.onUpdateRecoveryDialogConfirmed();

    }



    @Override

    public void onUpdateRecoveryDialogDismissed() {

        final UpdateRecoveryPreferenceController controller = getDevelopmentOptionsController(

                UpdateRecoveryPreferenceController.class);

        controller.onUpdateRecoveryDialogDismissed();

    }



    @Override

    public void onA2dpHwDialogConfirmed() {

        final BluetoothA2dpHwOffloadPreferenceController controller =
@@ -433,6 +448,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra 
        controllers.add(new AdbRootPreferenceController(context, fragment));

        controllers.add(new WirelessAdbPreferenceController(context, fragment));

        controllers.add(new ClearAdbKeysPreferenceController(context, fragment));

        controllers.add(new UpdateRecoveryPreferenceController(context, fragment));

        controllers.add(new LocalTerminalPreferenceController(context));

        controllers.add(new BugReportInPowerPreferenceController(context));

        controllers.add(new AutomaticSystemServerHeapDumpPreferenceController(context));

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

0 → 100644
+33 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 The LineageOS 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;



/**

 * Interface for UpdateRecoveryWarningDialogFragment callbacks.

 */

public interface UpdateRecoveryDialogHost {



    /**

     * Called when the user presses ok on the warning dialog.

     */

    void onUpdateRecoveryDialogConfirmed();



    /**

     * Called when the user dismisses or cancels the warning dialog.

     */

    void onUpdateRecoveryDialogDismissed();

}

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

0 → 100644
+111 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2020 The LineageOS 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 android.os.UserManager;

import android.text.TextUtils;



import androidx.annotation.VisibleForTesting;

import androidx.preference.Preference;

import androidx.preference.PreferenceScreen;

import androidx.preference.SwitchPreference;



import com.android.settings.R;

import com.android.settings.Utils;

import com.android.settings.core.PreferenceControllerMixin;

import com.android.settingslib.development.DeveloperOptionsPreferenceController;



import java.io.File;



public class UpdateRecoveryPreferenceController extends DeveloperOptionsPreferenceController

        implements PreferenceControllerMixin {



    private static final String TAG = "UpdateRecoveryPreferenceController";

    private static final String PREF_KEY = "update_recovery";



    private static final String UPDATE_RECOVERY_EXEC = "/system/bin/install-recovery.sh";

    private static final String UPDATE_RECOVERY_PROPERTY = "persist.sys.recovery_update";



    private final DevelopmentSettingsDashboardFragment mFragment;



    public UpdateRecoveryPreferenceController(Context context,

            DevelopmentSettingsDashboardFragment fragment) {

        super(context);



        mFragment = fragment;

    }



    @Override

    public boolean isAvailable() {

        return new File(UPDATE_RECOVERY_EXEC).exists();

    }



    @Override

    public String getPreferenceKey() {

        return PREF_KEY;

    }



    @Override

    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);



        boolean enabled = SystemProperties.getBoolean(UPDATE_RECOVERY_PROPERTY, false);

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



        if (!isAdminUser()) {

            mPreference.setEnabled(false);

        }

    }



    @Override

    public boolean handlePreferenceTreeClick(Preference preference) {

        if (Utils.isMonkeyRunning()) {

            return false;

        }



        if (TextUtils.equals(preference.getKey(), getPreferenceKey())) {

            UpdateRecoveryWarningDialog.show(mFragment);

            return true;

        }

        return false;

    }



    @Override

    protected void onDeveloperOptionsSwitchEnabled() {

        if (isAdminUser()) {

            mPreference.setEnabled(true);

        }

    }



    public void onUpdateRecoveryDialogConfirmed() {

        boolean enabled = SystemProperties.getBoolean(UPDATE_RECOVERY_PROPERTY, false);

        SystemProperties.set(UPDATE_RECOVERY_PROPERTY, String.valueOf(!enabled));

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

    }



    public void onUpdateRecoveryDialogDismissed() {

        boolean enabled = SystemProperties.getBoolean(UPDATE_RECOVERY_PROPERTY, false);

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

    }



    @VisibleForTesting

    boolean isAdminUser() {

        return ((UserManager) mContext.getSystemService(Context.USER_SERVICE)).isAdminUser();

    }

}