am b93860b5
: Merge change I9f70f20b into eclair
Merge commit 'b93860b5e4ca4f7e194748895d075063849eed7d' into eclair-plus-aosp * commit 'b93860b5e4ca4f7e194748895d075063849eed7d': Fix problem that could prevent push from working
This commit is contained in:
commit
8d0958c8ae
@ -1702,7 +1702,7 @@ public class SyncManager extends Service implements Runnable {
|
||||
if (error != null) {
|
||||
if (error.fatal) {
|
||||
return PING_STATUS_UNABLE;
|
||||
} else {
|
||||
} else if (error.holdEndTime > 0) {
|
||||
return PING_STATUS_WAITING;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user