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

Commit 005ee976 authored by Jaewan Kim's avatar Jaewan Kim Committed by Gerrit Code Review
Browse files

Merge "Clear Linux terminal app when disabled" into main

parents 9089bca7 ea0b5d59

res/xml/linux_terminal_settings.xml

+6 −0
Original line number Diff line number Diff line
@@ -24,4 +24,10 @@ 
        android:title="@string/enable_linux_terminal_summary"

        settings:controller="com.android.settings.development.linuxterminal.EnableLinuxTerminalPreferenceController" />



    <com.android.settingslib.widget.FooterPreference

        android:key="disable_linux_terminal_footer"

        android:title="@string/disable_linux_terminal_disclaimer"

        android:selectable="false"

        settings:searchable="false"/>



</PreferenceScreen>

src/com/android/settings/development/linuxterminal/EnableLinuxTerminalPreferenceController.java

+4 −0
Original line number Diff line number Diff line
@@ -95,6 +95,10 @@ public class EnableLinuxTerminalPreferenceController extends BasePreferenceContr 
                        ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED

                        : PackageManager.COMPONENT_ENABLED_STATE_DEFAULT;

        mPackageManager.setApplicationEnabledSetting(mTerminalPackageName, state, /* flags= */ 0);

        if (!isChecked) {

            mPackageManager.clearApplicationUserData(

                    mTerminalPackageName, /* observer= */ null);

        }

    }



    @Override

tests/robotests/src/com/android/settings/development/linuxterminal/EnableLinuxTerminalPreferenceControllerTest.java

+2 −0
Original line number Diff line number Diff line
@@ -139,6 +139,8 @@ public class EnableLinuxTerminalPreferenceControllerTest { 
                        mTerminalPackageName,

                        PackageManager.COMPONENT_ENABLED_STATE_DEFAULT,

                        /* flags= */ 0);



        verify(mPackageManager).clearApplicationUserData(mTerminalPackageName, null);

    }



    @Test