Navigation Menu

Skip to content

Commit

Permalink
fixed an exception
Browse files Browse the repository at this point in the history
  • Loading branch information
@bscheurman
bscheurman committed Aug 22, 2016
1 parent 9f76f70 commit 1f32c71
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 8 deletions.
9 changes: 6 additions & 3 deletions qoslib/qoslib.iml
View file
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":qoslib" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../MMC_Android_Lib" external.system.id="GRADLE" external.system.module.group="MMC_Android_Lib" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<module external.linked.project.id=":qoslib" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../CloudGuard_Android" external.system.id="GRADLE" external.system.module.group="CloudGuard_Android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
Expand Down Expand Up @@ -37,7 +37,7 @@
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/library/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/library/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/library/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/library/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/library/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/libraryDebug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/libraryDebug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/libraryDebug/assets" type="java-resource" />
Expand All @@ -50,7 +50,7 @@
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/library/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/library/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/library/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/library/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/library/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/library/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/library/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/library/assets" type="java-resource" />
Expand Down Expand Up @@ -87,16 +87,19 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" 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/bundles" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<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>
Expand Down
10 changes: 7 additions & 3 deletions qoslib/src/main/java/com/cortxt/app/corelib/MainService.java
View file
Expand Up @@ -783,12 +783,14 @@ public void startRadioLog (boolean bStart, String reason, EventType eventType)
useServiceMode = true;
}

if (useServiceMode || reason.equals("call"))
if (useServiceMode || (reason != null && reason.equals("call")))
{
LoggerUtil.logToFile(LoggerUtil.Level.DEBUG, TAG, "startRadioLog", "start service mode");

getPhoneState().setServicemode (null);
boolean useLogcat = reason.equals("call");
boolean useLogcat = false;
if (reason != null && reason.equals("call"))
useLogcat = true;
MMCSystemUtil.startRilReader (this, true, useLogcat);
bRadioActive = true;
}
Expand All @@ -813,7 +815,7 @@ public void startRadioLog (boolean bStart, String reason, EventType eventType)
}
catch (Exception e)
{

LoggerUtil.logToFile(LoggerUtil.Level.ERROR, TAG, "startRadioLog", "exception", e);
}
}
}
Expand Down Expand Up @@ -880,6 +882,8 @@ public boolean isMMCActiveOrRunning ()
return true;
if (webSocketManager.isConnected())
return true;
if (mReportManager.manualTransitEvent != null || mReportManager.manualPlottingEvent != null)
return true;
timeEngg = 0;
return false;

Expand Down
7 changes: 5 additions & 2 deletions utillib/utillib.iml
View file
Expand Up @@ -27,7 +27,7 @@
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/intermediates/classes/library/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/library/debug" />
<exclude-output />
Expand Down Expand Up @@ -87,20 +87,23 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" 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/bundles" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<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 17 Platform" jdkType="Android SDK" />
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="play-services-3.1.59" level="project" />
<orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
Expand Down

0 comments on commit 1f32c71

Please sign in to comment.