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

Commit 28db8b94 authored by Christopher Tate's avatar Christopher Tate Committed by Android (Google) Code Review
Browse files

Merge "Make full backup API available to apps"

parents a0c26920 79ec80db

api/current.txt

+50 −44
Original line number Diff line number Diff line
@@ -183,14 +183,14 @@ package android { 
  public static final class R.attr {

    ctor public R.attr();

    field public static final int absListViewStyle = 16842858; // 0x101006a

    field public static final int accessibilityEventTypes = 16843650; // 0x1010382

    field public static final int accessibilityFeedbackType = 16843652; // 0x1010384

    field public static final int accessibilityFlags = 16843654; // 0x1010386

    field public static final int accessibilityEventTypes = 16843649; // 0x1010381

    field public static final int accessibilityFeedbackType = 16843651; // 0x1010383

    field public static final int accessibilityFlags = 16843653; // 0x1010385

    field public static final int accountPreferences = 16843423; // 0x101029f

    field public static final int accountType = 16843407; // 0x101028f

    field public static final int action = 16842797; // 0x101002d

    field public static final int actionBarSize = 16843499; // 0x10102eb

    field public static final int actionBarSplitStyle = 16843676; // 0x101039c

    field public static final int actionBarSplitStyle = 16843675; // 0x101039b

    field public static final int actionBarStyle = 16843470; // 0x10102ce

    field public static final int actionBarTabBarStyle = 16843508; // 0x10102f4

    field public static final int actionBarTabStyle = 16843507; // 0x10102f3
@@ -206,9 +206,9 @@ package android { 
    field public static final int actionModeCopyDrawable = 16843538; // 0x1010312

    field public static final int actionModeCutDrawable = 16843537; // 0x1010311

    field public static final int actionModePasteDrawable = 16843539; // 0x1010313

    field public static final int actionModeSelectAllDrawable = 16843648; // 0x1010380

    field public static final int actionModeSelectAllDrawable = 16843647; // 0x101037f

    field public static final int actionOverflowButtonStyle = 16843510; // 0x10102f6

    field public static final int actionProviderClass = 16843678; // 0x101039e

    field public static final int actionProviderClass = 16843677; // 0x101039d

    field public static final int actionViewClass = 16843516; // 0x10102fc

    field public static final int activatedBackgroundIndicator = 16843517; // 0x10102fd

    field public static final int activityCloseEnterAnimation = 16842938; // 0x10100ba
@@ -220,7 +220,7 @@ package android { 
    field public static final int alertDialogIcon = 16843605; // 0x1010355

    field public static final int alertDialogStyle = 16842845; // 0x101005d

    field public static final int alertDialogTheme = 16843529; // 0x1010309

    field public static final int alignmentMode = 16843642; // 0x101037a

    field public static final int alignmentMode = 16843641; // 0x1010379

    field public static final int allContactsName = 16843468; // 0x10102cc

    field public static final int allowBackup = 16843392; // 0x1010280

    field public static final int allowClearUserData = 16842757; // 0x1010005
@@ -262,7 +262,7 @@ package android { 
    field public static final int borderlessButtonStyle = 16843563; // 0x101032b

    field public static final int bottom = 16843184; // 0x10101b0

    field public static final int bottomBright = 16842957; // 0x10100cd

    field public static final int bottomChevronDrawable = 16843661; // 0x101038d

    field public static final int bottomChevronDrawable = 16843660; // 0x101038c

    field public static final int bottomDark = 16842953; // 0x10100c9

    field public static final int bottomLeftRadius = 16843179; // 0x10101ab

    field public static final int bottomMedium = 16842958; // 0x10100ce
@@ -281,7 +281,7 @@ package android { 
    field public static final int cacheColorHint = 16843009; // 0x1010101

    field public static final int calendarViewShown = 16843596; // 0x101034c

    field public static final int calendarViewStyle = 16843613; // 0x101035d

    field public static final int canRetrieveWindowContent = 16843655; // 0x1010387

    field public static final int canRetrieveWindowContent = 16843654; // 0x1010386

    field public static final int candidatesTextStyleSpans = 16843312; // 0x1010230

    field public static final deprecated int capitalize = 16843113; // 0x1010169

    field public static final int centerBright = 16842956; // 0x10100cc
@@ -314,9 +314,9 @@ package android { 
    field public static final int colorBackgroundCacheHint = 16843435; // 0x10102ab

    field public static final int colorForeground = 16842800; // 0x1010030

    field public static final int colorForegroundInverse = 16843270; // 0x1010206

    field public static final int columnCount = 16843639; // 0x1010377

    field public static final int columnCount = 16843638; // 0x1010376

    field public static final int columnDelay = 16843215; // 0x10101cf

    field public static final int columnOrderPreserved = 16843640; // 0x1010378

    field public static final int columnOrderPreserved = 16843639; // 0x1010377

    field public static final int columnWidth = 16843031; // 0x1010117

    field public static final int compatibleWidthLimitDp = 16843621; // 0x1010365

    field public static final int completionHint = 16843122; // 0x1010172
@@ -429,7 +429,7 @@ package android { 
    field public static final int fastScrollTextColor = 16843609; // 0x1010359

    field public static final int fastScrollThumbDrawable = 16843574; // 0x1010336

    field public static final int fastScrollTrackDrawable = 16843577; // 0x1010339

    field public static final int feedbackCount = 16843667; // 0x1010393

    field public static final int feedbackCount = 16843666; // 0x1010392

    field public static final int fillAfter = 16843197; // 0x10101bd

    field public static final int fillBefore = 16843196; // 0x10101bc

    field public static final int fillEnabled = 16843343; // 0x101024f
@@ -462,7 +462,6 @@ package android { 
    field public static final int fromXScale = 16843202; // 0x10101c2

    field public static final int fromYDelta = 16843208; // 0x10101c8

    field public static final int fromYScale = 16843204; // 0x10101c4

    field public static final int fullBackupAgent = 16843635; // 0x1010373

    field public static final int fullBright = 16842954; // 0x10100ca

    field public static final int fullDark = 16842950; // 0x10100c6

    field public static final int functionalTest = 16842787; // 0x1010023
@@ -483,7 +482,7 @@ package android { 
    field public static final int hand_hour = 16843011; // 0x1010103

    field public static final int hand_minute = 16843012; // 0x1010104

    field public static final int handle = 16843354; // 0x101025a

    field public static final int handleDrawable = 16843657; // 0x1010389

    field public static final int handleDrawable = 16843656; // 0x1010388

    field public static final int handleProfiling = 16842786; // 0x1010022

    field public static final int hapticFeedbackEnabled = 16843358; // 0x101025e

    field public static final int hardwareAccelerated = 16843475; // 0x10102d3
@@ -492,12 +491,12 @@ package android { 
    field public static final int headerDividersEnabled = 16843310; // 0x101022e

    field public static final int height = 16843093; // 0x1010155

    field public static final int hint = 16843088; // 0x1010150

    field public static final int hitRadius = 16843664; // 0x1010390

    field public static final int hitRadius = 16843663; // 0x101038f

    field public static final int homeAsUpIndicator = 16843531; // 0x101030b

    field public static final int homeLayout = 16843549; // 0x101031d

    field public static final int horizontalDivider = 16843053; // 0x101012d

    field public static final int horizontalGap = 16843327; // 0x101023f

    field public static final int horizontalOffset = 16843669; // 0x1010395

    field public static final int horizontalOffset = 16843668; // 0x1010394

    field public static final int horizontalScrollViewStyle = 16843603; // 0x1010353

    field public static final int horizontalSpacing = 16843028; // 0x1010114

    field public static final int host = 16842792; // 0x1010028
@@ -543,7 +542,7 @@ package android { 
    field public static final int installLocation = 16843447; // 0x10102b7

    field public static final int interpolator = 16843073; // 0x1010141

    field public static final int isAlwaysSyncable = 16843571; // 0x1010333

    field public static final int isAuxiliary = 16843649; // 0x1010381

    field public static final int isAuxiliary = 16843648; // 0x1010380

    field public static final int isDefault = 16843297; // 0x1010221

    field public static final int isIndicator = 16843079; // 0x1010147

    field public static final int isModifier = 16843334; // 0x1010246
@@ -597,30 +596,30 @@ package android { 
    field public static final int layout_centerInParent = 16843151; // 0x101018f

    field public static final int layout_centerVertical = 16843153; // 0x1010191

    field public static final int layout_column = 16843084; // 0x101014c

    field public static final int layout_columnSpan = 16843645; // 0x101037d

    field public static final int layout_columnSpan = 16843644; // 0x101037c

    field public static final int layout_gravity = 16842931; // 0x10100b3

    field public static final int layout_height = 16842997; // 0x10100f5

    field public static final int layout_heightSpec = 16843647; // 0x101037f

    field public static final int layout_heightSpec = 16843646; // 0x101037e

    field public static final int layout_margin = 16842998; // 0x10100f6

    field public static final int layout_marginBottom = 16843002; // 0x10100fa

    field public static final int layout_marginEnd = 16843675; // 0x101039b

    field public static final int layout_marginEnd = 16843674; // 0x101039a

    field public static final int layout_marginLeft = 16842999; // 0x10100f7

    field public static final int layout_marginRight = 16843001; // 0x10100f9

    field public static final int layout_marginStart = 16843674; // 0x101039a

    field public static final int layout_marginStart = 16843673; // 0x1010399

    field public static final int layout_marginTop = 16843000; // 0x10100f8

    field public static final int layout_row = 16843643; // 0x101037b

    field public static final int layout_rowSpan = 16843644; // 0x101037c

    field public static final int layout_row = 16843642; // 0x101037a

    field public static final int layout_rowSpan = 16843643; // 0x101037b

    field public static final int layout_scale = 16843155; // 0x1010193

    field public static final int layout_span = 16843085; // 0x101014d

    field public static final int layout_toLeftOf = 16843138; // 0x1010182

    field public static final int layout_toRightOf = 16843139; // 0x1010183

    field public static final int layout_weight = 16843137; // 0x1010181

    field public static final int layout_width = 16842996; // 0x10100f4

    field public static final int layout_widthSpec = 16843646; // 0x101037e

    field public static final int layout_widthSpec = 16843645; // 0x101037d

    field public static final int layout_x = 16843135; // 0x101017f

    field public static final int layout_y = 16843136; // 0x1010180

    field public static final int left = 16843181; // 0x10101ad

    field public static final int leftChevronDrawable = 16843658; // 0x101038a

    field public static final int leftChevronDrawable = 16843657; // 0x1010389

    field public static final int lineSpacingExtra = 16843287; // 0x1010217

    field public static final int lineSpacingMultiplier = 16843288; // 0x1010218

    field public static final int lines = 16843092; // 0x1010154
@@ -632,8 +631,8 @@ package android { 
    field public static final int listDividerAlertDialog = 16843525; // 0x1010305

    field public static final int listPopupWindowStyle = 16843519; // 0x10102ff

    field public static final int listPreferredItemHeight = 16842829; // 0x101004d

    field public static final int listPreferredItemHeightLarge = 16843670; // 0x1010396

    field public static final int listPreferredItemHeightSmall = 16843671; // 0x1010397

    field public static final int listPreferredItemHeightLarge = 16843669; // 0x1010395

    field public static final int listPreferredItemHeightSmall = 16843670; // 0x1010396

    field public static final int listSelector = 16843003; // 0x10100fb

    field public static final int listSeparatorTextViewStyle = 16843272; // 0x1010208

    field public static final int listViewStyle = 16842868; // 0x1010074
@@ -679,7 +678,7 @@ package android { 
    field public static final int nextFocusUp = 16842979; // 0x10100e3

    field public static final int noHistory = 16843309; // 0x101022d

    field public static final int normalScreens = 16843397; // 0x1010285

    field public static final int notificationTimeout = 16843653; // 0x1010385

    field public static final int notificationTimeout = 16843652; // 0x1010384

    field public static final int numColumns = 16843032; // 0x1010118

    field public static final int numStars = 16843076; // 0x1010144

    field public static final deprecated int numeric = 16843109; // 0x1010165
@@ -693,17 +692,17 @@ package android { 
    field public static final int orderingFromXml = 16843239; // 0x10101e7

    field public static final int orientation = 16842948; // 0x10100c4

    field public static final int outAnimation = 16843128; // 0x1010178

    field public static final int outerRadius = 16843663; // 0x101038f

    field public static final int outerRadius = 16843662; // 0x101038e

    field public static final int overScrollFooter = 16843459; // 0x10102c3

    field public static final int overScrollHeader = 16843458; // 0x10102c2

    field public static final int overScrollMode = 16843457; // 0x10102c1

    field public static final int packageNames = 16843651; // 0x1010383

    field public static final int packageNames = 16843650; // 0x1010382

    field public static final int padding = 16842965; // 0x10100d5

    field public static final int paddingBottom = 16842969; // 0x10100d9

    field public static final int paddingEnd = 16843673; // 0x1010399

    field public static final int paddingEnd = 16843672; // 0x1010398

    field public static final int paddingLeft = 16842966; // 0x10100d6

    field public static final int paddingRight = 16842968; // 0x10100d8

    field public static final int paddingStart = 16843672; // 0x1010398

    field public static final int paddingStart = 16843671; // 0x1010397

    field public static final int paddingTop = 16842967; // 0x10100d7

    field public static final int panelBackground = 16842846; // 0x101005e

    field public static final int panelColorBackground = 16842849; // 0x1010061
@@ -784,17 +783,17 @@ package android { 
    field public static final int restoreAnyVersion = 16843450; // 0x10102ba

    field public static final deprecated int restoreNeedsApplication = 16843421; // 0x101029d

    field public static final int right = 16843183; // 0x10101af

    field public static final int rightChevronDrawable = 16843659; // 0x101038b

    field public static final int rightChevronDrawable = 16843658; // 0x101038a

    field public static final int ringtonePreferenceStyle = 16842899; // 0x1010093

    field public static final int ringtoneType = 16843257; // 0x10101f9

    field public static final int rotation = 16843558; // 0x1010326

    field public static final int rotationX = 16843559; // 0x1010327

    field public static final int rotationY = 16843560; // 0x1010328

    field public static final int rowCount = 16843637; // 0x1010375

    field public static final int rowCount = 16843636; // 0x1010374

    field public static final int rowDelay = 16843216; // 0x10101d0

    field public static final int rowEdgeFlags = 16843329; // 0x1010241

    field public static final int rowHeight = 16843058; // 0x1010132

    field public static final int rowOrderPreserved = 16843638; // 0x1010376

    field public static final int rowOrderPreserved = 16843637; // 0x1010375

    field public static final int saveEnabled = 16842983; // 0x10100e7

    field public static final int scaleGravity = 16843262; // 0x10101fe

    field public static final int scaleHeight = 16843261; // 0x10101fd
@@ -860,7 +859,7 @@ package android { 
    field public static final int smallIcon = 16843422; // 0x101029e

    field public static final int smallScreens = 16843396; // 0x1010284

    field public static final int smoothScrollbar = 16843313; // 0x1010231

    field public static final int snapMargin = 16843666; // 0x1010392

    field public static final int snapMargin = 16843665; // 0x1010391

    field public static final int soundEffectsEnabled = 16843285; // 0x1010215

    field public static final int spacing = 16843027; // 0x1010113

    field public static final int spinnerDropDownItemStyle = 16842887; // 0x1010087
@@ -908,7 +907,7 @@ package android { 
    field public static final int subtitleTextStyle = 16843513; // 0x10102f9

    field public static final int suggestActionMsg = 16843228; // 0x10101dc

    field public static final int suggestActionMsgColumn = 16843229; // 0x10101dd

    field public static final int suggestionsEnabled = 16843636; // 0x1010374

    field public static final int suggestionsEnabled = 16843635; // 0x1010373

    field public static final int summary = 16843241; // 0x10101e9

    field public static final int summaryColumn = 16843426; // 0x10102a2

    field public static final int summaryOff = 16843248; // 0x10101f0
@@ -925,7 +924,7 @@ package android { 
    field public static final int tag = 16842961; // 0x10100d1

    field public static final int targetActivity = 16843266; // 0x1010202

    field public static final int targetClass = 16842799; // 0x101002f

    field public static final int targetDrawables = 16843656; // 0x1010388

    field public static final int targetDrawables = 16843655; // 0x1010387

    field public static final int targetPackage = 16842785; // 0x1010021

    field public static final int targetSdkVersion = 16843376; // 0x1010270

    field public static final int taskAffinity = 16842770; // 0x1010012
@@ -976,7 +975,7 @@ package android { 
    field public static final int textColorTertiary = 16843282; // 0x1010212

    field public static final int textColorTertiaryInverse = 16843283; // 0x1010213

    field public static final int textCursorDrawable = 16843618; // 0x1010362

    field public static final int textDirection = 16843677; // 0x101039d

    field public static final int textDirection = 16843676; // 0x101039c

    field public static final int textEditNoPasteWindowLayout = 16843541; // 0x1010315

    field public static final int textEditPasteWindowLayout = 16843540; // 0x1010314

    field public static final int textEditSideNoPasteWindowLayout = 16843615; // 0x101035f
@@ -1016,7 +1015,7 @@ package android { 
    field public static final int toYScale = 16843205; // 0x10101c5

    field public static final int top = 16843182; // 0x10101ae

    field public static final int topBright = 16842955; // 0x10100cb

    field public static final int topChevronDrawable = 16843660; // 0x101038c

    field public static final int topChevronDrawable = 16843659; // 0x101038b

    field public static final int topDark = 16842951; // 0x10100c7

    field public static final int topLeftRadius = 16843177; // 0x10101a9

    field public static final int topOffset = 16843352; // 0x1010258
@@ -1032,7 +1031,7 @@ package android { 
    field public static final int unfocusedMonthDateColor = 16843588; // 0x1010344

    field public static final int unselectedAlpha = 16843278; // 0x101020e

    field public static final int updatePeriodMillis = 16843344; // 0x1010250

    field public static final int useDefaultMargins = 16843641; // 0x1010379

    field public static final int useDefaultMargins = 16843640; // 0x1010378

    field public static final int useIntrinsicSizeAsMinimum = 16843536; // 0x1010310

    field public static final int useLevel = 16843167; // 0x101019f

    field public static final int userVisible = 16843409; // 0x1010291
@@ -1046,10 +1045,10 @@ package android { 
    field public static final int verticalCorrection = 16843322; // 0x101023a

    field public static final int verticalDivider = 16843054; // 0x101012e

    field public static final int verticalGap = 16843328; // 0x1010240

    field public static final int verticalOffset = 16843668; // 0x1010394

    field public static final int verticalOffset = 16843667; // 0x1010393

    field public static final int verticalScrollbarPosition = 16843572; // 0x1010334

    field public static final int verticalSpacing = 16843029; // 0x1010115

    field public static final int vibrationDuration = 16843665; // 0x1010391

    field public static final int vibrationDuration = 16843664; // 0x1010390

    field public static final int visibility = 16842972; // 0x10100dc

    field public static final int visible = 16843156; // 0x1010194

    field public static final int vmSafeMode = 16843448; // 0x10102b8
@@ -1066,7 +1065,7 @@ package android { 
    field public static final int wallpaperIntraOpenExitAnimation = 16843416; // 0x1010298

    field public static final int wallpaperOpenEnterAnimation = 16843411; // 0x1010293

    field public static final int wallpaperOpenExitAnimation = 16843412; // 0x1010294

    field public static final int waveDrawable = 16843662; // 0x101038e

    field public static final int waveDrawable = 16843661; // 0x101038d

    field public static final int webTextViewStyle = 16843449; // 0x10102b9

    field public static final int webViewStyle = 16842885; // 0x1010085

    field public static final int weekDayTextAppearance = 16843592; // 0x1010348
@@ -3737,7 +3736,11 @@ package android.app.backup { 
    method public abstract void onBackup(android.os.ParcelFileDescriptor, android.app.backup.BackupDataOutput, android.os.ParcelFileDescriptor) throws java.io.IOException;

    method public void onCreate();

    method public void onDestroy();

    method public void onFullBackup(android.app.backup.FullBackupDataOutput) throws java.io.IOException;

    method public abstract void onRestore(android.app.backup.BackupDataInput, int, android.os.ParcelFileDescriptor) throws java.io.IOException;

    method public void onRestoreFile(android.os.ParcelFileDescriptor, long, java.io.File, int, long, long) throws java.io.IOException;

    field public static final int TYPE_DIRECTORY = 2; // 0x2

    field public static final int TYPE_FILE = 1; // 0x1

  }















  public class BackupAgentHelper extends android.app.backup.BackupAgent {










@@ -3789,6 +3792,9 @@ package android.app.backup {













    method public void writeNewStateDescription(android.os.ParcelFileDescriptor);















  }



























  public class FullBackupDataOutput {













  }



























  public abstract class RestoreObserver {















    ctor public RestoreObserver();















    method public void onUpdate(int, java.lang.String);

























core/java/android/app/ActivityThread.java



+3
−8




























Original line number
Diff line number
Diff line








@@ -2013,15 +2013,10 @@ public final class ActivityThread {













        BackupAgent agent = null;















        String classname = data.appInfo.backupAgentName;





























        if (data.backupMode == IApplicationThread.BACKUP_MODE_FULL













                || data.backupMode == IApplicationThread.BACKUP_MODE_RESTORE_FULL) {













        // full backup operation but no app-supplied agent?  use the default implementation













        if (classname == null && (data.backupMode == IApplicationThread.BACKUP_MODE_FULL













                || data.backupMode == IApplicationThread.BACKUP_MODE_RESTORE_FULL)) {















            classname = "android.app.backup.FullBackupAgent";













            if ((data.appInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {













                // system packages can supply their own full-backup agent













                if (data.appInfo.fullBackupAgentName != null) {













                    classname = data.appInfo.fullBackupAgentName;













                }













            }















        }































        try {

































core/java/android/app/IBackupAgent.aidl



+19
−1




























Original line number
Diff line number
Diff line








@@ -51,7 +51,6 @@ oneway interface IBackupAgent {













    void doBackup(in ParcelFileDescriptor oldState,















            in ParcelFileDescriptor data,















            in ParcelFileDescriptor newState,













            boolean storeApk,















            int token, IBackupManager callbackBinder);































    /**










@@ -80,6 +79,25 @@ oneway interface IBackupAgent {













    void doRestore(in ParcelFileDescriptor data, int appVersionCode,















            in ParcelFileDescriptor newState, int token, IBackupManager callbackBinder);





























    /**













     * Perform a "full" backup to the given file descriptor.  The output file is presumed













     * to be a socket or other non-seekable, write-only data sink.  When this method is













     * called, the app should write all of its files to the output.













     *













     * @param data Write-only file to receive the backed-up file content stream.













     *        The data must be formatted correctly for the resulting archive to be













     *        legitimate, so that will be tightly controlled by the available API.













     *













     * @param token Opaque token identifying this transaction.  This must













     *        be echoed back to the backup service binder once the agent is













     *        finished restoring the application based on the restore data













     *        contents.













     *













     * @param callbackBinder Binder on which to indicate operation completion,













     *        passed here as a convenience to the agent.













     */













    void doFullBackup(in ParcelFileDescriptor data, int token, IBackupManager callbackBinder);





























    /**















     * Restore a single "file" to the application.  The file was typically obtained from















     * a full-backup dataset.  The agent reads 'size' bytes of file content

































core/java/android/app/backup/BackupAgent.java



+280
−9


























File changed.
Preview size limit exceeded, changes collapsed.
























core/java/android/app/backup/FullBackup.java



+38
−11


























File changed.
Preview size limit exceeded, changes collapsed.