commit 416903e7c456bbba14776602819c0f0011b6c75d
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jan 27 01:34:36 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jan 27 01:34:40 2017 +0000
tree 72cdd5e074c80321a8ec2ab9f66b49ad4a421563
parent 8dc7ccc6e12e3e8f9271a07719c2dfeeb08a08e1
parent 6112860c5c0bc5ed49c3ecece6229a0db28ab80c

Merge "Unhide ApplicationInfo.volumeUuid."

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 54f2290..a0b2d4a 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -9791,6 +9791,7 @@
     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 {

api/system-current.txt

diff --git a/api/system-current.txt b/api/system-current.txt
index 0e7f818..c6a8a0e 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -10210,6 +10210,7 @@
     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 {

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index e5cd68a..f55ed10 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -9819,6 +9819,7 @@
     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 {

core/java/android/app/usage/StorageStatsManager.java

diff --git a/core/java/android/app/usage/StorageStatsManager.java b/core/java/android/app/usage/StorageStatsManager.java
index 695994b..9d30771 100644
--- a/core/java/android/app/usage/StorageStatsManager.java
+++ b/core/java/android/app/usage/StorageStatsManager.java
@@ -18,6 +18,7 @@
 
 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 @@
      * @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) {

core/java/android/content/pm/ApplicationInfo.java

diff --git a/core/java/android/content/pm/ApplicationInfo.java b/core/java/android/content/pm/ApplicationInfo.java
index 3d9ba96..ec74617 100644
--- a/core/java/android/content/pm/ApplicationInfo.java
+++ b/core/java/android/content/pm/ApplicationInfo.java
@@ -596,8 +596,13 @@
      */
     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} */