Fixed some files after merge.
This commit is contained in:
parent
b91ab26863
commit
a148f5d21d
2 changed files with 3 additions and 2 deletions
|
@ -13,6 +13,7 @@ import com.google.android.gms.wearable.PutDataRequest;
|
||||||
import com.google.android.gms.wearable.Wearable;
|
import com.google.android.gms.wearable.Wearable;
|
||||||
|
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
|
import java.util.concurrent.locks.ReentrantLock;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Created by emmablack on 12/26/14.
|
* Created by emmablack on 12/26/14.
|
||||||
|
|
|
@ -152,7 +152,7 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
|
||||||
.addOnConnectionFailedListener(this).addApi(Wearable.API).build();
|
.addOnConnectionFailedListener(this).addApi(Wearable.API).build();
|
||||||
Wearable.MessageApi.addListener(googleApiClient, this);
|
Wearable.MessageApi.addListener(googleApiClient, this);
|
||||||
if (googleApiClient.isConnected()) {
|
if (googleApiClient.isConnected()) {
|
||||||
Log.d(TAG, logPrefix + "API client is connected");
|
log.debug(logPrefix + "API client is connected");
|
||||||
} else {
|
} else {
|
||||||
// Log.d("WatchUpdater", logPrefix + "API client is not connected and is trying to connect");
|
// Log.d("WatchUpdater", logPrefix + "API client is not connected and is trying to connect");
|
||||||
googleApiClient.connect();
|
googleApiClient.connect();
|
||||||
|
@ -703,7 +703,7 @@ public class WatchUpdaterService extends WearableListenerService implements Goog
|
||||||
debugData("sendCancelNotificationRequest", putDataRequest);
|
debugData("sendCancelNotificationRequest", putDataRequest);
|
||||||
Wearable.DataApi.putDataItem(googleApiClient, putDataRequest);
|
Wearable.DataApi.putDataItem(googleApiClient, putDataRequest);
|
||||||
} else {
|
} else {
|
||||||
Log.e("cancelNotificationRequest", "No connection to wearable available!");
|
Log.e("cancelNotificationReq", "No connection to wearable available!");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue