summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Marco Nelissen <marcone@google.com> 2013-12-11 18:07:50 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2013-12-11 18:07:50 +0000
commitce3bd309b12e9552c05d5a59a06d7883618c5ca0 (patch)
treefead5614823fa2b725f992146c6cb7d0a4204d77
parentbb349cdb09d67118842fb86a0f4a8b66b5a32985 (diff)
parent17d5c1b18132e82abb1b828dcc39ca17cff35dd3 (diff)
Merge "Parse UUID string with Long.parseLong"
-rw-r--r--core/java/android/os/storage/StorageVolume.java2
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 0285cb932114..06565f1d1e4a 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;
}