diff --git a/app/build.gradle b/app/build.gradle
index c45a443e..abcda8dc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -96,12 +96,14 @@ android {
         variant.outputs.all { output ->
             if (outputFileName.endsWith('.apk')) {
                 def buildTypeFlag = "dbg"
+                def prevFileName = "mpapp"
                 if(variant.buildType.name.equals('release')) {
                     buildTypeFlag = "rel"
                 }
                 def abi = output.getFilter(com.android.build.OutputFile.ABI)
                 if (abi == null) abi = "all"
-                def fileName = "mpapp_v${defaultConfig.versionName}_${buildTypeFlag}_${new Date(System.currentTimeMillis()).format("yyyyMMdd")}_${abi}.apk"
+                if (abi.contains("v7a"))  prevFileName = "N938"
+                def fileName = "${prevFileName}_v${defaultConfig.versionName}_${buildTypeFlag}_${new Date(System.currentTimeMillis()).format("yyyyMMdd")}_${abi}.apk"
                 outputFileName = fileName
             }
         }
diff --git a/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java b/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java
index 50c1964b..0600515f 100644
--- a/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java
+++ b/app/src/main/java/com/xypower/mpapp/MicroPhotoService.java
@@ -322,6 +322,7 @@ public class MicroPhotoService extends Service {
             getApplicationContext().registerReceiver(mNetworkChangedReceiver, filter);
         }
 
+        /*
         AlarmManager alarmManager = (AlarmManager) getApplicationContext().getSystemService(ALARM_SERVICE);
 
         while (true) {
@@ -331,6 +332,8 @@ public class MicroPhotoService extends Service {
             }
         }
 
+         */
+
         enableGps(true);
         requestPosition();
     }