am 02062f44
: Merge change 5391 into donut
Merge commit '02062f44ff929cf635d0523f9f93ffa69d182899' * commit '02062f44ff929cf635d0523f9f93ffa69d182899': Fix an NPE.
This commit is contained in:
committed by
The Android Open Source Project
commit
a4e9f21075
@@ -575,7 +575,7 @@ public class PowerUsageSummary extends PreferenceActivity implements Runnable {
|
||||
//name = Integer.toString(uid);
|
||||
if (uid == 0) {
|
||||
name = getResources().getString(R.string.process_kernel_label);
|
||||
} else if (name.equals("mediaserver")) {
|
||||
} else if ("mediaserver".equals(name)) {
|
||||
name = getResources().getString(R.string.process_mediaserver_label);
|
||||
}
|
||||
return;
|
||||
@@ -694,4 +694,4 @@ public class PowerUsageSummary extends PreferenceActivity implements Runnable {
|
||||
super.handleMessage(msg);
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user