diff options
| -rw-r--r-- | preloaded-classes | 26 | ||||
| -rw-r--r-- | services/java/com/android/server/am/ActivityManagerService.java | 10 |
2 files changed, 9 insertions, 27 deletions
diff --git a/preloaded-classes b/preloaded-classes index 45d27eeddbb4..064ca3a12d75 100644 --- a/preloaded-classes +++ b/preloaded-classes @@ -1671,7 +1671,6 @@ com.android.org.bouncycastle.jce.provider.BouncyCastleProvider$1 com.android.org.bouncycastle.jce.provider.BouncyCastleProviderConfiguration com.android.org.bouncycastle.jce.provider.CertBlacklist com.android.org.bouncycastle.jce.provider.CertPathValidatorUtilities -com.android.org.bouncycastle.jce.provider.JDKKeyStore com.android.org.bouncycastle.jce.provider.PKIXCRLUtil com.android.org.bouncycastle.jce.provider.PKIXCertPathValidatorSpi com.android.org.bouncycastle.jce.provider.PKIXNameConstraintValidator @@ -2026,7 +2025,6 @@ java.net.Proxy$Type java.net.ProxySelector java.net.ProxySelectorImpl java.net.ResponseCache -java.net.ResponseSource java.net.Socket java.net.SocketAddress java.net.SocketImpl @@ -2463,7 +2461,6 @@ libcore.io.StructLinger libcore.io.StructPasswd libcore.io.StructPollfd libcore.io.StructStat -libcore.io.StructStatFs libcore.io.StructTimeval libcore.io.StructUcred libcore.io.StructUtsname @@ -2471,26 +2468,8 @@ libcore.math.MathUtils libcore.net.MimeUtils libcore.net.RawSocket libcore.net.UriCodec -libcore.net.http.AbstractHttpInputStream -libcore.net.http.FixedLengthInputStream -libcore.net.http.HeaderParser$CacheControlHandler -libcore.net.http.HttpConnection -libcore.net.http.HttpConnection$Address -libcore.net.http.HttpConnectionPool libcore.net.http.HttpDate libcore.net.http.HttpDate$1 -libcore.net.http.HttpEngine -libcore.net.http.HttpEngine$1 -libcore.net.http.HttpHandler -libcore.net.http.HttpURLConnectionImpl -libcore.net.http.HttpURLConnectionImpl$Retry -libcore.net.http.HttpsHandler -libcore.net.http.RawHeaders -libcore.net.http.RawHeaders$1 -libcore.net.http.RequestHeaders -libcore.net.http.RequestHeaders$1 -libcore.net.http.ResponseHeaders -libcore.net.http.ResponseHeaders$1 libcore.net.url.FileHandler libcore.net.url.FileURLConnection libcore.net.url.JarHandler @@ -2516,9 +2495,6 @@ org.apache.harmony.dalvik.NativeTestTarget org.apache.harmony.dalvik.ddmc.Chunk org.apache.harmony.dalvik.ddmc.ChunkHandler org.apache.harmony.dalvik.ddmc.DdmServer -org.apache.harmony.lang.annotation.AnnotationFactory -org.apache.harmony.lang.annotation.AnnotationMember -org.apache.harmony.lang.annotation.AnnotationMember$DefaultValues org.apache.harmony.luni.internal.util.TimezoneGetter org.apache.harmony.security.asn1.ASN1Any org.apache.harmony.security.asn1.ASN1BitString @@ -2566,8 +2542,6 @@ org.apache.harmony.security.fortress.Services org.apache.harmony.security.provider.cert.DRLCertFactory org.apache.harmony.security.provider.cert.X509CertImpl org.apache.harmony.security.provider.crypto.CryptoProvider -org.apache.harmony.security.provider.crypto.RandomBitsSupplier -org.apache.harmony.security.provider.crypto.SHA1_Data org.apache.harmony.security.utils.AlgNameMapper org.apache.harmony.security.utils.ObjectIdentifier org.apache.harmony.security.x501.AttributeTypeAndValue diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index 3d0fe0f33087..c7b2213f94a7 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -11531,7 +11531,11 @@ public final class ActivityManagerService extends ActivityManagerNative pw.print(" "); pw.print(unshared); pw.print(" kB unshared; "); pw.print(voltile); pw.println(" kB volatile"); } - pw.print(" TUNING: "); + pw.print(" Tuning: "); + pw.print(ActivityManager.staticGetMemoryClass()); + pw.print(" (large "); + pw.print(ActivityManager.staticGetLargeMemoryClass()); + pw.print("), oom "); pw.print(mProcessList.getMemLevel(ProcessList.CACHED_APP_MAX_ADJ)/1024); pw.print(" kB"); if (ActivityManager.isLowRamDeviceStatic()) { @@ -11546,6 +11550,10 @@ public final class ActivityManagerService extends ActivityManagerNative pw.print(shared); pw.print(","); pw.print(unshared); pw.print(","); pw.println(voltile); pw.print("tuning,"); + pw.print(ActivityManager.staticGetMemoryClass()); + pw.print(','); + pw.print(ActivityManager.staticGetLargeMemoryClass()); + pw.print(','); pw.print(mProcessList.getMemLevel(ProcessList.CACHED_APP_MAX_ADJ)/1024); if (ActivityManager.isLowRamDeviceStatic()) { pw.print(",low-ram"); |