drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,875 Commits 1 Branch 0 Tags
Commit Graph

25875 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chia-chi Yeh
2cbb56f961 Merge "KeyStore: Fix the return value when send() or recv() has an error." into gingerbread 2010-09-30 00:39:32 -07:00
Chia-chi Yeh
c741a2fe41 KeyStore: Fix the return value when send() or recv() has an error. 
Change-Id: I20a63c76bd29b1a9f8959a6c4fe5a5b8a9a971b4
 2010-09-30 15:17:58 +08:00
Hung-ying Tyan
d29e075418 Merge "Add uri field to SipManager.ListenerRelay" into gingerbread 2010-09-30 00:05:58 -07:00
Hung-ying Tyan
9e1d308e99 Add uri field to SipManager.ListenerRelay 
in case mSession is not available.

Change-Id: Ifee2c129e48aa1177f648f176413ab6aa5606770
 2010-09-30 15:00:34 +08:00
Chia-chi Yeh
dfd1484e3b Merge "RTP: Adjust the jitter buffer to 512ms." into gingerbread 2010-09-29 23:24:32 -07:00
Chia-chi Yeh
3520bd4313 RTP: Adjust the jitter buffer to 512ms. 
Change-Id: Ia91c1aa1a03b65dbd329ea98383f370844e2b0c0
 2010-09-30 13:51:26 +08:00
Hung-ying Tyan
6a53489ae5 SipService: add UID check. 
Only allow creator or radio user to access profiles.

Change-Id: I548938f117926bcc878419142d1b5d818a4e70df
 2010-09-30 12:40:11 +08:00
Hung-ying Tyan
23f21600d0 Add CallManager/Phone.setEchoSuppressionEnabled(). 
Change-Id: I7bc6241e6fa815787799a53d6f3a076567edc361
 2010-09-30 12:34:41 +08:00
Adam Powell
bc87ada10d Merge "Fix text anchors" into gingerbread 2010-09-29 21:05:12 -07:00
Adam Powell
ba0a2c383f Fix text anchors 
Change-Id: Iddd5434a1dbeb1adc2143db73ed27df6b575319e
 2010-09-29 21:02:19 -07:00
Jeff Brown
5068ad8d23 Revert orientation change. 
Change-Id: I1a6d13be118533171b9a75025dcf7985dd7e12b5
 2010-09-29 20:14:56 -07:00
Robert Greenwalt
e8dd716014 Merge "Change the 0_fully signal icon to the new style" into gingerbread 2010-09-29 19:48:57 -07:00
Jeff Brown
93e3296f94 Merge "PointerLocationView: Display orientation correctly." into gingerbread 2010-09-29 19:08:02 -07:00
Jeff Brown
707a57aa26 PointerLocationView: Display orientation correctly. 
Canvas rotations are counterclockwise, orientation is clockwise,
so we need to mind the sign of the rotation.

Change-Id: I2a8b60599bd26e9dc3ced2e13942f846461333df
 2010-09-29 18:41:11 -07:00
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
Steve Howard
3e8c1d3a46 Have download manager give more details when downloads are paused 
This change introduces more detailed reporting of why downloads are paused in
the download manager.

First, it adds new, more detailed status constants in android.provider.Downloads
for when a download is paused, in place of the old catch-all
STATUS_RUNNING_PAUSED.  I've eliminated some dead code there as well to ease the
change.

Second, in the public API, it changes COLUMN_ERROR_CODE to COLUMN_REASON, which
now reports useful info for STATUS_PAUSED in addition to STATUS_FAILED.  It adds
some new PAUSED_* constants for reason values when a download is paused, and
adds code to generate these values appropriately.

Change-Id: Ie617d1c2c59357375e19466086923ace5e2fb122
 2010-09-29 17:34:40 -07: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
Robert Greenwalt
edf2971cd5 Change the 0_fully signal icon to the new style 
bug:3047901
Change-Id: I1faceb69fa44714bf1d73db0da7bddaaa3bddf3b
 2010-09-29 16:37:24 -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
Eric Fischer
2c3eba4c08 Import revised translations. DO NOT MERGE 
Change-Id: Iaa642982ed369b45f0923f919167ccb2e27b72c4
 2010-09-29 14:29:00 -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