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

Merge "Allow backup payload for shortcuts from secondary user"

Browse Source
This commit is contained in:
Pinyao Ting
2023-02-01 21:21:16 +00:00
committed by Android (Google) Code Review
parent c4f915cccf 02596178e6
commit e7969cfd13
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/com/android/server/backup/ShortcutBackupHelper.java
View File

@@ -19,7 +19,6 @@ import android.app.backup.BlobBackupHelper;
import android.content.Context;
import android.content.pm.IShortcutService;
import android.os.ServiceManager;
import android.os.UserHandle;
import android.util.Slog;
public class ShortcutBackupHelper extends BlobBackupHelper {
@@ -28,8 +27,11 @@ public class ShortcutBackupHelper extends BlobBackupHelper {
private static final String KEY_USER_FILE = "shortcutuser.xml";
public ShortcutBackupHelper() {
private final int mUserId;
public ShortcutBackupHelper(int userId) {
super(BLOB_VERSION, KEY_USER_FILE);
mUserId = userId;
}
private IShortcutService getShortcutService() {
@@ -42,7 +44,7 @@ public class ShortcutBackupHelper extends BlobBackupHelper {
switch (key) {
case KEY_USER_FILE:
try {
return getShortcutService().getBackupPayload(UserHandle.USER_SYSTEM);
return getShortcutService().getBackupPayload(mUserId);
} catch (Exception e) {
Slog.wtf(TAG, "Backup failed", e);
}
@@ -58,7 +60,7 @@ public class ShortcutBackupHelper extends BlobBackupHelper {
switch (key) {
case KEY_USER_FILE:
try {
getShortcutService().applyRestore(payload, UserHandle.USER_SYSTEM);
getShortcutService().applyRestore(payload, mUserId);
} catch (Exception e) {
Slog.wtf(TAG, "Restore failed", e);
}

5
services/core/java/com/android/server/backup/SystemBackupAgent.java
View File

@@ -86,7 +86,8 @@ public class SystemBackupAgent extends BackupAgentHelper {
private static final Set<String> sEligibleForMultiUser = Sets.newArraySet(
PERMISSION_HELPER, NOTIFICATION_HELPER, SYNC_SETTINGS_HELPER, APP_LOCALES_HELPER,
ACCOUNT_MANAGER_HELPER, USAGE_STATS_HELPER, PREFERRED_HELPER);
ACCOUNT_MANAGER_HELPER, USAGE_STATS_HELPER, PREFERRED_HELPER, SHORTCUT_MANAGER_HELPER
);
private int mUserId = UserHandle.USER_SYSTEM;
@@ -101,7 +102,7 @@ public class SystemBackupAgent extends BackupAgentHelper {
addHelper(NOTIFICATION_HELPER, new NotificationBackupHelper(mUserId));
addHelper(PERMISSION_HELPER, new PermissionBackupHelper(mUserId));
addHelper(USAGE_STATS_HELPER, new UsageStatsBackupHelper(mUserId));
addHelper(SHORTCUT_MANAGER_HELPER, new ShortcutBackupHelper());
addHelper(SHORTCUT_MANAGER_HELPER, new ShortcutBackupHelper(mUserId));
addHelper(ACCOUNT_MANAGER_HELPER, new AccountManagerBackupHelper(mUserId));
addHelper(SLICES_HELPER, new SliceBackupHelper(this));
addHelper(PEOPLE_HELPER, new PeopleBackupHelper(mUserId));