Modified sdServer to use a single ToneGenerator instance rather than create a new one for each beep.

This commit is contained in:
Graham Jones
2016-04-08 21:51:12 +01:00
parent 5beefb5a6b
commit 11d9d1c85c
5 changed files with 12 additions and 8 deletions

View File

@@ -13,7 +13,7 @@
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="uk.org.openseizuredetector"
android:versionCode="20"
android:versionName="2.0.1" >
android:versionCode="21"
android:versionName="2.0.2a" >
<uses-sdk android:minSdkVersion="14" />

View File

@@ -111,6 +111,7 @@ public class SdServer extends Service implements SdDataReceiver {
private File mOutFile;
private OsdUtil mUtil;
private Handler mHandler;
private ToneGenerator mToneGenerator;
private final IBinder mBinder = new SdBinder();
@@ -130,6 +131,8 @@ public class SdServer extends Service implements SdDataReceiver {
public SdServer() {
super();
mSdData = new SdData();
mToneGenerator = new ToneGenerator(AudioManager.STREAM_ALARM, 100);
Log.v(TAG, "SdServer Created");
}
@@ -287,6 +290,8 @@ public class SdServer extends Service implements SdDataReceiver {
} catch (Exception e) {
Log.v(TAG, "Error in onDestroy() - " + e.toString());
}
mToneGenerator.release();
}
@@ -472,8 +477,7 @@ public class SdServer extends Service implements SdDataReceiver {
* beep for duration milliseconds, but only if mAudibleAlarm is set.
*/
private void beep(int duration) {
ToneGenerator toneG = new ToneGenerator(AudioManager.STREAM_ALARM, 100);
toneG.startTone(ToneGenerator.TONE_CDMA_ALERT_CALL_GUARD, duration);
mToneGenerator.startTone(ToneGenerator.TONE_CDMA_ALERT_CALL_GUARD, duration);
Log.v(TAG, "beep()");
}

View File

@@ -4,7 +4,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.2.3'
classpath 'com.android.tools.build:gradle:2.0.0'
}
}
allprojects {

View File

@@ -1,6 +1,6 @@
#Wed Apr 10 15:27:10 PDT 2013
#Fri Apr 08 20:56:19 BST 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip