OSDN Git Service
(root)
/
android-x86
/
packages-apps-Launcher3.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
resolved conflicts for merge of 13ef17a3 to mnc-dr-dev
[android-x86/packages-apps-Launcher3.git]
/
src
/
com
/
android
/
launcher3
/
MemoryTracker.java
diff --git
a/src/com/android/launcher3/MemoryTracker.java
b/src/com/android/launcher3/MemoryTracker.java
index
2d37c80
..
067a50f
100644
(file)
--- a/
src/com/android/launcher3/MemoryTracker.java
+++ b/
src/com/android/launcher3/MemoryTracker.java
@@
-101,7
+101,7
@@
public class MemoryTracker extends Service {
public void startTrackingProcess(int pid, String name, long start) {
synchronized (mLock) {
- final Long lpid =
new Long
(pid);
+ final Long lpid =
Long.valueOf
(pid);
if (mPids.contains(lpid)) return;