Merge pull request #6 from shengaog/master

Fixed crush occasionally when closing
google · Aug 11, 2017 · ad8e370 · ad8e370
2 parents 9a3e0a9 + b2cea36
commit ad8e370
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/GNSSLogger/app/app.iml b/GNSSLogger/app/app.iml
@@ -76,13 +76,20 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 26 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />

diff --git a/...ogger/app/src/main/java/com/google/android/apps/location/gps/gnsslogger/MainActivity.java b/...ogger/app/src/main/java/com/google/android/apps/location/gps/gnsslogger/MainActivity.java
@@ -122,6 +122,12 @@ protected void onStop() {
     unbindService(mConnection);
   }
 
+  @Override
+  protected void onDestroy(){
+    mGnssContainer.unregisterAll();
+    super.onDestroy();
+  }
+
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     SharedPreferences sharedPreferences = PreferenceManager.

diff --git a/GNSSLogger/local.properties b/GNSSLogger/local.properties