Fix restore from higher SDKs in SettingsBackupAgent

Actually skip the backup data for the unsupported key.

Bug: 77867300
Test: manual (adb shell bmgr restore com.android.providers.settings from
a backup set created by sdk 101)

Change-Id: I3d6a97ecbc0b048a3d07329542771f434e7e154d

diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java
index 313f73f..f728684 100644 (file)
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java
@@ -253,6 +253,7 @@ public class SettingsBackupAgent extends BackupAgentHelper {
                     && !RESTORE_FROM_HIGHER_SDK_INT_SUPPORTED_KEYS.contains(key)) {
                 Log.w(TAG, "Not restoring unrecognized key '"
                         + key + "' from future version " + appVersionCode);
+                data.skipEntityData();
                 continue;
             }