diff options
| author | Jeff Brown <jeffbrown@google.com> | 2010-04-20 17:54:59 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-20 17:54:59 -0700 |
| commit | ccc96754c5c6e31d6f782c3adeb06ad1694221d8 (patch) | |
| tree | 35ff62e48ebe6c9705119fffe5ba01cb8dab3a80 | |
| parent | 9127d9a5fd95d7454a10d44acb79079720f6bb91 (diff) | |
| parent | 22caecda8a24c971972d78a112279c48f242d529 (diff) | |
| download | frameworks_base-ccc96754c5c6e31d6f782c3adeb06ad1694221d8.zip frameworks_base-ccc96754c5c6e31d6f782c3adeb06ad1694221d8.tar.gz frameworks_base-ccc96754c5c6e31d6f782c3adeb06ad1694221d8.tar.bz2 | |
am 22caecda: Merge "Fix PM crash due to bad array bookkeeping logic." into froyo
Merge commit '22caecda8a24c971972d78a112279c48f242d529' into froyo-plus-aosp
* commit '22caecda8a24c971972d78a112279c48f242d529':
Fix PM crash due to bad array bookkeeping logic.
| -rw-r--r-- | services/java/com/android/server/PackageManagerService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/PackageManagerService.java b/services/java/com/android/server/PackageManagerService.java index 5d0c4e3..076b0e2 100644 --- a/services/java/com/android/server/PackageManagerService.java +++ b/services/java/com/android/server/PackageManagerService.java @@ -1295,7 +1295,7 @@ class PackageManagerService extends IPackageManager.Stub { System.arraycopy(cur, 0, ret, 0, i); } if (i < (N-1)) { - System.arraycopy(cur, i, ret, i+1, N-i-1); + System.arraycopy(cur, i + 1, ret, i, N - i - 1); } return ret; } |