gudbjartur22/clinx02-androidpebble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
Android_Pebble_SD.iml
View File

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

4
app/src/main/AndroidManifest.xml
View File

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

8
app/src/main/java/uk/org/openseizuredetector/SdServer.java
View File

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

2
build.gradle
View File

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

4
gradle/wrapper/gradle-wrapper.properties vendored
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 distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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