Merge branch 'master' of snicker.com.cn:icsupport

diff --cc app/src/main/java/com/enqualcomm/support/Config.java
index 6d77af7,5d47128..c6c4ac4
--- 1/app/src/main/java/com/enqualcomm/support/Config.java
--- 2/app/src/main/java/com/enqualcomm/support/Config.java
+++ b/app/src/main/java/com/enqualcomm/support/Config.java
@@@ -296,7 -296,7 +296,8 @@@ public class Config 
      return ret;\r
    }\r
  \r
 -  public final static boolean noLocationCycle=getNoLocationCycleFlag();\r
++\r
 +  public static boolean noLocationCycle=getNoLocationCycleFlag();\r
    public static boolean getNoLocationCycleFlag(){\r
        String tmp=Util.getSystemProperties("persist.sys.NoLocationCycle");\r
        boolean ret=false;\r

diff --cc app/src/main/java/com/enqualcomm/support/ICSmsManager.java
Simple merge