25658 Commits

Author SHA1 Message Date
Chia-chi Yeh
0a537b78d3 Merge "RTP: Enable AMR codec." into gingerbread 2010-09-29 18:32:24 -07:00
Hung-ying Tyan
2365b78e64 Merge "SIP: misc fixes." into gingerbread 2010-09-29 18:12:12 -07:00
Chia-chi Yeh
f88fc1fa90 RTP: Enable AMR codec.
Change-Id: I49e6bdc1b67306b44173f2f346f8372a50264870
2010-09-30 08:55:12 +08:00
Hung-ying Tyan
0e41230481 Catch exceptions in SipPhone.canTake().
Exceptions may throw during canTake() as the peer may cancel the call and
result in a race with this method call.

Change-Id: I61903d601d8f9b2dcb4c4fbe1586e2c1a1069109
http://b/issue?id=3033868
2010-09-30 08:30:36 +08:00
Hung-ying Tyan
421c34c162 SipPhone: revise hangup() in SipCall and SipConnection.
Make them DISCONNECTED immediately. Don't enter DISCONNECTING state and wait
until SipSession ends the session. SipSession will get timed out eventually
but PhoneApp/user don't need to know this detail and wait.

This should fix the bug:
http://b/issue?id=3027719

Change-Id: Ida5a1bd09d08b9d591721384b4978127619aab51
2010-09-30 08:26:59 +08:00
Hung-ying Tyan
fb3a98b1d8 SIP: misc fixes.
+ Fix keepalive timer event leak due to the race between stopping timer and
  the async'ed timeout handler
+ SipSessionImpl: set state before handling an event to ensure we get correct
  state when some error occurs during handling the event.
+ Fix potential NPE in SipManager.ListenerRelay.getUri().

Change-Id: I021ee34f83059fd4fbb64b30bea427a5462aa51b
2010-09-30 08:10:17 +08:00
Gilles Debunne
71e2486209 Merge "New assets for status bar data_edge and overscroll" into gingerbread 2010-09-29 17:05:26 -07:00
Gilles Debunne
03b58063de New assets for status bar data_edge and overscroll
Change-Id: I32b8e036fc54a912719df660db3063045d8d7c93
2010-09-29 17:02:50 -07:00
Ying Wang
3caaa64e86 Merge "Fix proguard flag file dependency." into gingerbread 2010-09-29 16:13:21 -07:00
Ying Wang
d252a52028 Fix proguard flag file dependency.
Change-Id: Ibc160fc98334ca83fa8059372d2384880069b9d2
2010-09-29 15:18:06 -07:00
Joe Onorato
2a0b3c0d4c Merge "AnimatedImageView: Stop the animation when we're not visible." into gingerbread 2010-09-29 14:25:15 -07:00
Joe Onorato
1e7277e204 AnimatedImageView: Stop the animation when we're not visible.
Change-Id: I5dedc4048806f1ea44ef4777ccf578a29e79869b
2010-09-29 14:21:06 -07:00
David Brown
87fbcc2b73 Merge "Implement contacts lookup (caller-id) for incoming SIP calls." into gingerbread 2010-09-29 14:08:31 -07:00
Doug Zongker
981dec695f Merge "don't delete /cache/recovery/last_log on boot" into gingerbread 2010-09-29 13:41:00 -07:00
Jaikumar Ganesh
a5c742bfd0 Merge "Update local cache before sending intent." into gingerbread 2010-09-29 13:24:53 -07:00
Doug Zongker
d059055fb3 don't delete /cache/recovery/last_log on boot
Change-Id: I7739d7a61f4f0d0c2bc6324580404f61d435d716
2010-09-29 13:22:49 -07:00
Gilles Debunne
f0fa267492 Merge "New assets: wifi signal 1, no sim card." into gingerbread 2010-09-29 12:15:51 -07:00
Eric Fischer
5f0c8fe651 Merge "Split strings with SD card references into variations." into gingerbread 2010-09-29 12:14:10 -07:00
Chia-chi Yeh
955ab37cee Merge "RTP: Enable GSM-EFR codec." into gingerbread 2010-09-29 12:12:51 -07:00
Eric Fischer
d77782ed63 Split strings with SD card references into variations.
Change-Id: I39ead98a753f26c00c1e2ba6344338696263c49b
2010-09-29 12:09:04 -07:00
Chia-chi Yeh
f4ae94229d RTP: Enable GSM-EFR codec.
Change-Id: I9d84009e4557a0a82c1f9d7d543922741be97c77
2010-09-30 03:07:57 +08:00
Chia-chi Yeh
cd38664916 Merge "RTP: Revise the workaround of private addresses and fix bugs." into gingerbread 2010-09-29 11:50:16 -07:00
Chia-chi Yeh
fe5298992a RTP: Revise the workaround of private addresses and fix bugs.
Change-Id: Ie654b569f47049aa452eca8d3e6d4a98ac18469c
2010-09-30 02:43:48 +08:00
Joe Onorato
f01a873029 Merge "Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""" into gingerbread 2010-09-29 11:00:14 -07:00
Roy West
d146c233c5 Merge "Partial fix to bug 2992589: Edit dev admin strings." into gingerbread 2010-09-29 10:37:11 -07:00
Jaikumar Ganesh
2dfe101149 Update local cache before sending intent.
Change-Id: I0e016cae3070b1811dd68958afb8a8501081097d
2010-09-29 10:31:02 -07:00
Roy West
7d3d88eec0 Partial fix to bug 2992589: Edit dev admin strings.
Change-Id: Ifa73e2961fa03b5ac707a73d6932e724931ddb2c
2010-09-29 10:28:56 -07:00
Joe Onorato
0c32c09cd3 Revert "Revert "Check for the DEVICE_POWER permission in userActivity.""
This reverts commit 4da4827504df019d4e64dd864f70526ff6d384a0.
2010-09-29 10:20:59 -07:00
Kenny Root
212d81a004 Merge "Move all the permissions check up for unmount" into gingerbread 2010-09-29 07:40:32 -07:00
Kenny Root
f1121dc1d3 Move all the permissions check up for unmount
We have already scanned the state of the OBB in mountObb, so check the
caller against the stored state in the unmountObb call. This allows us
to ensure the calling binder is the same one that mounted it since we
tie the lifecycle of the OBB to the lifecycle of the binder.

Change-Id: I45d9cfbab5d3f5b37a6a9b594b10bd8b91cccc45
2010-09-29 07:38:55 -07:00
Nick Pelly
038cabe024 NFC integration
Source: Trusted_NFC_Device_Host_AA03.01e02_google.zip code drop (23-Sep-2010)

Conflicts:

	core/java/android/app/ApplicationContext.java
	core/java/android/provider/Settings.java
	core/jni/Android.mk
	core/jni/AndroidRuntime.cpp
	core/res/AndroidManifest.xml
	include/utils/Asset.h

Change-Id: I62c92f4c79f5ee65126c97602f6bc1c15794e573
Signed-off-by: Nick Pelly <npelly@google.com>
2010-09-28 22:36:27 -07:00
Chia-chi Yeh
d6877fa497 Merge "AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead." into gingerbread 2010-09-28 21:11:27 -07:00
Chia-chi Yeh
081833d791 AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead.
This allows gsmamr_enc.h and gsmamr_dec.h to be included in the same
file without conflict definition.

Change-Id: I1c8dac235c122735ba14a1af2fda48c0f8d9f87b
2010-09-29 12:00:18 +08:00
Mike Lockwood
a25eabad23 Merge "Revert "Check for the DEVICE_POWER permission in userActivity."" into gingerbread 2010-09-28 20:15:55 -07:00
Mike Lockwood
4da4827504 Revert "Check for the DEVICE_POWER permission in userActivity."
The change broke SetupWizard and probably other apps

This reverts commit 059f8f93e6e89f80dfb85cfdbcd3bce64c7b1e2c.
2010-09-28 23:07:26 -04:00
Chia-chi Yeh
e006e4d2c9 Merge changes Iae1913fb,I38dbefef into gingerbread
* changes:
  RTP: Enable GSM codec.
  RTP: Refactor out G711 codecs into another file.
2010-09-28 19:40:59 -07:00
Chia-chi Yeh
a6f950c968 RTP: Enable GSM codec.
Change-Id: Iae1913fb0643f1c66b5d16f24d51924d363e5ef5
2010-09-29 10:36:52 +08:00
Dianne Hackborn
3e94b94f56 Merge "Remove old location classes." into gingerbread 2010-09-28 18:16:58 -07:00
Dianne Hackborn
0f5eee0bf8 Remove old location classes.
Change-Id: Ib7e883c64996a8bfaaa755d88b855e17e3442e26
2010-09-28 17:50:50 -07:00
David Brown
158d390f53 Implement contacts lookup (caller-id) for incoming SIP calls.
CallerInfoAsyncQuery can now handle SIP addresses in addition to regular
phone numbers: if the number passed in to startQuery() is actually a "URI
number", we now treat it as a SIP address and look it up directly in the
Data table.

If it's a regular phone number, the behavior is unchanged: we use the
PhoneLookup table as before.

This piece of the fix covers only the contact lookup for incoming calls;
we still need some more cleanup of the CallerInfo class in order to get
the call log working.

Bug: 3004127

Change-Id: I0fcb80f9de5b8ecf99d31ee92e0889ddb07216fd
2010-09-28 17:47:36 -07:00
Kenny Root
05105f7abe Update OBB API to include callbacks
Add a callback for users of the StorageManager API to be able to receive
notifications when the requested operation completes for mountObb and
unmountObb.

Add NDK API to get to ObbInfo like the Java API has.

Also update the docs for the API and remove the "STOPSHIP" comments.

Change-Id: I23a4409c7f8b74d3169614beba920b4d667990a4
2010-09-28 17:23:26 -07:00
Joe Onorato
ea2cf2f936 Merge "Check for the DEVICE_POWER permission in userActivity." into gingerbread 2010-09-28 17:19:37 -07:00
Joe Onorato
f2f34505a1 Merge "Fix 3041579 overscroll effect in notification area looks strange" into gingerbread 2010-09-28 17:18:59 -07:00
Joe Onorato
059f8f93e6 Check for the DEVICE_POWER permission in userActivity.
Change-Id: I6c8038a960bdf32dfad3b0571d86f51f87784370
2010-09-28 17:14:34 -07:00
Dianne Hackborn
4f67e1ccf1 Merge "Add location shared library for location provider APIs." into gingerbread 2010-09-28 17:12:44 -07:00
Gilles Debunne
888dc9d117 New assets: wifi signal 1, no sim card.
Change-Id: I2f7571769079998a171ac90d088ca4e82a53ce99
2010-09-28 17:10:33 -07:00
Joe Onorato
ab014a03a0 Fix 3041579 overscroll effect in notification area looks strange
Bug: 3041579
Change-Id: I72f5a51c86cf0e46143915e6d1fe404ffeceb925
2010-09-28 17:02:03 -07:00
Eric Laurent
aeb2c62e76 Merge "Fix several audio effects problems." into gingerbread 2010-09-28 16:38:22 -07:00
Dianne Hackborn
63c82c027b Add location shared library for location provider APIs.
First part, adding the existing classes in their new library.  The old
code will be removed once everything gets switched to using this.

Change-Id: I27b6ad8c75c16f35300090e95f12a7db5608e3a3
2010-09-28 15:19:29 -07:00
Ying Wang
292c246b27 Merge "Call functions to calculate deps and classes.jar" into gingerbread 2010-09-28 15:06:10 -07:00