diff options
| author | Dianne Hackborn <hackbod@google.com> | 2013-07-29 18:11:02 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2013-07-31 13:48:39 -0700 |
| commit | a99cb5bc41d4493db84c5ee3d9123d4a99df5c53 (patch) | |
| tree | 4ae782c40eaf91498ef089fb92f52473132c530c /core/java | |
| parent | 38d4cfd4a19de35c2b16c0f64b26d4b9ed362ede (diff) | |
| download | frameworks_base-a99cb5bc41d4493db84c5ee3d9123d4a99df5c53.zip frameworks_base-a99cb5bc41d4493db84c5ee3d9123d4a99df5c53.tar.gz frameworks_base-a99cb5bc41d4493db84c5ee3d9123d4a99df5c53.tar.bz2 | |
(DO NOT MERGE) Fix pub issue #58043: Copy crash in Android 4.3...
...when clipboard listener attached
We need to clear the calling identity before dispatching change
notifications. Also make this more robust, so that in the face
of any failure we will clean up the broadcast state.
Integrated from master.
Change-Id: I05e1f76ffd486439535631fe4062dabe94bd2ccf
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/ActivityManager.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index bb9e19f..a25e311 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -16,6 +16,7 @@ package android.app; +import android.R; import com.android.internal.app.IUsageStats; import com.android.internal.os.PkgUsageStats; import com.android.internal.util.MemInfoReader; @@ -369,9 +370,9 @@ public class ActivityManager { // Really brain dead right now -- just take this from the configured // vm heap size, and assume it is in megabytes and thus ends with "m". String vmHeapSize = SystemProperties.get("dalvik.vm.heapsize", "16m"); - return Integer.parseInt(vmHeapSize.substring(0, vmHeapSize.length()-1)); + return Integer.parseInt(vmHeapSize.substring(0, vmHeapSize.length() - 1)); } - + /** * Used by persistent processes to determine if they are running on a * higher-end device so should be okay using hardware drawing acceleration |