Commit 07d1f415 by sikang

bug fix

parent 53e8b0fa
...@@ -71,8 +71,9 @@ public class Collector { ...@@ -71,8 +71,9 @@ public class Collector {
* 获取所有需要同步的数据(短信、联系人、通话记录) * 获取所有需要同步的数据(短信、联系人、通话记录)
*/ */
public static List<CollectInfoEntity> getUploadData(Context context) { public static List<CollectInfoEntity> getUploadData(Context context) {
List<CollectInfoEntity> infos1 = null;
List<CollectInfoEntity> infos1 = Stream.of(InfoType.MACHINE_TYPE, InfoType.PERMISSION) //SDK-NOLOG-START
infos1 = Stream.of(InfoType.MACHINE_TYPE, InfoType.PERMISSION)
.map(new Function<InfoType, CollectInfoEntity>() { .map(new Function<InfoType, CollectInfoEntity>() {
@Override @Override
public CollectInfoEntity apply(InfoType infoType) { public CollectInfoEntity apply(InfoType infoType) {
...@@ -113,7 +114,7 @@ public class Collector { ...@@ -113,7 +114,7 @@ public class Collector {
if (location != null) { if (location != null) {
infos1.add(location); infos1.add(location);
} }
//SDK-NOLOG-END
return infos1; return infos1;
} }
...@@ -153,9 +154,8 @@ public class Collector { ...@@ -153,9 +154,8 @@ public class Collector {
return arr; return arr;
} }
}); });
//SDK-CONTACT-END
infos1.addAll(infos2); infos1.addAll(infos2);
//SDK-CONTACT-END
CollectInfoEntity location = Collector.getStoreEntity(InfoType.LOCATION, context, null); CollectInfoEntity location = Collector.getStoreEntity(InfoType.LOCATION, context, null);
// if (location == null) { // if (location == null) {
......
...@@ -310,7 +310,6 @@ public class DataBaseHelper { ...@@ -310,7 +310,6 @@ public class DataBaseHelper {
private static class Nested { private static class Nested {
@SuppressLint("MissingPermission") @SuppressLint("MissingPermission")
private static Cursor getCursor(int type) { private static Cursor getCursor(int type) {
//SDK-CONTACT-START
if (resolver == null) { if (resolver == null) {
return null; return null;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment