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

Merge change 24002 into eclair

Browse Source 
* changes:
  Fix SparseArray accesses
This commit is contained in:
Android (Google) Code Review
2009-09-04 15:16:25 -07:00
parent 608f9f470f 360e454b2b
commit ff86d9f9dc
1 changed files with 130 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/java/android/content/SyncStorageEngine.java
View File

@@ -369,7 +369,7 @@ public class SyncStorageEngine extends Handler {
int i = mAuthorities.size(); int i = mAuthorities.size();
while (i > 0) { while (i > 0) {
i--; i--;
AuthorityInfo authority = mAuthorities.get(i); AuthorityInfo authority = mAuthorities.valueAt(i);
if (authority.authority.equals(providerName) if (authority.authority.equals(providerName)
&& authority.enabled) { && authority.enabled) {
return true; return true;
@@ -408,7 +408,7 @@ public class SyncStorageEngine extends Handler {
int i = mAuthorities.size(); int i = mAuthorities.size();
while (i > 0) { while (i > 0) {
i--; i--;
AuthorityInfo authority = mAuthorities.get(i); AuthorityInfo authority = mAuthorities.valueAt(i);
if (authority.authority.equals(providerName)) { if (authority.authority.equals(providerName)) {
return authority.syncable; return authority.syncable;
} }
@@ -581,7 +581,7 @@ public class SyncStorageEngine extends Handler {
mPendingOperations.clear(); mPendingOperations.clear();
final int N = mSyncStatus.size(); final int N = mSyncStatus.size();
for (int i=0; i<N; i++) { for (int i=0; i<N; i++) {
mSyncStatus.get(i).pending = false; mSyncStatus.valueAt(i).pending = false;
} }
writePendingOperationsLocked(); writePendingOperationsLocked();
} }
@@ -876,7 +876,7 @@ public class SyncStorageEngine extends Handler {
SyncStatusInfo best = null; SyncStatusInfo best = null;
final int N = mSyncStatus.size(); final int N = mSyncStatus.size();
for (int i=0; i<N; i++) { for (int i=0; i<N; i++) {
SyncStatusInfo cur = mSyncStatus.get(i); SyncStatusInfo cur = mSyncStatus.valueAt(i);
AuthorityInfo ainfo = mAuthorities.get(cur.authorityId); AuthorityInfo ainfo = mAuthorities.get(cur.authorityId);
if (ainfo != null && ainfo.authority.equals(authority)) { if (ainfo != null && ainfo.authority.equals(authority)) {
if (best == null) { if (best == null) {
@@ -897,7 +897,7 @@ public class SyncStorageEngine extends Handler {
synchronized (mAuthorities) { synchronized (mAuthorities) {
final int N = mSyncStatus.size(); final int N = mSyncStatus.size();
for (int i=0; i<N; i++) { for (int i=0; i<N; i++) {
SyncStatusInfo cur = mSyncStatus.get(i); SyncStatusInfo cur = mSyncStatus.valueAt(i);
AuthorityInfo ainfo = mAuthorities.get(cur.authorityId); AuthorityInfo ainfo = mAuthorities.get(cur.authorityId);
if (ainfo == null) { if (ainfo == null) {
continue; continue;
@@ -1187,7 +1187,7 @@ public class SyncStorageEngine extends Handler {
final int N = mAuthorities.size(); final int N = mAuthorities.size();
for (int i=0; i<N; i++) { for (int i=0; i<N; i++) {
AuthorityInfo authority = mAuthorities.get(i); AuthorityInfo authority = mAuthorities.valueAt(i);
out.startTag(null, "authority"); out.startTag(null, "authority");
out.attribute(null, "id", Integer.toString(authority.ident)); out.attribute(null, "id", Integer.toString(authority.ident));
out.attribute(null, "account", authority.account.name); out.attribute(null, "account", authority.account.name);
@@ -1290,7 +1290,7 @@ public class SyncStorageEngine extends Handler {
SyncStatusInfo st = null; SyncStatusInfo st = null;
while (i > 0) { while (i > 0) {
i--; i--;
st = mSyncStatus.get(i); st = mSyncStatus.valueAt(i);
if (st.authorityId == authority.ident) { if (st.authorityId == authority.ident) {
found = true; found = true;
break; break;
@@ -1333,7 +1333,7 @@ public class SyncStorageEngine extends Handler {
int i = mAuthorities.size(); int i = mAuthorities.size();
while (i > 0) { while (i > 0) {
i--; i--;
AuthorityInfo authority = mAuthorities.get(i); AuthorityInfo authority = mAuthorities.valueAt(i);
if (authority.authority.equals(provider)) { if (authority.authority.equals(provider)) {
authority.enabled = value == null || Boolean.parseBoolean(value); authority.enabled = value == null || Boolean.parseBoolean(value);
authority.syncable = 1; authority.syncable = 1;