am 0eb3e46a: am c9ff3bce: Merge "Follow RegisteredServicesCache API changes." into jb-mr1-dev

* commit '0eb3e46a49af423f5d17b81d487224dab214786f':
  Follow RegisteredServicesCache API changes.
This commit is contained in:
Jeff Sharkey
2012-10-10 08:33:33 -07:00
committed by Android Git Automerger

View File

@@ -35,6 +35,7 @@ import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.os.IBinder; import android.os.IBinder;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.UserHandle;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.AdapterView; import android.widget.AdapterView;
import android.widget.Spinner; import android.widget.Spinner;
@@ -88,14 +89,9 @@ public class SyncAdapterDriver extends Activity
mSyncAdaptersCache.setListener(this, null /* Handler */); mSyncAdaptersCache.setListener(this, null /* Handler */);
} }
protected void onDestroy() {
mSyncAdaptersCache.close();
super.onDestroy();
}
private void getSyncAdapters() { private void getSyncAdapters() {
Collection<RegisteredServicesCache.ServiceInfo<SyncAdapterType>> all = Collection<RegisteredServicesCache.ServiceInfo<SyncAdapterType>> all =
mSyncAdaptersCache.getAllServices(); mSyncAdaptersCache.getAllServices(UserHandle.myUserId());
synchronized (mSyncAdaptersLock) { synchronized (mSyncAdaptersLock) {
mSyncAdapters = new Object[all.size()]; mSyncAdapters = new Object[all.size()];
String[] names = new String[mSyncAdapters.length]; String[] names = new String[mSyncAdapters.length];
@@ -201,7 +197,7 @@ public class SyncAdapterDriver extends Activity
updateUi(); updateUi();
} }
public void onServiceChanged(SyncAdapterType type, boolean removed) { public void onServiceChanged(SyncAdapterType type, int userId, boolean removed) {
getSyncAdapters(); getSyncAdapters();
} }