| commit | 2cef0ecf3cc6deb20517449a2b1e79a65f1155c3 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Mon Dec 16 02:00:21 2024 -0800 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 16 02:00:21 2024 -0800 |
| tree | 0ddc2cf7ccd45b496655b48f5a427b4522f61dab | |
| parent | b54a2e1c8e6460fb4562a134a96ce2472e34678b [diff] | |
| parent | 8c3e9b8aa2386edc9019c8ee07e1606baedb832f [diff] |
Merge "Reset sharedpref when uninstall VM" into main am: 8c3e9b8aa2 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3414619 Change-Id: I8af715cce0b27497e880be63c096b1086e0ad7eb 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(); } }