PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Clear Linux terminal app when disabled" into main am: 005ee9761b am: c4d90bf739

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3332054

Change-Id: Ifc0064dd155a9b4d5faf55d496f6cba3ef097251
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jaewan Kim
2024-11-12 04:46:29 +00:00
committed by Automerger Merge Worker
parent dbf763064b c4d90bf739
commit a1abfdcaca
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/xml/linux_terminal_settings.xml
View File

@@ -24,4 +24,10 @@
android:title="@string/enable_linux_terminal_summary" android:title="@string/enable_linux_terminal_summary"
settings:controller="com.android.settings.development.linuxterminal.EnableLinuxTerminalPreferenceController" /> 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> </PreferenceScreen>

4
src/com/android/settings/development/linuxterminal/EnableLinuxTerminalPreferenceController.java
View File

@@ -95,6 +95,10 @@ public class EnableLinuxTerminalPreferenceController extends BasePreferenceContr
? PackageManager.COMPONENT_ENABLED_STATE_ENABLED ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
: PackageManager.COMPONENT_ENABLED_STATE_DEFAULT; : PackageManager.COMPONENT_ENABLED_STATE_DEFAULT;
mPackageManager.setApplicationEnabledSetting(mTerminalPackageName, state, /* flags= */ 0); mPackageManager.setApplicationEnabledSetting(mTerminalPackageName, state, /* flags= */ 0);
if (!isChecked) {
mPackageManager.clearApplicationUserData(
mTerminalPackageName, /* observer= */ null);
}
} }
@Override @Override

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

@@ -139,6 +139,8 @@ public class EnableLinuxTerminalPreferenceControllerTest {
mTerminalPackageName, mTerminalPackageName,
PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, PackageManager.COMPONENT_ENABLED_STATE_DEFAULT,
/* flags= */ 0); /* flags= */ 0);
verify(mPackageManager).clearApplicationUserData(mTerminalPackageName, null);
} }
@Test @Test