commit 0f35d29a7e596b3984f0f2812b6c584b1fd3e168
author Jeff Sharkey <jsharkey@google.com> Mon Nov 07 23:43:43 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 07 23:43:46 2016 +0000
tree fdda4308dc38cee81a60d3f614e78e11c75202d8
parent 25cba2de54e792ea1259deebee6d59233b394430
parent 8b38d083c42e2706e1ff5a1410fa61d1f5dea3f5

Merge "Public volumes belong to a single user." into nyc-mr1-dev

packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java

diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
index 3ef9b8e..10e5dcc 100644
--- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
+++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
@@ -161,7 +161,8 @@
                     final VolumeInfo privateVol = mStorageManager.findPrivateForEmulated(volume);
                     title = mStorageManager.getBestVolumeDescription(privateVol);
                 }
-            } else if (volume.getType() == VolumeInfo.TYPE_PUBLIC) {
+            } else if (volume.getType() == VolumeInfo.TYPE_PUBLIC
+                    && volume.getMountUserId() == userId) {
                 rootId = volume.getFsUuid();
                 title = mStorageManager.getBestVolumeDescription(volume);
             } else {