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

Merge "Update preloaded-classes for Honeycomb." into honeycomb

Browse Source
This commit is contained in:
Jesse Wilson
2011-01-21 19:29:22 -08:00
committed by Android (Google) Code Review
parent d8ea604b7e 8068618ebe
commit 3a27acef4e
2 changed files with 275 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

427
preloaded-classes
View File

File diff suppressed because it is too large Load Diff

22
tools/preload/Record.java
View File

@@ -30,6 +30,8 @@ class Record {
"com.google.android.apps.maps\\u003Adriveabout", "com.google.android.apps.maps\\u003Adriveabout",
"com.google.android.apps.maps:LocationFriendService", "com.google.android.apps.maps:LocationFriendService",
"com.google.android.apps.maps\\u003ALocationFriendService", "com.google.android.apps.maps\\u003ALocationFriendService",
"com.google.android.apps.maps:NetworkLocationService",
"com.google.android.apps.maps\\u003ANetworkLocationService",
}; };
enum Type { enum Type {
@@ -69,7 +71,7 @@ class Record {
/** Record time (ns). */ /** Record time (ns). */
final long time; final long time;
/** Source file line# */ /** Source file line# */
int sourceLineNumber; int sourceLineNumber;
@@ -91,7 +93,7 @@ class Record {
for (int i = 0; i < REPLACE_CLASSES.length; i+= 2) { for (int i = 0; i < REPLACE_CLASSES.length; i+= 2) {
line = line.replace(REPLACE_CLASSES[i], REPLACE_CLASSES[i+1]); line = line.replace(REPLACE_CLASSES[i], REPLACE_CLASSES[i+1]);
} }
line = line.substring(1); line = line.substring(1);
String[] parts = line.split(":"); String[] parts = line.split(":");
@@ -106,12 +108,12 @@ class Record {
time = Long.parseLong(parts[6]); time = Long.parseLong(parts[6]);
} }
/** /**
* Decode any escaping that may have been written to the log line. * Decode any escaping that may have been written to the log line.
* *
* Supports unicode-style escaping: \\uXXXX = character in hex * Supports unicode-style escaping: \\uXXXX = character in hex
* *
* @param rawField the field as it was written into the log * @param rawField the field as it was written into the log
* @result the same field with any escaped characters replaced * @result the same field with any escaped characters replaced
*/ */
@@ -122,11 +124,11 @@ class Record {
String before = result.substring(0, offset); String before = result.substring(0, offset);
String escaped = result.substring(offset+2, offset+6); String escaped = result.substring(offset+2, offset+6);
String after = result.substring(offset+6); String after = result.substring(offset+6);
result = String.format("%s%c%s", before, Integer.parseInt(escaped, 16), after); result = String.format("%s%c%s", before, Integer.parseInt(escaped, 16), after);
// find another but don't recurse // find another but don't recurse
offset = result.indexOf("\\u", offset + 1); offset = result.indexOf("\\u", offset + 1);
} }
return result; return result;
} }
@@ -135,13 +137,13 @@ class Record {
* Converts a VM-style name to a language-style name. * Converts a VM-style name to a language-style name.
*/ */
String vmTypeToLanguage(String typeName) { String vmTypeToLanguage(String typeName) {
// if the typename is (null), just return it as-is. This is probably in dexopt and // if the typename is (null), just return it as-is. This is probably in dexopt and
// will be discarded anyway. NOTE: This corresponds to the case in dalvik/vm/oo/Class.c // will be discarded anyway. NOTE: This corresponds to the case in dalvik/vm/oo/Class.c
// where dvmLinkClass() returns false and we clean up and exit. // where dvmLinkClass() returns false and we clean up and exit.
if ("(null)".equals(typeName)) { if ("(null)".equals(typeName)) {
return typeName; return typeName;
} }
if (!typeName.startsWith("L") || !typeName.endsWith(";") ) { if (!typeName.startsWith("L") || !typeName.endsWith(";") ) {
throw new AssertionError("Bad name: " + typeName + " in line " + sourceLineNumber); throw new AssertionError("Bad name: " + typeName + " in line " + sourceLineNumber);
} }