From 6112860c5c0bc5ed49c3ecece6229a0db28ab80c Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Thu, 26 Jan 2017 17:07:35 -0700
Subject: [PATCH] Unhide ApplicationInfo.volumeUuid.

Apps need it to interact with the new StorageStatsManager APIs.

Test: builds, boots
Bug: 34723750
Change-Id: I274d5bd425cd401e10647959ba18f9956628d810
---
 api/current.txt                                      | 1 +
 api/system-current.txt                               | 1 +
 api/test-current.txt                                 | 1 +
 core/java/android/app/usage/StorageStatsManager.java | 3 +++
 core/java/android/content/pm/ApplicationInfo.java    | 7 ++++++-
 5 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/api/current.txt b/api/current.txt
index 56fedf6dbe434..f4a0050003ab6 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -9790,6 +9790,7 @@ package android.content.pm {
     field public int theme;
     field public int uiOptions;
     field public int uid;
+    field public java.lang.String volumeUuid;
   }
 
   public static class ApplicationInfo.DisplayNameComparator implements java.util.Comparator {
diff --git a/api/system-current.txt b/api/system-current.txt
index b4a374ffc11d0..8af31bc44ae67 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -10209,6 +10209,7 @@ package android.content.pm {
     field public int theme;
     field public int uiOptions;
     field public int uid;
+    field public java.lang.String volumeUuid;
   }
 
   public static class ApplicationInfo.DisplayNameComparator implements java.util.Comparator {
diff --git a/api/test-current.txt b/api/test-current.txt
index 9b2bf2bcc17f5..7619ecc4a4003 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -9818,6 +9818,7 @@ package android.content.pm {
     field public int theme;
     field public int uiOptions;
     field public int uid;
+    field public java.lang.String volumeUuid;
   }
 
   public static class ApplicationInfo.DisplayNameComparator implements java.util.Comparator {
diff --git a/core/java/android/app/usage/StorageStatsManager.java b/core/java/android/app/usage/StorageStatsManager.java
index 695994b4eae35..9d30771aaeba3 100644
--- a/core/java/android/app/usage/StorageStatsManager.java
+++ b/core/java/android/app/usage/StorageStatsManager.java
@@ -18,6 +18,7 @@ package android.app.usage;
 
 import android.annotation.WorkerThread;
 import android.content.Context;
+import android.content.pm.ApplicationInfo;
 import android.os.RemoteException;
 import android.os.UserHandle;
 
@@ -99,6 +100,8 @@ public class StorageStatsManager {
      * @param volumeUuid the UUID of the storage volume you're interested in, or
      *            {@code null} to specify the default internal storage.
      * @param uid the UID you're interested in.
+     * @see ApplicationInfo#volumeUuid
+     * @see ApplicationInfo#uid
      */
     @WorkerThread
     public StorageStats queryStatsForUid(String volumeUuid, int uid) {
diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java
index 3d9ba96b6795d..ec74617211412 100644
--- a/core/java/android/content/pm/ApplicationInfo.java
+++ b/core/java/android/content/pm/ApplicationInfo.java
@@ -596,8 +596,13 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable {
      */
     public int largestWidthLimitDp = 0;
 
-    /** {@hide} */
+    /**
+     * UUID of the storage volume on which this application is being hosted. For
+     * apps hosted on the default internal storage at
+     * {@link Environment#getDataDirectory()}, the UUID value is {@code null}.
+     */
     public String volumeUuid;
+
     /** {@hide} */
     public String scanSourceDir;
     /** {@hide} */