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

Merge "Full-data restore path needs to pass along the widget metadata" into nyc-dev

Browse Source
This commit is contained in:
Chris Tate
2016-05-04 22:52:11 +00:00
committed by Android (Google) Code Review
parent 6afe594461 722d27f99c
commit c7656ffcb9
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/backup/java/com/android/server/backup/BackupManagerService.java
View File

@@ -5245,6 +5245,10 @@ public class BackupManagerService {
return mAgent; return mAgent;
} }
public byte[] getWidgetData() {
return mWidgetData;
}
public boolean restoreOneFile(InputStream instream, boolean mustKillAgent) { public boolean restoreOneFile(InputStream instream, boolean mustKillAgent) {
if (!isRunning()) { if (!isRunning()) {
Slog.w(TAG, "Restore engine used after halting"); Slog.w(TAG, "Restore engine used after halting");
@@ -7676,6 +7680,9 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF
void restoreWidgetData(String packageName, byte[] widgetData) { void restoreWidgetData(String packageName, byte[] widgetData) {
// Apply the restored widget state and generate the ID update for the app // Apply the restored widget state and generate the ID update for the app
// TODO: http://b/22388012 // TODO: http://b/22388012
if (MORE_DEBUG) {
Slog.i(TAG, "Incorporating restored widget data");
}
AppWidgetBackupBridge.restoreWidgetState(packageName, widgetData, UserHandle.USER_SYSTEM); AppWidgetBackupBridge.restoreWidgetState(packageName, widgetData, UserHandle.USER_SYSTEM);
} }
@@ -8457,6 +8464,9 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF
// the engine bound the target's agent, so recover that binding // the engine bound the target's agent, so recover that binding
// to use for the callback. // to use for the callback.
mAgent = mEngine.getAgent(); mAgent = mEngine.getAgent();
// and the restored widget data, if any
mWidgetData = mEngine.getWidgetData();
} else { } else {
// Something went wrong somewhere. Whether it was at the transport // Something went wrong somewhere. Whether it was at the transport
// level is immaterial; we need to tell the transport to bail // level is immaterial; we need to tell the transport to bail