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

Commit 8cb7e21c authored by Bagus Maulana's avatar Bagus Maulana
Browse files

Disable SoftAP config backup and restore on Wear 

SoftAP config restore has caused various bugs during Wear OOBE (e.g.
b/276411509, b/269598544). SoftAP is used for WiFi hotspot, which no
Wear OEM supports AFAIK.

Bug: 276411509
Test: manually flashed to watch, 'Restored soft ap backup data' not logged
Change-Id: I884e71d0353d6f7eb3bb66c2aec4734aa40f5def
(cherry picked from commit a5a9fd330d65035c3ad4ee706ae8abaeabbd7533)
parent 69cba4fc

packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java

+13 −3
Original line number Diff line number Diff line
@@ -246,9 +246,13 @@ public class SettingsBackupAgent extends BackupAgentHelper { 
        stateChecksums[STATE_LOCK_SETTINGS] =

                writeIfChanged(stateChecksums[STATE_LOCK_SETTINGS], KEY_LOCK_SETTINGS,

                        lockSettingsData, data);

        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);

        }

        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];