summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server/MountService.java
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2012-11-15 11:48:20 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-11-15 11:48:38 -0800
commitf5377a7242d71e221807150f0778a0521e1270b6 (patch)
tree32446bc945e46a62dfa0b69a1b5b94169d64fddc /services/java/com/android/server/MountService.java
parent7420ab681eaad22f4b8f884e12d3b2ce82cd203a (diff)
parent8b2c3a14603d163d7564e6f60286995079687690 (diff)
downloadframeworks_base-f5377a7242d71e221807150f0778a0521e1270b6.zip
frameworks_base-f5377a7242d71e221807150f0778a0521e1270b6.tar.gz
frameworks_base-f5377a7242d71e221807150f0778a0521e1270b6.tar.bz2
Merge "Useful annotations for code documentation." into jb-mr1.1-dev
Diffstat (limited to 'services/java/com/android/server/MountService.java')
-rw-r--r--services/java/com/android/server/MountService.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/services/java/com/android/server/MountService.java b/services/java/com/android/server/MountService.java
index aeeb4c5..ad28a36 100644
--- a/services/java/com/android/server/MountService.java
+++ b/services/java/com/android/server/MountService.java
@@ -57,6 +57,8 @@ import android.util.AttributeSet;
import android.util.Slog;
import android.util.Xml;
+import com.android.internal.annotations.GuardedBy;
+import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.app.IMediaContainerService;
import com.android.internal.util.Preconditions;
import com.android.internal.util.XmlUtils;
@@ -181,13 +183,13 @@ class MountService extends IMountService.Stub
/** When defined, base template for user-specific {@link StorageVolume}. */
private StorageVolume mEmulatedTemplate;
- // @GuardedBy("mVolumesLock")
+ @GuardedBy("mVolumesLock")
private final ArrayList<StorageVolume> mVolumes = Lists.newArrayList();
/** Map from path to {@link StorageVolume} */
- // @GuardedBy("mVolumesLock")
+ @GuardedBy("mVolumesLock")
private final HashMap<String, StorageVolume> mVolumesByPath = Maps.newHashMap();
/** Map from path to state */
- // @GuardedBy("mVolumesLock")
+ @GuardedBy("mVolumesLock")
private final HashMap<String, String> mVolumeStates = Maps.newHashMap();
private volatile boolean mSystemReady = false;
@@ -2565,7 +2567,7 @@ class MountService extends IMountService.Stub
}
}
- // @VisibleForTesting
+ @VisibleForTesting
public static String buildObbPath(final String canonicalPath, int userId, boolean forVold) {
// TODO: allow caller to provide Environment for full testing