Sync sample prebuilts for mnc-dev
Synced to //developers/samples/android commit 89d2da0f4b. Change-Id: I904da8210517922531d1ac1ba1e747f1c7bf00b3
This commit is contained in:
@@ -325,8 +325,8 @@ public class MainActivity extends Activity implements DataApi.DataListener,
|
||||
|
||||
@Override
|
||||
public void onDataChanged(DataEventBuffer dataEvents) {
|
||||
// Need to freeze the dataEvents so they will exist later on the UI thread
|
||||
final List<DataEvent> events = FreezableUtils.freezeIterable(dataEvents);
|
||||
dataEvents.close();
|
||||
runOnUiThread(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
@@ -445,16 +445,17 @@ public class MainActivity extends Activity implements DataApi.DataListener,
|
||||
.setResultCallback(new ResultCallback<DataItemBuffer>() {
|
||||
@Override
|
||||
public void onResult(DataItemBuffer result) {
|
||||
if (result.getStatus().isSuccess()) {
|
||||
List<DataItem> dataItemList = FreezableUtils.freezeIterable(result);
|
||||
result.close();
|
||||
resetDataItems(dataItemList);
|
||||
} else {
|
||||
if (Log.isLoggable(TAG, Log.DEBUG)) {
|
||||
Log.d(TAG, "Reset quiz: failed to get Data Items to reset");
|
||||
try {
|
||||
if (result.getStatus().isSuccess()) {
|
||||
resetDataItems(result);
|
||||
} else {
|
||||
if (Log.isLoggable(TAG, Log.DEBUG)) {
|
||||
Log.d(TAG, "Reset quiz: failed to get Data Items to reset");
|
||||
}
|
||||
}
|
||||
} finally {
|
||||
result.release();
|
||||
}
|
||||
result.close();
|
||||
}
|
||||
});
|
||||
} else {
|
||||
@@ -467,7 +468,7 @@ public class MainActivity extends Activity implements DataApi.DataListener,
|
||||
mNumSkipped = 0;
|
||||
}
|
||||
|
||||
private void resetDataItems(List<DataItem> dataItemList) {
|
||||
private void resetDataItems(DataItemBuffer dataItemList) {
|
||||
if (mGoogleApiClient.isConnected()) {
|
||||
for (final DataItem dataItem : dataItemList) {
|
||||
final Uri dataItemUri = dataItem.getUri();
|
||||
@@ -521,19 +522,23 @@ public class MainActivity extends Activity implements DataApi.DataListener,
|
||||
.setResultCallback(new ResultCallback<DataItemBuffer>() {
|
||||
@Override
|
||||
public void onResult(DataItemBuffer result) {
|
||||
if (result.getStatus().isSuccess()) {
|
||||
List<Uri> dataItemUriList = new ArrayList<Uri>();
|
||||
for (final DataItem dataItem : result) {
|
||||
dataItemUriList.add(dataItem.getUri());
|
||||
}
|
||||
result.close();
|
||||
deleteDataItems(dataItemUriList);
|
||||
} else {
|
||||
if (Log.isLoggable(TAG, Log.DEBUG)) {
|
||||
Log.d(TAG, "Clear quiz: failed to get Data Items for deletion");
|
||||
try {
|
||||
if (result.getStatus().isSuccess()) {
|
||||
List<Uri> dataItemUriList = new ArrayList<Uri>();
|
||||
for (final DataItem dataItem : result) {
|
||||
dataItemUriList.add(dataItem.getUri());
|
||||
}
|
||||
deleteDataItems(dataItemUriList);
|
||||
} else {
|
||||
if (Log.isLoggable(TAG, Log.DEBUG)) {
|
||||
Log.d(TAG, "Clear quiz: failed to get Data Items for "
|
||||
+ "deletion");
|
||||
|
||||
}
|
||||
}
|
||||
} finally {
|
||||
result.release();
|
||||
}
|
||||
result.close();
|
||||
}
|
||||
});
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user