Merge branch 'dev' into qa

modules/mogo-module-apps/src/main/java/com/mogo/module/apps/model/AppsModel.java

@@ -36,7 +36,6 @@ public class AppsModel {
 
     private AppsModel( Context context ) {
         mContext = context;
-        mAppFilter = new AppFilterImpl( context );
     }
 
     public static AppsModel getInstance( Context context ) {
@@ -69,6 +68,9 @@ public class AppsModel {
             }
             return;
         }
+        if ( mAppFilter == null ) {
+            mAppFilter = new AppFilterImpl( mContext );
+        }
         final PackageManager packageManager = mContext.getPackageManager();
         List< PackageInfo > packages = packageManager.getInstalledPackages( 0 );
         int counter = 0;

modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java

@@ -856,7 +856,7 @@ public class MogoServices implements IMogoMapListener,
     @Override
     public void onTransaction( int size ) {
         if ( size == 0 ) {
-            mUiController.showMyLocation( !mNavi.isNaviing() );
+            mUiController.showMyLocation( true );
             AIAssist.getInstance( mContext ).unregisterUnWakeupCommand( ServiceConst.CMD_BACK );
             if ( mStatusManager.isSearchUIShow() ) {
                 mStatusManager.setSearchUIShow( TAG, false );