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

Commit 38fab3fd authored by Richard Uhler's avatar Richard Uhler
Browse files

Fix "Request to restore userData ..." log spam. 

We shouldn't be logging an error message if no rollback data is
available for a package in restoreUserData, because that function is
called regularly with applications that don't have rollback enabled.

Bug: 125768945
Test: atest RollbackTest ; adb logcat -d | grep RollbackManager
Change-Id: I908cbbefb6efbc1b4f0dd81500914616e502a7fb
parent e7c08066

services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java

+33 −24
Original line number Diff line number Diff line
@@ -966,13 +966,27 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub { 
        }



        getHandler().post(() -> {

            restoreUserDataInternal(packageName, userIds, appId, ceDataInode, seInfo, token);

            final PackageManagerInternal pmi = LocalServices.getService(

                    PackageManagerInternal.class);

            pmi.finishPackageInstall(token, false);

        });

    }



    private void restoreUserDataInternal(String packageName, int[] userIds, int appId,

            long ceDataInode, String seInfo, int token) {

        final RollbackData rollbackData = getRollbackForPackage(packageName);

            for (int userId : userIds) {

                if (rollbackData == null || !rollbackData.inProgress) {

        if (rollbackData == null) {

            return;

        }



        if (!rollbackData.inProgress) {

            Log.e(TAG, "Request to restore userData for: " + packageName

                    + ", but no rollback in progress.");

                    continue;

            return;

        }



        for (int userId : userIds) {

            final PackageRollbackInfo info = getPackageRollbackInfo(rollbackData, packageName);

            final boolean changedRollbackData = mAppDataRollbackHelper.restoreAppData(

                    rollbackData.rollbackId, info, userId, appId, seInfo);
@@ -989,11 +1003,6 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub { 
                }

            }

        }



            final PackageManagerInternal pmi = LocalServices.getService(

                    PackageManagerInternal.class);

            pmi.finishPackageInstall(token, false);

        });

    }



    @Override