Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98155f5e authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Gerrit Code Review
Browse files

Merge "MountService: Handle UUID in list response" into cm-11.0

parents db1422a3 3d459f08

services/java/com/android/server/MountService.java

+5 −1
Original line number Diff line number Diff line
@@ -755,9 +755,10 @@ class MountService extends IMountService.Stub 
                            VoldResponseCode.VolumeListResult);

                    for (String volstr : vols) {

                        String[] tok = volstr.split(" ");

                        // FMT: <label> <mountpoint> <state>

                        // FMT: <label> <mountpoint> <state> <uuid>

                        String path = tok[1];

                        String state = Environment.MEDIA_REMOVED;

                        String uuid = tok[3];



                        final StorageVolume volume;

                        synchronized (mVolumesLock) {
@@ -782,6 +783,9 @@ class MountService extends IMountService.Stub 
                        if (state != null) {

                            if (DEBUG_EVENTS) Slog.i(TAG, "Updating valid state " + state);

                            updatePublicVolumeState(volume, state);

                            if (uuid != "-") {

                                volume.setUuid(uuid);

                            }

                        }

                    }

                } catch (Exception e) {