Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply fixes for EfficientStrings.

Browse Source 
Refactoring to avoid StringBuffer synchronization overhead.

Bug: 170978902
Test: none
Exempt-From-Owner-Approval: trivial refactoring
Change-Id: Ibf843ed780c1202d5d96a11eaca889e592f19263
This commit is contained in:
Jeff Sharkey
2020-10-17 21:20:13 -06:00
parent f18719bb73
commit c603ca2dd8
17 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/NotificationChannel.java
View File

@@ -1144,7 +1144,7 @@ public final class NotificationChannel implements Parcelable {
}
private static String longArrayToString(long[] values) {
StringBuffer sb = new StringBuffer();
StringBuilder sb = new StringBuilder();
if (values != null && values.length > 0) {
for (int i = 0; i < values.length - 1; i++) {
sb.append(values[i]).append(DELIMITER);

2
core/java/android/content/SyncResult.java
View File

@@ -292,7 +292,7 @@ public final class SyncResult implements Parcelable {
* @return debugging string.
*/
public String toDebugString() {
StringBuffer sb = new StringBuffer();
StringBuilder sb = new StringBuilder();
if (fullSyncRequested) {
sb.append("f1");

2
core/java/android/hardware/hdmi/HdmiDeviceInfo.java
View File

@@ -463,7 +463,7 @@ public class HdmiDeviceInfo implements Parcelable {
@NonNull
@Override
public String toString() {
StringBuffer s = new StringBuffer();
StringBuilder s = new StringBuilder();
switch (mHdmiDeviceType) {
case HDMI_DEVICE_TYPE_CEC:
s.append("CEC: ");

2
core/java/android/hardware/hdmi/HdmiPortInfo.java
View File

@@ -169,7 +169,7 @@ public final class HdmiPortInfo implements Parcelable {
@NonNull
@Override
public String toString() {
StringBuffer s = new StringBuffer();
StringBuilder s = new StringBuilder();
s.append("port_id: ").append(mId).append(", ");
s.append("type: ").append((mType == PORT_INPUT) ? "HDMI_IN" : "HDMI_OUT").append(", ");
s.append("address: ").append(String.format("0x%04x", mAddress)).append(", ");

6
core/java/android/os/Debug.java
View File

@@ -2468,7 +2468,7 @@ public final class Debug
@UnsupportedAppUsage
public static String getCallers(final int depth) {
final StackTraceElement[] callStack = Thread.currentThread().getStackTrace();
StringBuffer sb = new StringBuffer();
StringBuilder sb = new StringBuilder();
for (int i = 0; i < depth; i++) {
sb.append(getCaller(callStack, i)).append(" ");
}
@@ -2483,7 +2483,7 @@ public final class Debug
*/
public static String getCallers(final int start, int depth) {
final StackTraceElement[] callStack = Thread.currentThread().getStackTrace();
StringBuffer sb = new StringBuffer();
StringBuilder sb = new StringBuilder();
depth += start;
for (int i = start; i < depth; i++) {
sb.append(getCaller(callStack, i)).append(" ");
@@ -2501,7 +2501,7 @@ public final class Debug
*/
public static String getCallers(final int depth, String linePrefix) {
final StackTraceElement[] callStack = Thread.currentThread().getStackTrace();
StringBuffer sb = new StringBuffer();
StringBuilder sb = new StringBuilder();
for (int i = 0; i < depth; i++) {
sb.append(linePrefix).append(getCaller(callStack, i)).append("\n");
}

4
core/java/android/util/proto/EncodedBuffer.java
View File

@@ -648,7 +648,7 @@ public final class EncodedBuffer {
* Print the internal buffer chunks.
*/
private static int dumpByteString(String tag, String prefix, int start, byte[] buf) {
StringBuffer sb = new StringBuffer();
StringBuilder sb = new StringBuilder();
final int length = buf.length;
final int lineLen = 16;
int i;
@@ -656,7 +656,7 @@ public final class EncodedBuffer {
if (i % lineLen == 0) {
if (i != 0) {
Log.d(tag, sb.toString());
sb = new StringBuffer();
sb = new StringBuilder();
}
sb.append(prefix);
sb.append('[');

2
services/core/java/com/android/server/NsdService.java
View File

@@ -824,7 +824,7 @@ public class NsdService extends INsdManager.Stub {
@Override
public String toString() {
StringBuffer sb = new StringBuffer();
StringBuilder sb = new StringBuilder();
sb.append("mChannel ").append(mChannel).append("\n");
sb.append("mMessenger ").append(mMessenger).append("\n");
sb.append("mResolvedService ").append(mResolvedService).append("\n");

2
services/core/java/com/android/server/WiredAccessoryManager.java
View File

@@ -319,7 +319,7 @@ final class WiredAccessoryManager implements WiredAccessoryCallbacks {
}
private String switchCodeToString(int switchValues, int switchMask) {
StringBuffer sb = new StringBuffer();
StringBuilder sb = new StringBuilder();
if ((switchMask & SW_HEADPHONE_INSERT_BIT) != 0 &&
(switchValues & SW_HEADPHONE_INSERT_BIT) != 0) {
sb.append("SW_HEADPHONE_INSERT ");

2
services/core/java/com/android/server/display/AutomaticBrightnessController.java
View File

@@ -1051,7 +1051,7 @@ class AutomaticBrightnessController {
@Override
public String toString() {
StringBuffer buf = new StringBuffer();
StringBuilder buf = new StringBuilder();
buf.append('[');
for (int i = 0; i < mCount; i++) {
final long next = i + 1 < mCount ? getTime(i + 1) : SystemClock.uptimeMillis();

2
services/core/java/com/android/server/display/utils/History.java
View File

@@ -83,7 +83,7 @@ public class History {
* @return The buffer as string.
*/
public String toString() {
StringBuffer sb = new StringBuffer();
StringBuilder sb = new StringBuilder();
sb.append("[");
for (int i = 0; i < mCount; i++) {
final int index = (mStart + i) % mSize;

2
services/core/java/com/android/server/display/utils/RollingBuffer.java
View File

@@ -136,7 +136,7 @@ public class RollingBuffer {
* @return The buffer as string.
*/
public String toString() {
StringBuffer sb = new StringBuffer();
StringBuilder sb = new StringBuilder();
sb.append("[");
for (int i = 0; i < mCount; i++) {
final int index = offsetOf(i);

2
services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java
View File

@@ -127,7 +127,7 @@ abstract class HdmiCecLocalDevice {
@Override
public String toString() {
StringBuffer s = new StringBuffer();
StringBuilder s = new StringBuilder();
String logicalAddressString =
(logicalAddress == Constants.ADDR_INVALID)
? "invalid"

2
services/core/java/com/android/server/hdmi/HdmiCecMessage.java
View File

@@ -111,7 +111,7 @@ public final class HdmiCecMessage {
@Override
public String toString() {
StringBuffer s = new StringBuffer();
StringBuilder s = new StringBuilder();
s.append(String.format("<%s> %X%X:%02X",
opcodeToString(mOpcode), mSource, mDestination, mOpcode));
if (mParams.length > 0) {

2
services/core/java/com/android/server/input/InputShellCommand.java
View File

@@ -215,7 +215,7 @@ public class InputShellCommand extends ShellCommand {
* @param text is a string of characters you want to input to the device.
*/
private void sendText(int source, final String text, int displayId) {
final StringBuffer buff = new StringBuffer(text);
final StringBuilder buff = new StringBuilder(text);
boolean escapeFlag = false;
for (int i = 0; i < buff.length(); i++) {
if (escapeFlag) {

2
services/core/java/com/android/server/media/MediaSessionStack.java
View File

@@ -416,7 +416,7 @@ class MediaSessionStack {
// Code copied from android.os.Debug#getCallers(int)
private static String getCallers(final int depth) {
final StackTraceElement[] callStack = Thread.currentThread().getStackTrace();
StringBuffer sb = new StringBuffer();
StringBuilder sb = new StringBuilder();
for (int i = 0; i < depth; i++) {
sb.append(getCaller(callStack, i)).append(" ");
}

2
services/core/java/com/android/server/pm/PackageSignatures.java
View File

@@ -309,7 +309,7 @@ class PackageSignatures {
@Override
public String toString() {
StringBuffer buf = new StringBuffer(128);
StringBuilder buf = new StringBuilder(128);
buf.append("PackageSignatures{");
buf.append(Integer.toHexString(System.identityHashCode(this)));
buf.append(" version:");

10
services/core/java/com/android/server/pm/PackageUsage.java
View File

@@ -97,7 +97,7 @@ class PackageUsage extends AbstractStatsBase<Map<String, PackageSetting>> {
BufferedInputStream in = null;
try {
in = new BufferedInputStream(file.openRead());
StringBuffer sb = new StringBuffer();
StringBuilder sb = new StringBuilder();
String firstLine = readLine(in, sb);
if (firstLine == null) {
@@ -117,7 +117,7 @@ class PackageUsage extends AbstractStatsBase<Map<String, PackageSetting>> {
}
private void readVersion0LP(Map<String, PackageSetting> pkgSettings, InputStream in,
StringBuffer sb, String firstLine)
StringBuilder sb, String firstLine)
throws IOException {
// Initial version of the file had no version number and stored one
// package-timestamp pair per line.
@@ -145,7 +145,7 @@ class PackageUsage extends AbstractStatsBase<Map<String, PackageSetting>> {
}
private void readVersion1LP(Map<String, PackageSetting> pkgSettings, InputStream in,
StringBuffer sb) throws IOException {
StringBuilder sb) throws IOException {
// Version 1 of the file started with the corresponding version
// number and then stored a package name and eight timestamps per line.
String line;
@@ -178,11 +178,11 @@ class PackageUsage extends AbstractStatsBase<Map<String, PackageSetting>> {
}
}
private String readLine(InputStream in, StringBuffer sb) throws IOException {
private String readLine(InputStream in, StringBuilder sb) throws IOException {
return readToken(in, sb, '\n');
}
private String readToken(InputStream in, StringBuffer sb, char endOfToken)
private String readToken(InputStream in, StringBuilder sb, char endOfToken)
throws IOException {
sb.setLength(0);
while (true) {