From 7d3af808c1563fc305caf95ce969991ef6257c4d Mon Sep 17 00:00:00 2001
From: Daniel Nishi <dhnishi@google.com>
Date: Mon, 9 Jan 2017 12:35:24 -0800
Subject: [PATCH] Add findEmulatedForPrivate to the StorageVolumeProvider.

The improves testability within Settings.

Bug: 33199077
Test: Settings Robo Tests
Change-Id: Ib3cc2f73128223017cc392a5e09686eb23da2b1b
---
 .../settingslib/deviceinfo/StorageManagerVolumeProvider.java | 5 +++++
 .../settingslib/deviceinfo/StorageVolumeProvider.java        | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/StorageManagerVolumeProvider.java b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/StorageManagerVolumeProvider.java
index de762791a0a91..320494c68faf9 100644
--- a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/StorageManagerVolumeProvider.java
+++ b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/StorageManagerVolumeProvider.java
@@ -41,4 +41,9 @@ public class StorageManagerVolumeProvider implements StorageVolumeProvider {
     public List<VolumeInfo> getVolumes() {
         return mStorageManager.getVolumes();
     }
+
+    @Override
+    public VolumeInfo findEmulatedForPrivate(VolumeInfo privateVolume) {
+        return mStorageManager.findEmulatedForPrivate(privateVolume);
+    }
 }
diff --git a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/StorageVolumeProvider.java b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/StorageVolumeProvider.java
index 95bb18d191883..646c42f05a8e1 100644
--- a/packages/SettingsLib/src/com/android/settingslib/deviceinfo/StorageVolumeProvider.java
+++ b/packages/SettingsLib/src/com/android/settingslib/deviceinfo/StorageVolumeProvider.java
@@ -34,4 +34,9 @@ public interface StorageVolumeProvider {
      * Returns a list of VolumeInfos for the device.
      */
     List<VolumeInfo> getVolumes();
+
+    /**
+     * Returns the emulated volume for a given private volume.
+     */
+    VolumeInfo findEmulatedForPrivate(VolumeInfo privateVolume);
 }