Initialize volumes before registering listener

If we get a listener event before volumes are
initialized, it could cause a NPE.

Bug: 73656609
Test: passes
Change-Id: Id5aabc75e2e0ad320cedba1759a346715bdecf1d

1 files changed, 4 insertions, 3 deletions

diff --git a/src/com/android/providers/media/MtpService.java b/src/com/android/providers/media/MtpService.java
index 072001019..d559b2baa 100644
--- a/src/com/android/providers/media/MtpService.java
+++ b/src/com/android/providers/media/MtpService.java
@@ -114,6 +114,9 @@ public class MtpService extends Service {
 
     @Override
     public void onCreate() {
+        mVolumes = StorageManager.getVolumeList(getUserId(), 0);
+        mVolumeMap = new HashMap<>();
+
         mStorageManager = this.getSystemService(StorageManager.class);
         mStorageManager.registerListener(mStorageEventListener);
     }
@@ -130,11 +133,9 @@ public class MtpService extends Service {
 
     @Override
     public synchronized int onStartCommand(Intent intent, int flags, int startId) {
-        UserHandle user = new UserHandle(ActivityManager.getCurrentUser());
         mUnlocked = intent.getBooleanExtra(UsbManager.USB_DATA_UNLOCKED, false);
         mPtpMode = intent.getBooleanExtra(UsbManager.USB_FUNCTION_PTP, false);
-        mVolumes = StorageManager.getVolumeList(getUserId(), 0);
-        mVolumeMap = new HashMap<>();
+
         for (StorageVolume v : mVolumes) {
             if (v.getState().equals(Environment.MEDIA_MOUNTED)) {
                 mVolumeMap.put(v.getPath(), v);