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

Commit 9aca0537 authored by Joël Stemmer's avatar Joël Stemmer Committed by Android (Google) Code Review
Browse files

Merge changes I25e16999,I3661af90 into main

* changes:
  Change FullBackupTest from AndroidTestCase (deprecated) to JUnit4
  Fix formatting of various backup source files
parents 1a91c611 fd0008b8
Loading
Loading
Loading
Loading
+508 −392

File changed.

Preview size limit exceeded, changes collapsed.

+8 −7
Original line number Diff line number Diff line
@@ -44,7 +44,8 @@ public class BackupAnnotations {
     * Denotes where the backup data is going (e.g. to the cloud or directly to the other device)
     * during backup or where it is coming from during restore.
     *
     * @hide */
     * @hide
     */
    @Retention(RetentionPolicy.SOURCE)
    @IntDef({
        BackupDestination.CLOUD,
+222 −159

File changed.

Preview size limit exceeded, changes collapsed.

+224 −141

File changed.

Preview size limit exceeded, changes collapsed.