summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-06-21 11:23:45 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2010-06-21 11:23:45 -0700
commit6c9a30045b1e6b9ef5d756e0a9657576c546c9bd (patch)
treea80b14a0c4c0b0d3014e6009e66508cdcef5966d /services
parent0fcfa0a53f92f32d50870c246763da30a106d13a (diff)
parent7d10df4e2402c55dc827cb6675a15957071c00af (diff)
downloadframeworks_base-6c9a30045b1e6b9ef5d756e0a9657576c546c9bd.zip
frameworks_base-6c9a30045b1e6b9ef5d756e0a9657576c546c9bd.tar.gz
frameworks_base-6c9a30045b1e6b9ef5d756e0a9657576c546c9bd.tar.bz2
merge from froyo-plus-aosp
Change-Id: I36dd4460cae6e3212d724e70ff1091cb791670cd
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/ProcessStats.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/ProcessStats.java b/services/java/com/android/server/ProcessStats.java
index a02c4e7..4fa89d9 100644
--- a/services/java/com/android/server/ProcessStats.java
+++ b/services/java/com/android/server/ProcessStats.java
@@ -687,7 +687,7 @@ public class ProcessStats {
break;
}
}
- return new String(mBuffer, 0, 0, i);
+ return new String(mBuffer, 0, i);
}
} catch (java.io.FileNotFoundException e) {
} catch (java.io.IOException e) {