Merge "Allow BackupHelper to be overridden" into sc-qpr1-dev am: 3de2a1e721

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15596703

Change-Id: Ib18924265fe44ee038f53ce7a95ad94bfa9de564
This commit is contained in:
Govinda Wasserman
2021-08-19 18:37:02 +00:00
committed by Automerger Merge Worker
2 changed files with 28 additions and 2 deletions

View File

@@ -280,6 +280,32 @@ public class BackupManager {
}
}
/**
* Convenience method for callers who need to indicate that some other package or
* some other user needs a backup pass. This can be useful in the case of groups of
* packages that share a uid and/or have user-specific data.
* <p>
* This method requires that the application hold the "android.permission.BACKUP"
* permission if the package named in the package argument does not run under the
* same uid as the caller. This method also requires that the application hold the
* "android.permission.INTERACT_ACROSS_USERS_FULL" if the user argument is not the
* same as the user the caller is running under.
* @param userId The user to back up
* @param packageName The package name identifying the application to back up.
*
* @hide
*/
public static void dataChangedForUser(int userId, String packageName) {
checkServiceBinder();
if (sService != null) {
try {
sService.dataChangedForUser(userId, packageName);
} catch (RemoteException e) {
Log.e(TAG, "dataChanged(userId,pkg) couldn't connect");
}
}
}
/**
* @deprecated Applications shouldn't request a restore operation using this method. In Android
* P and later, this method is a no-op.

View File

@@ -40,10 +40,10 @@ import com.android.systemui.people.widget.PeopleBackupHelper
* After restoring is done, a [ACTION_RESTORE_FINISHED] intent will be send to SystemUI user 0,
* indicating that restoring is finished for a given user.
*/
class BackupHelper : BackupAgentHelper() {
open class BackupHelper : BackupAgentHelper() {
companion object {
private const val TAG = "BackupHelper"
const val TAG = "BackupHelper"
internal const val CONTROLS = ControlsFavoritePersistenceWrapper.FILE_NAME
private const val NO_OVERWRITE_FILES_BACKUP_KEY = "systemui.files_no_overwrite"
private const val PEOPLE_TILES_BACKUP_KEY = "systemui.people.shared_preferences"