summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--frameworks/base/media/libmediaplayerservice/StagefrightRecorder.cpp4
-rw-r--r--[-rwxr-xr-x]kernel/drivers/media/radio/si470x/RDA_FM.h31
-rw-r--r--[-rwxr-xr-x]kernel/drivers/media/radio/si470x/RDA_FM_SerialComm.c14
-rw-r--r--[-rwxr-xr-x]kernel/drivers/media/radio/si470x/RDA_FM_SerialComm.h13
-rw-r--r--[-rwxr-xr-x]kernel/drivers/media/radio/si470x/RDA_FM_common.c31
-rw-r--r--[-rwxr-xr-x]kernel/drivers/media/radio/si470x/RDA_FM_drv.c40
-rwxr-xr-xpackages/apps/Phone/src/com/android/phone/PhoneApp.java5
-rw-r--r--revision/sw_rev.mk2
8 files changed, 50 insertions, 90 deletions
diff --git a/frameworks/base/media/libmediaplayerservice/StagefrightRecorder.cpp b/frameworks/base/media/libmediaplayerservice/StagefrightRecorder.cpp
index 1e81a3d..1cf91e6 100644
--- a/frameworks/base/media/libmediaplayerservice/StagefrightRecorder.cpp
+++ b/frameworks/base/media/libmediaplayerservice/StagefrightRecorder.cpp
@@ -732,7 +732,7 @@ sp<MediaSource> StagefrightRecorder::createAudioSource() {
bool tunneledSource = false;
const char *tunnelMime;
-#ifdef USE_TUNNELED_AUDIO_SOURCE
+
{
AudioParameter param;
String8 key("tunneled-input-formats");
@@ -757,7 +757,7 @@ sp<MediaSource> StagefrightRecorder::createAudioSource() {
tunnelMime = MEDIA_MIMETYPE_AUDIO_EVRC;
}
}
-#endif
+
if ( tunneledSource ) {
sp<AudioSource> audioSource = NULL;
diff --git a/kernel/drivers/media/radio/si470x/RDA_FM.h b/kernel/drivers/media/radio/si470x/RDA_FM.h
index ad735e1..bf11644 100755..100644
--- a/kernel/drivers/media/radio/si470x/RDA_FM.h
+++ b/kernel/drivers/media/radio/si470x/RDA_FM.h
@@ -1,37 +1,10 @@
/*
- Copyright (C) 2011 GIGA-BYTE COMMUNICATION INC.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation andor other materials provided with the distribution.
- 3. For alternatively licensed files, this software is distributed under the terms
- of GNU General Public License version 2.
- 4. Neither the name of GIGA-BYTE COMMUNICATION INC. nor the names of
- its contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
* drivers/media/radio/si470x/radio-si470x.h
*
* Driver for radios with Silicon Labs Si470x FM Radio Receivers
*
+ * Copyright (C) 2011 GIGA-BYTE COMMUNICATION INC.
+ * Copyright (C) 2011 RDA Microelectronics.
* Copyright (c) 2009 Tobias Lorenz <tobias.lorenz@gmx.net>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/kernel/drivers/media/radio/si470x/RDA_FM_SerialComm.c b/kernel/drivers/media/radio/si470x/RDA_FM_SerialComm.c
index 5c158f5..dc5b875 100755..100644
--- a/kernel/drivers/media/radio/si470x/RDA_FM_SerialComm.c
+++ b/kernel/drivers/media/radio/si470x/RDA_FM_SerialComm.c
@@ -1,3 +1,17 @@
+/*
+ * Copyright (C) 2011 GIGA-BYTE COMMUNICATION INC.
+ * Copyright (C) 2011 RDA Microelectronics.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
#include "RDA_FM.h"
#include <linux/delay.h>
#include <mach/gpio.h>
diff --git a/kernel/drivers/media/radio/si470x/RDA_FM_SerialComm.h b/kernel/drivers/media/radio/si470x/RDA_FM_SerialComm.h
index 9d6f43a..2271ef5 100755..100644
--- a/kernel/drivers/media/radio/si470x/RDA_FM_SerialComm.h
+++ b/kernel/drivers/media/radio/si470x/RDA_FM_SerialComm.h
@@ -1,3 +1,16 @@
+/*
+ * Copyright (C) 2011 GIGA-BYTE COMMUNICATION INC.
+ * Copyright (C) 2011 RDA Microelectronics.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
#define ADRW 0x20
#define ADRR 0x21
diff --git a/kernel/drivers/media/radio/si470x/RDA_FM_common.c b/kernel/drivers/media/radio/si470x/RDA_FM_common.c
index 4e35919..800a082 100755..100644
--- a/kernel/drivers/media/radio/si470x/RDA_FM_common.c
+++ b/kernel/drivers/media/radio/si470x/RDA_FM_common.c
@@ -1,37 +1,10 @@
/*
- Copyright (C) 2011 GIGA-BYTE COMMUNICATION INC.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation andor other materials provided with the distribution.
- 3. For alternatively licensed files, this software is distributed under the terms
- of GNU General Public License version 2.
- 4. Neither the name of GIGA-BYTE COMMUNICATION INC. nor the names of
- its contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-/*
* drivers/media/radio/si470x/radio-si470x-common.c
*
* Driver for radios with Silicon Labs Si470x FM Radio Receivers
*
+ * Copyright (C) 2011 GIGA-BYTE COMMUNICATION INC.
+ * Copyright (C) 2011 RDA Microelectronics.
* Copyright (c) 2009 Tobias Lorenz <tobias.lorenz@gmx.net>
*
* This program is free software; you can redistribute it and/or modify
diff --git a/kernel/drivers/media/radio/si470x/RDA_FM_drv.c b/kernel/drivers/media/radio/si470x/RDA_FM_drv.c
index 134efbe..0b95c8d 100755..100644
--- a/kernel/drivers/media/radio/si470x/RDA_FM_drv.c
+++ b/kernel/drivers/media/radio/si470x/RDA_FM_drv.c
@@ -1,31 +1,16 @@
/*
- Copyright (C) 2011 GIGA-BYTE COMMUNICATION INC.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation andor other materials provided with the distribution.
- 3. For alternatively licensed files, this software is distributed under the terms
- of GNU General Public License version 2.
- 4. Neither the name of GIGA-BYTE COMMUNICATION INC. nor the names of
- its contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NON-INFRINGEMENT ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ * Copyright (C) 2011 GIGA-BYTE COMMUNICATION INC.
+ * Copyright (C) 2011 RDA Microelectronics..
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 and
+ * only version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
/* driver definitions */
#define DRIVER_AUTHOR "";
@@ -466,6 +451,7 @@ uint8 OperationRDAFM(uint8 operation, uint8 *data, uint8 numBytes)
*/
void RDA5802_SetVolumeLevel(uint8 level) /*一般不调用,即不用芯片来调节音量。*/
{
+ RDA5802_initialization_reg[3]=( RDA5802_initialization_reg[3] & 0xef );
RDA5802_initialization_reg[7]=( RDA5802_initialization_reg[7] & 0xf0 ) | level;
//OperationRDAFM_2w(WRITE, &(RDA5802_initialization_reg[0]), 8);
si470x_set_register(radio, 0, 4);
diff --git a/packages/apps/Phone/src/com/android/phone/PhoneApp.java b/packages/apps/Phone/src/com/android/phone/PhoneApp.java
index 47bbfbb..608f25d 100755
--- a/packages/apps/Phone/src/com/android/phone/PhoneApp.java
+++ b/packages/apps/Phone/src/com/android/phone/PhoneApp.java
@@ -1110,12 +1110,13 @@ public class PhoneApp extends Application implements AccelerometerListener.Orien
boolean showingDisconnectedConnection =
PhoneUtils.hasDisconnectedConnections(phone) && isShowingCallScreen;
boolean keepScreenOn = isRinging || isDialing || showingDisconnectedConnection;
- if (DBG) Log.d(LOG_TAG, "updateWakeState: keepScreenOn = " + keepScreenOn
+ if (true) Log.d(LOG_TAG, "updateWakeState: keepScreenOn = " + keepScreenOn
+ " (isRinging " + isRinging
+ ", isDialing " + isDialing
+ + ", showBluetoothIndication " + showBluetoothIndication()
+ ", showingDisc " + showingDisconnectedConnection + ")");
// keepScreenOn == true means we'll hold a full wake lock:
- requestWakeState(keepScreenOn ? WakeState.FULL : WakeState.SLEEP);
+ requestWakeState(keepScreenOn ? WakeState.FULL : (showBluetoothIndication() ? WakeState.PARTIAL : WakeState.SLEEP));
}
/**
diff --git a/revision/sw_rev.mk b/revision/sw_rev.mk
index f184db7..a3ef583 100644
--- a/revision/sw_rev.mk
+++ b/revision/sw_rev.mk
@@ -1 +1 @@
-export BUILD_NUMBER=885 \ No newline at end of file
+export BUILD_NUMBER=920 \ No newline at end of file