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

Commit 82add8a7 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Fix two storage measurement bugs. 

First, every time installd starts up we need to invalidateMounts()
to ensure we have valid mappings for quotactl() to work.  (Without
this forced invalidation, we were falling back to manual calculation
after an installd restart.)

Second, when calculating the disk space for an app, we need to use
the real appId deconstructed from the uid; oops!  (Without this we
were always trying to calculate the disk usage for UID 0, which
forced us back into the slow-path.)

Bug: 36032444, 35706513
Test: runtest -x frameworks/base/services/tests/servicestests/src/com/android/server/pm/InstallerTest.java
Change-Id: I1ca55e2b7670678ed55798e2e06857d727ce2487
parent bd5e5e0d

services/core/java/com/android/server/pm/Installer.java

+4 −0
Original line number Diff line number Diff line
@@ -121,6 +121,10 @@ public class Installer extends SystemService { 


        if (binder != null) {

            mInstalld = IInstalld.Stub.asInterface(binder);

            try {

                invalidateMounts();

            } catch (InstallerException ignored) {

            }

        } else {

            Slog.w(TAG, "installd not found; trying again");

            BackgroundThread.getHandler().postDelayed(() -> {

services/usage/java/com/android/server/usage/StorageStatsService.java

+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ public class StorageStatsService extends IStorageStatsManager.Stub { 
        }



        final int userId = UserHandle.getUserId(uid);

        final int appId = UserHandle.getUserId(uid);

        final int appId = UserHandle.getAppId(uid);



        final String[] packageNames = mPackage.getPackagesForUid(uid);

        final long[] ceDataInodes = new long[packageNames.length];