diff options
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 2 | ||||
| -rw-r--r-- | core/java/android/content/res/ResourcesImpl.java | 21 |
2 files changed, 18 insertions, 5 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 5d2a26e13ee7..4c54b03bd6d6 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -303,7 +303,7 @@ public final class ActivityThread extends ClientTransactionHandler public static final boolean DEBUG_MEMORY_TRIM = false; private static final boolean DEBUG_PROVIDER = false; public static final boolean DEBUG_ORDER = false; - private static final boolean DEBUG_APP_INFO = true; + private static final boolean DEBUG_APP_INFO = false; private static final long MIN_TIME_BETWEEN_GCS = 5*1000; /** * The delay to release the provider when it has no more references. It reduces the number of diff --git a/core/java/android/content/res/ResourcesImpl.java b/core/java/android/content/res/ResourcesImpl.java index c7790bd96c62..5e442b819774 100644 --- a/core/java/android/content/res/ResourcesImpl.java +++ b/core/java/android/content/res/ResourcesImpl.java @@ -273,14 +273,27 @@ public class ResourcesImpl { throw new NotFoundException("String resource name " + name); } + private static boolean isIntLike(@NonNull String s) { + if (s.isEmpty() || s.length() > 10) return false; + for (int i = 0, size = s.length(); i < size; i++) { + final char c = s.charAt(i); + if (c < '0' || c > '9') { + return false; + } + } + return true; + } + int getIdentifier(String name, String defType, String defPackage) { if (name == null) { throw new NullPointerException("name is null"); } - try { - return Integer.parseInt(name); - } catch (Exception e) { - // Ignore + if (isIntLike(name)) { + try { + return Integer.parseInt(name); + } catch (Exception e) { + // Ignore + } } return mAssets.getResourceIdentifier(name, defType, defPackage); } |