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

Commit 3a4c61e5 authored by Joël Stemmer's avatar Joël Stemmer
Browse files

Update language to comply with Android's inclusive language guidance 

See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 161896447
Test: N/A; changes only to comments
Change-Id: I6eb9e3fcc1854b3fe820d52bdcbe9812ed3de2b2
parent 84e70df9

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

+1 −1
Original line number Diff line number Diff line
@@ -919,7 +919,7 @@ public abstract class BackupAgent extends ContextWrapper { 


    /**

     * Only specialized platform agents should overload this entry point to support

     * restores to crazy non-app locations.

     * restores to non-app locations.

     * @hide

     */

    protected void onRestoreFile(ParcelFileDescriptor data, long size,

services/backup/java/com/android/server/backup/UserBackupManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -2307,7 +2307,7 @@ public class UserBackupManagerService { 
    public void enqueueFullBackup(String packageName, long lastBackedUp) {

        FullBackupEntry newEntry = new FullBackupEntry(packageName, lastBackedUp);

        synchronized (mQueueLock) {

            // First, sanity check that we aren't adding a duplicate.  Slow but

            // First, check that we aren't adding a duplicate.  Slow but

            // straightforward; we'll have at most on the order of a few hundred

            // items in this list.

            dequeueFullBackupLocked(packageName);

services/backup/java/com/android/server/backup/restore/FullRestoreEngine.java

+1 −1
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ public class FullRestoreEngine extends RestoreEngine { 
                        }

                    }



                    // Sanity check: make sure we never give data to the wrong app.  This

                    // Make sure we never give data to the wrong app.  This

                    // should never happen but a little paranoia here won't go amiss.

                    if (okay && !pkg.equals(mAgentPackage)) {

                        Slog.e(TAG, "Restoring data for " + pkg