commit 51673a50e3198c48dbfc56c7c567c0660f92dafa
author TreeHugger Robot <treehugger-gerrit@google.com> Sun Mar 12 04:56:11 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sun Mar 12 04:56:16 2017 +0000
tree 0b210fc128ffaad64c0710789c57b5aea92cd8d1
parent 2cfdf62ed20016c6f64bba3ce6d7ec1c446c272f
parent 82add8a7145c864ce8a604e145ed6abcaa4640b4

Merge "Fix two storage measurement bugs."

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

diff --git a/services/core/java/com/android/server/pm/Installer.java b/services/core/java/com/android/server/pm/Installer.java
index 5abdb60..7eef7ad 100644
--- a/services/core/java/com/android/server/pm/Installer.java
+++ b/services/core/java/com/android/server/pm/Installer.java
@@ -121,6 +121,10 @@
 
         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

diff --git a/services/usage/java/com/android/server/usage/StorageStatsService.java b/services/usage/java/com/android/server/usage/StorageStatsService.java
index 89e68a6..eb71590 100644
--- a/services/usage/java/com/android/server/usage/StorageStatsService.java
+++ b/services/usage/java/com/android/server/usage/StorageStatsService.java
@@ -222,7 +222,7 @@
         }
 
         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];