diff options
| author | Marco Nelissen <marcone@google.com> | 2013-12-11 22:42:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-12-11 22:42:02 +0000 |
| commit | 09cee9d21f201b75241f6171728c3afb0e7b3139 (patch) | |
| tree | d5f18c571fcd6b9ee6fe6aa0f1f4d4c232aba159 /core/java/android/os | |
| parent | 44252e11b2097d2b647ec1cbd3ab8ec5f713ee75 (diff) | |
| parent | 4f6a139493e922f2db5e4ee7bb5364e4f8487322 (diff) | |
| download | frameworks_base-09cee9d21f201b75241f6171728c3afb0e7b3139.zip frameworks_base-09cee9d21f201b75241f6171728c3afb0e7b3139.tar.gz frameworks_base-09cee9d21f201b75241f6171728c3afb0e7b3139.tar.bz2 | |
am 4f6a1394: am c680bab3: am 69b46707: am ce3bd309: Merge "Parse UUID string with Long.parseLong"
* commit '4f6a139493e922f2db5e4ee7bb5364e4f8487322':
Parse UUID string with Long.parseLong
Diffstat (limited to 'core/java/android/os')
| -rw-r--r-- | core/java/android/os/storage/StorageVolume.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/os/storage/StorageVolume.java b/core/java/android/os/storage/StorageVolume.java index 0285cb9..06565f1 100644 --- a/core/java/android/os/storage/StorageVolume.java +++ b/core/java/android/os/storage/StorageVolume.java @@ -216,7 +216,7 @@ public class StorageVolume implements Parcelable { return -1; } try { - return Integer.parseInt(mUuid.replace("-", ""), 16); + return (int)Long.parseLong(mUuid.replace("-", ""), 16); } catch (NumberFormatException e) { return -1; } |