diff options
| author | mikaelpeltier <mikaelpeltier@google.com> | 2015-03-02 10:17:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-02 10:17:49 +0000 |
| commit | 9c56ae98733d4e778567f31a5b43de8cdcf0490a (patch) | |
| tree | 2672518c398e93180d551dc22089702a407aacb6 /sched | |
| parent | 524b31d204fb25ad4d822bf3999929e597f75fd6 (diff) | |
| parent | a74ee34d61c648f948405566f204829b958d07fd (diff) | |
| download | toolchain_jack-9c56ae98733d4e778567f31a5b43de8cdcf0490a.zip toolchain_jack-9c56ae98733d4e778567f31a5b43de8cdcf0490a.tar.gz toolchain_jack-9c56ae98733d4e778567f31a5b43de8cdcf0490a.tar.bz2 | |
Merge "Use location from dir rather than from root" into ub-jack
Diffstat (limited to 'sched')
| -rw-r--r-- | sched/src/com/android/sched/vfs/CachedDirectFS.java | 2 | ||||
| -rw-r--r-- | sched/src/com/android/sched/vfs/DirectFS.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sched/src/com/android/sched/vfs/CachedDirectFS.java b/sched/src/com/android/sched/vfs/CachedDirectFS.java index 1c47aa6..de2deee 100644 --- a/sched/src/com/android/sched/vfs/CachedDirectFS.java +++ b/sched/src/com/android/sched/vfs/CachedDirectFS.java @@ -186,7 +186,7 @@ public class CachedDirectFS extends BaseVFS<CachedParentVDir, CachedParentVFile> @Override @Nonnull public Location getLocation() { - return root.getLocation(); + return dir.getLocation(); } @Override diff --git a/sched/src/com/android/sched/vfs/DirectFS.java b/sched/src/com/android/sched/vfs/DirectFS.java index 3de8b33..a9537f6 100644 --- a/sched/src/com/android/sched/vfs/DirectFS.java +++ b/sched/src/com/android/sched/vfs/DirectFS.java @@ -88,7 +88,7 @@ public class DirectFS extends BaseVFS<ParentVDir, ParentVFile> implements VFS { @Override @Nonnull public Location getLocation() { - return root.getLocation(); + return dir.getLocation(); } @Override |