Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Disable SoftAP config backup and restore on Wear"

Browse Source
This commit is contained in:
Bagus Maulana
2023-04-13 10:32:00 +00:00
committed by Android (Google) Code Review
parent 156f7c6a2c 8cb7e21c69
commit 5966e38d8c
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java
View File

@@ -246,9 +246,13 @@ public class SettingsBackupAgent extends BackupAgentHelper {
stateChecksums[STATE_LOCK_SETTINGS] =
writeIfChanged(stateChecksums[STATE_LOCK_SETTINGS], KEY_LOCK_SETTINGS,
lockSettingsData, data);
stateChecksums[STATE_SOFTAP_CONFIG] =
if (getBaseContext().getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH)) {
stateChecksums[STATE_SOFTAP_CONFIG] = 0;
} else {
stateChecksums[STATE_SOFTAP_CONFIG] =
writeIfChanged(stateChecksums[STATE_SOFTAP_CONFIG], KEY_SOFTAP_CONFIG,
softApConfigData, data);
softApConfigData, data);
}
stateChecksums[STATE_NETWORK_POLICIES] =
writeIfChanged(stateChecksums[STATE_NETWORK_POLICIES], KEY_NETWORK_POLICIES,
netPoliciesData, data);
@@ -364,6 +368,10 @@ public class SettingsBackupAgent extends BackupAgentHelper {
break;
case KEY_SOFTAP_CONFIG :
if (getBaseContext().getPackageManager()
.hasSystemFeature(PackageManager.FEATURE_WATCH)) {
break;
}
byte[] softapData = new byte[size];
data.readEntityData(softapData, 0, size);
restoreSoftApConfiguration(softapData);
@@ -504,7 +512,9 @@ public class SettingsBackupAgent extends BackupAgentHelper {
}
}
// softap config
if (version >= FULL_BACKUP_ADDED_SOFTAP_CONF) {
if (version >= FULL_BACKUP_ADDED_SOFTAP_CONF
&& !getBaseContext().getPackageManager()
.hasSystemFeature(PackageManager.FEATURE_WATCH)) {
nBytes = in.readInt();
if (DEBUG_BACKUP) Log.d(TAG, nBytes + " bytes of softap config data");
if (nBytes > buffer.length) buffer = new byte[nBytes];