28207 Commits

Author SHA1 Message Date
Jeff Brown
d00b4386ae Merge "Clarify some comments on individual key codes." into gingerbread 2010-10-08 12:44:43 -07:00
Mindy Pereira
ab70a98b0e am 612d570a: DO NOT MERGE Adjust amount pull effects the glow and edge decay.
Merge commit '612d570a6fc1e5a0e2e56250f597d1e96d698273' into gingerbread-plus-aosp

* commit '612d570a6fc1e5a0e2e56250f597d1e96d698273':
  DO NOT MERGE Adjust amount pull effects the glow and edge decay.
2010-10-08 12:10:09 -07:00
Andreas Huber
38285db197 Refactor some more h.264 utility code out into avc_utils. Work around a hardware decoder issue by making sure the first access unit submitted to a decoder at startup or after seek is an IDR.
Change-Id: I61936601e55df7e4c23a8c13087579a4f85bd6e6
2010-10-08 12:06:27 -07:00
Mindy Pereira
612d570a6f DO NOT MERGE Adjust amount pull effects the glow and edge decay.
Edge decay is now based on the remaining height of the glow so that
as the glow reduces, the edge will reduce and not disappear entirely
before the glow is gone.

Change-Id: I03376ee3807e21ce6ac74c0cfad713b7fd5e4520
2010-10-08 11:45:57 -07:00
Irfan Sheriff
27827bab18 fix getmacaddress race condition (don't auto-merge)
getMacAddress wont go through if the wifi state is not enabled
by the time the connection from the supplicant comes through.

we now fetch the mac address right after a driver start.

Bug: 3072163
Change-Id: I55943e6d618fd7c3170bc579697bc61d70fc8b86
2010-10-08 11:34:02 -07:00
Mike Lockwood
98e1f3840f am aecab79b: Merge "Remove races in Geocoder/LocationProvider Proxy" into gingerbread
Merge commit 'aecab79b4ec4727a59a5532c7db2683c617e8c21' into gingerbread-plus-aosp

* commit 'aecab79b4ec4727a59a5532c7db2683c617e8c21':
  Remove races in Geocoder/LocationProvider Proxy
2010-10-08 11:20:33 -07:00
Andreas Huber
2b4f1f4cb8 am f72dd019: Merge "Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality." into gingerbread
Merge commit 'f72dd0190ee64914161d361be1213eda8cab7b90' into gingerbread-plus-aosp

* commit 'f72dd0190ee64914161d361be1213eda8cab7b90':
  Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality.
2010-10-08 11:18:03 -07:00
Mike Lockwood
aecab79b4e Merge "Remove races in Geocoder/LocationProvider Proxy" into gingerbread 2010-10-08 11:17:17 -07:00
Andreas Huber
f72dd0190e Merge "Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality." into gingerbread 2010-10-08 11:16:07 -07:00
Andreas Huber
5dcf588a81 am b9bf5457: Merge "Respect the cropping rectangle when extracting the video dimensions from the sequence parameter set of H.264 streams." into gingerbread
Merge commit 'b9bf545774b1f1dbd35c34c4060a6ebdd2bc843c' into gingerbread-plus-aosp

* commit 'b9bf545774b1f1dbd35c34c4060a6ebdd2bc843c':
  Respect the cropping rectangle when extracting the video dimensions from the sequence parameter set of H.264 streams.
2010-10-08 11:05:10 -07:00
Andreas Huber
b9bf545774 Merge "Respect the cropping rectangle when extracting the video dimensions from the sequence parameter set of H.264 streams." into gingerbread 2010-10-08 10:59:52 -07:00
Andreas Huber
6934207ac3 Respect the cropping rectangle when extracting the video dimensions from the sequence parameter set of H.264 streams.
Change-Id: Id7f21d5ab8533b4e17ceaa8619a39c27f0306150
2010-10-08 10:38:39 -07:00
James Dong
d31fc2397a am 6dcdfdb4: Merge "Name the writer threads" into gingerbread
Merge commit '6dcdfdb42a562747dceb1e9fb2aa10c67d18959f' into gingerbread-plus-aosp

* commit '6dcdfdb42a562747dceb1e9fb2aa10c67d18959f':
  Name the writer threads
2010-10-08 10:35:57 -07:00
Andreas Huber
14ea1048e7 am c5912acc: Merge "Disable the access unit timeout temporarily while a seek operation is in progress." into gingerbread
Merge commit 'c5912acc04226a8f9377d1aad50de8d3f883854c' into gingerbread-plus-aosp

* commit 'c5912acc04226a8f9377d1aad50de8d3f883854c':
  Disable the access unit timeout temporarily while a seek operation is in progress.
2010-10-08 10:35:53 -07:00
Gilles Debunne
5d1465490c am 56e9b8eb: Merge "Long press with trackball selects word under cursor." into gingerbread
Merge commit '56e9b8ebb20a992a80696f933a2225544670ef8b' into gingerbread-plus-aosp

* commit '56e9b8ebb20a992a80696f933a2225544670ef8b':
  Long press with trackball selects word under cursor.
2010-10-08 10:19:22 -07:00
Brad Fitzpatrick
cc792c4149 DropBoxManager.Entry implements Closeable
Change-Id: I61716c06b92fa1b9b5b271b5805550bdb2d51b46
2010-10-08 10:17:03 -07:00
Andreas Huber
10b9b3f3fe Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality.
Change-Id: I016e79b688774f8ee91ac53216197b5fb9cb41b2
related-to-bug: 3073955
2010-10-08 10:16:24 -07:00
James Dong
6dcdfdb42a Merge "Name the writer threads" into gingerbread 2010-10-08 10:06:22 -07:00
Andreas Huber
c5912acc04 Merge "Disable the access unit timeout temporarily while a seek operation is in progress." into gingerbread 2010-10-08 10:01:37 -07:00
Gilles Debunne
56e9b8ebb2 Merge "Long press with trackball selects word under cursor." into gingerbread 2010-10-08 09:22:29 -07:00
Andreas Huber
e51e80990e Disable the access unit timeout temporarily while a seek operation is in progress.
Change-Id: I116cb76342aae4168f34ebae49ecb2301702a0ea
related-to-bug: 3073955
2010-10-08 09:04:25 -07:00
Eric Laurent
4f21e517d0 am b37fcbfd: Merge "Added getter for session Id to AudioSink" into gingerbread
Merge commit 'b37fcbfd7f9d65b90b43e0242903030c5a6517b5' into gingerbread-plus-aosp

* commit 'b37fcbfd7f9d65b90b43e0242903030c5a6517b5':
  Added getter for session Id to AudioSink
2010-10-08 08:30:03 -07:00
Eric Laurent
b37fcbfd7f Merge "Added getter for session Id to AudioSink" into gingerbread 2010-10-08 08:28:08 -07:00
Andreas Huber
d96a068cc7 am bb245d35: Merge "Increase scratch buffers sizes in mp3 software decoder, this integrates a PV master/opensource patch." into gingerbread
Merge commit 'bb245d35b6e81d750a91815543973b0a5976352b' into gingerbread-plus-aosp

* commit 'bb245d35b6e81d750a91815543973b0a5976352b':
  Increase scratch buffers sizes in mp3 software decoder, this integrates a PV master/opensource patch.
2010-10-08 08:17:54 -07:00
Andreas Huber
bb245d35b6 Merge "Increase scratch buffers sizes in mp3 software decoder, this integrates a PV master/opensource patch." into gingerbread 2010-10-08 08:02:42 -07:00
Babis Triantafyllou
aeab76c5be NullPointerException at handleMessage(GSMPhone.java)
NullPointerException at
com.android.internal.telephony.gsm.GSMPhone.handleMessage(GSMPhone.java)
Failing to retrieved the IMSI number from SIM card could lead to
an exception. A null pointer check will prevent this.

Change-Id: I26760543484504c8d35215bfb1e8f1ae664aeade
2010-10-08 16:02:11 +02:00
Chung-yih Wang
77880ae418 am 44b7ef54: Merge "SipService: add permission check for using API" into gingerbread
Merge commit '44b7ef5408f135892fe8e8643fa4946532902672' into gingerbread-plus-aosp

* commit '44b7ef5408f135892fe8e8643fa4946532902672':
  SipService: add permission check for using API
2010-10-07 21:37:09 -07:00
Chung-yih Wang
44b7ef5408 Merge "SipService: add permission check for using API" into gingerbread 2010-10-07 21:28:23 -07:00
Gilles Debunne
c873112810 Long press with trackball selects word under cursor.
Bug 3068305

Change-Id: Ib37fc98a61efdf3fbfccbb2174e2dbdbcb1a240e
2010-10-07 20:59:09 -07:00
Hung-ying Tyan
aa562ffdb8 SipService: add permission check for using API
Change-Id: Ifd85ba07f1b913011cb3e80e5027c67bfe3db280
2010-10-08 11:57:18 +08:00
Jeff Brown
224d4a1535 Clarify some comments on individual key codes.
Change-Id: I03cce0ad69aaab5b71e5017982b01afd27285d2f
2010-10-07 20:28:53 -07:00
James Dong
c67acb2b28 Name the writer threads
Change-Id: I51461c3800ac5850e21ff398e80eb20b562264b3
2010-10-07 20:20:59 -07:00
Dianne Hackborn
b77455ee29 am 78d68836: Implement tracking of package install times.
Merge commit '78d688369a2240009d3bbe4126996a973b2e2fe2' into gingerbread-plus-aosp

* commit '78d688369a2240009d3bbe4126996a973b2e2fe2':
  Implement tracking of package install times.
2010-10-07 20:13:24 -07:00
Dianne Hackborn
78d688369a Implement tracking of package install times.
Provides information about the time at which the package was
first installed and the time it was last updated.

Change-Id: Icb43f77b5b669a1ce685e8913046b8be386b6175
2010-10-07 18:48:22 -07:00
Eric Laurent
b3bdf3f008 Added getter for session Id to AudioSink
Added a method to expose the audio session id at AudioSink interface
so that the AudioPlayer in stagefright can retrieve it.

Also:
- Fixed audio effect send level not being initialized in mediaplayer.
- Fixed compilation error when LOGV is enabled in mediaplayer JNI

Change-Id: I4bb55454fd63d646e0e677692d737c4843fb05fb
2010-10-07 18:23:03 -07:00
Marco Nelissen
779a6e41d7 am eb43f1b2: am ef5afa07: (-s ours) Do not merge. Don\'t crash when extra logging is enabled.
Merge commit 'eb43f1b2eedbcfe0e8ac34452a43eaaef5dde513' into gingerbread-plus-aosp

* commit 'eb43f1b2eedbcfe0e8ac34452a43eaaef5dde513':
  Do not merge.
2010-10-07 17:52:15 -07:00
Marco Nelissen
eb43f1b2ee am ef5afa07: (-s ours) Do not merge. Don\'t crash when extra logging is enabled.
Merge commit 'ef5afa073b4a8c80ac5f28ccc02e1d0b42b1560f' into gingerbread

* commit 'ef5afa073b4a8c80ac5f28ccc02e1d0b42b1560f':
  Do not merge.
2010-10-07 17:48:46 -07:00
Kenny Root
0689b60b86 am 54e01e0f: Merge "Symlink application lib directory when on SD card" into gingerbread
Merge commit '54e01e0f980cfb78153d5481f7e67cef90416174' into gingerbread-plus-aosp

* commit '54e01e0f980cfb78153d5481f7e67cef90416174':
  Symlink application lib directory when on SD card
2010-10-07 17:41:05 -07:00
Hung-ying Tyan
ea445758ef am 08faac3c: Unhide SIP API.
Merge commit '08faac3c26e12863858e1534985dd950193f755f' into gingerbread-plus-aosp

* commit '08faac3c26e12863858e1534985dd950193f755f':
  Unhide SIP API.
2010-10-07 17:40:51 -07:00
Kenny Root
54e01e0f98 Merge "Symlink application lib directory when on SD card" into gingerbread 2010-10-07 17:38:44 -07:00
Hung-ying Tyan
08faac3c26 Unhide SIP API.
Change-Id: I09468e3149a242a3b1e085ad220eb74f84ac6c68
2010-10-08 08:31:42 +08:00
Hung-ying Tyan
647ff64596 am 26cb01e8: Merge "Use explicit intent for installing credentials." into gingerbread
Merge commit '26cb01e880af5f23a58e4336facd30fa7d52581e' into gingerbread-plus-aosp

* commit '26cb01e880af5f23a58e4336facd30fa7d52581e':
  Use explicit intent for installing credentials.
2010-10-07 17:29:49 -07:00
Hung-ying Tyan
26cb01e880 Merge "Use explicit intent for installing credentials." into gingerbread 2010-10-07 17:27:28 -07:00
Gilles Debunne
bd38710bde am 3ecceb5b: Merge "TextView refactoring to ease future merges in HC." into gingerbread
Merge commit '3ecceb5b94233320ed88825759d6118fed7add2c' into gingerbread-plus-aosp

* commit '3ecceb5b94233320ed88825759d6118fed7add2c':
  TextView refactoring to ease future merges in HC.
2010-10-07 17:21:40 -07:00
Hung-ying Tyan
c5e630a004 Use explicit intent for installing credentials.
http://b/issue?id=3020049

Change-Id: I429c5b2c9f3b876e6197894a9437952d71d5c472
2010-10-08 08:21:17 +08:00
Kenny Root
6a6b007c77 Symlink application lib directory when on SD card
This will help legacy games that use dlopen() to directly access the
/data/data/<app>/lib directory before the
ApplicationInfo.nativeLibraryDir was part of the API.

Change-Id: Ie9f3e7239b6334708b5d086ffafe66a507f6d9da
2010-10-07 17:20:26 -07:00
Gilles Debunne
3ecceb5b94 Merge "TextView refactoring to ease future merges in HC." into gingerbread 2010-10-07 17:18:59 -07:00
Jaikumar Ganesh
f5cae7d1c5 am 38702d5f: Merge "DO NOT MERGE: Disconnect PBAP while disconnecting HFP profile." into gingerbread
Merge commit '38702d5f1c42e2dfcc8fa5472c8fe842b4056914' into gingerbread-plus-aosp

* commit '38702d5f1c42e2dfcc8fa5472c8fe842b4056914':
  DO NOT MERGE: Disconnect PBAP while disconnecting HFP profile.
2010-10-07 16:58:13 -07:00
Gilles Debunne
cbfbb524af TextView refactoring to ease future merges in HC.
Change-Id: I979324b28fa4ca787e5836271c9014bca590c595
2010-10-07 16:58:06 -07:00
Jaikumar Ganesh
38702d5f1c Merge "DO NOT MERGE: Disconnect PBAP while disconnecting HFP profile." into gingerbread 2010-10-07 16:56:06 -07:00