| commit | 1dad949faed86a246265d8c9fc7d4831187914a6 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon Dec 16 02:36:15 2024 -0800 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 16 02:36:15 2024 -0800 |
| tree | 9fbc384b8f8117eb4b94d7c7e86ed6175e09e037 | |
| parent | b7a6179fee04c11180fda9aaaf5a9570bc24275d [diff] | |
| parent | 2cef0ecf3cc6deb20517449a2b1e79a65f1155c3 [diff] |
Merge "Reset sharedpref when uninstall VM" into main am: 8c3e9b8aa2 am: 2cef0ecf3c Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3414619 Change-Id: I1cac1c584cde9b82815eebb75d5b6a81390c4ae5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/PortsStateManager.java b/android/TerminalApp/java/com/android/virtualization/terminal/PortsStateManager.java index 56ecd96..5321d89 100644 --- a/android/TerminalApp/java/com/android/virtualization/terminal/PortsStateManager.java +++ b/android/TerminalApp/java/com/android/virtualization/terminal/PortsStateManager.java
@@ -116,6 +116,18 @@ notifyPortsStateUpdated(activePorts, activePorts); } + void clearEnabledPorts() { + Set<Integer> activePorts; + synchronized (mLock) { + SharedPreferences.Editor editor = mSharedPref.edit(); + editor.clear(); + editor.apply(); + mEnabledPorts.clear(); + activePorts = mActivePorts; + } + notifyPortsStateUpdated(activePorts, activePorts); + } + void registerListener(Listener listener) { synchronized (mLock) { mListeners.add(listener);
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/SettingsRecoveryActivity.kt b/android/TerminalApp/java/com/android/virtualization/terminal/SettingsRecoveryActivity.kt index 0d74eb0..a4d43b8 100644 --- a/android/TerminalApp/java/com/android/virtualization/terminal/SettingsRecoveryActivity.kt +++ b/android/TerminalApp/java/com/android/virtualization/terminal/SettingsRecoveryActivity.kt
@@ -103,6 +103,7 @@ image.uninstallAndBackup() backupDone = true } else { + PortsStateManager.getInstance(this).clearEnabledPorts() image.uninstallFully() } } catch (e: IOException) {
diff --git a/tests/Terminal/src/com/android/virtualization/terminal/TerminalAppTest.java b/tests/Terminal/src/com/android/virtualization/terminal/TerminalAppTest.java index 42c31e3..4a18ee8 100644 --- a/tests/Terminal/src/com/android/virtualization/terminal/TerminalAppTest.java +++ b/tests/Terminal/src/com/android/virtualization/terminal/TerminalAppTest.java
@@ -90,6 +90,7 @@ @After public void tearDown() throws IOException { + PortsStateManager.getInstance(mTargetContext).clearEnabledPorts(); InstalledImage.getDefault(mTargetContext).uninstallFully(); } }