Dan Morrill
61f1cbdd71
am a800a2ef: Merge "Adding a feature definition corresponding to support for Near-Field Communications (NFC)." into gingerbread
...
Merge commit 'a800a2efa29d88e198220753f07e7d9ff69ddd9b' into gingerbread-plus-aosp
* commit 'a800a2efa29d88e198220753f07e7d9ff69ddd9b':
Adding a feature definition corresponding to support for Near-Field
2010-09-01 15:05:34 -07:00
Andreas Huber
4d8f66bce3
Better support for buffered streaming of rtsp content, if buffer drops below a certain threshold we will temporarily pause playback until we have sufficient data.
...
Change-Id: Ice8564e902e48c89c9c00f6651c5504b3c41fcad
related-to-bug: 2556656
2010-09-01 15:05:28 -07:00
Dan Morrill
a800a2efa2
Merge "Adding a feature definition corresponding to support for Near-Field Communications (NFC)." into gingerbread
2010-09-01 15:03:02 -07:00
Nick Kralevich
b4de2f9975
am 05f0382b: When dropping privileges, check return values.
...
Merge commit '05f0382bcf11d96760ee8cf9110099a1661eed7c' into gingerbread-plus-aosp
* commit '05f0382bcf11d96760ee8cf9110099a1661eed7c':
When dropping privileges, check return values.
2010-09-01 14:59:52 -07:00
Andreas Huber
4fd76ba227
am 81f339bc: Merge "Fixing the build." into gingerbread
...
Merge commit '81f339bcfeee5dccb284cdeac6941179f91fe08b' into gingerbread-plus-aosp
* commit '81f339bcfeee5dccb284cdeac6941179f91fe08b':
Fixing the build.
2010-09-01 14:53:12 -07:00
Kenny Root
9088a3d153
am 7c1bd7fd: Fix logic error in downgrade of system apps
...
Merge commit '7c1bd7fdbf9ac539c9832693b403511b2fc7bac7' into gingerbread-plus-aosp
* commit '7c1bd7fdbf9ac539c9832693b403511b2fc7bac7':
Fix logic error in downgrade of system apps
2010-09-01 14:52:54 -07:00
Wink Saville
28961cc02f
Changed ConnectivityService#getServiceInstance so its a singleton.
...
Change-Id: I27b5688a50917b01fb2fcd1c124da77ccae226b5
2010-09-01 14:48:29 -07:00
Nick Kralevich
05f0382bcf
When dropping privileges, check return values.
...
setuid() and family can fail. Check return values to make
sure this doesn't happen unexpectedly.
Also call setgid() to drop root group permissions.
Change-Id: Id06fbe6239e2ed2fe23368695e333514e0581e6d
2010-09-01 14:44:54 -07:00
Dan Morrill
76437d3793
Adding a feature definition corresponding to support for Near-Field
...
Communications (NFC).
Change-Id: I32b1b949524bfd978f53e23e02d38dfba4a2ea9c
2010-09-01 14:42:23 -07:00
Robert Greenwalt
cff25ffb0a
Remember mobile nets availability
...
Change-Id: I402ac64bf477b0b600b17f0267c2ff5c19ab9cf3
2010-09-01 14:38:07 -07:00
Jason Sams
0eb9b77eec
Merge "Remove functions for reflecting dalvik classes to rs types."
2010-09-01 14:36:47 -07:00
Jamie Gennis
2198d7517c
Revert "Merge "Add the new Stagefright ANativeWindow OMX codec API.""
...
This reverts commit 8a643b411e , reversing
changes made to 73ea9beaf8 .
2010-09-01 14:32:35 -07:00
Jason Sams
deb0008c63
Remove ACC and other legacy bits from RS.
...
Change-Id: I12a3b0477f3201ec7ca63564ae2b387ecc89dedf
2010-09-01 14:23:13 -07:00
Jason Sams
e447a78635
Remove functions for reflecting dalvik classes to rs types.
...
Change-Id: I41bc7fd704772d177f8035c04256d0ca63e4398b
Change-Id: I4df3673a1db1e79c309ab4eb41d2145802ed322c
2010-09-01 14:22:36 -07:00
Andreas Huber
81f339bcfe
Merge "Fixing the build." into gingerbread
2010-09-01 14:21:49 -07:00
Andreas Huber
752fe99276
Fixing the build.
...
Change-Id: I6414a5ed2a92f5e375e19caf7453abd268ce76d3
2010-09-01 14:20:33 -07:00
Kenny Root
11d12f7efc
am fca5677a: Merge "Add null check for package settings" into gingerbread
...
Merge commit 'fca5677aeefc3b9cbaecefbb10d5ccbaff974391' into gingerbread-plus-aosp
* commit 'fca5677aeefc3b9cbaecefbb10d5ccbaff974391':
Add null check for package settings
2010-09-01 14:12:26 -07:00
James Dong
a87544b35f
Make sure that if initialization fails, AudioSource still behaves well.
...
Change-Id: I16dfc90bcb8a324d6ee9a38a5a1a31cc094c820a
2010-09-01 14:11:28 -07:00
Kenny Root
7c1bd7fdbf
Fix logic error in downgrade of system apps
...
A logic error would allow not deleting data when uninstalling a system
app upgrade that's of a newer release than the on on the system
partition. If the system app had a database upgrade and this happened,
you might be in trouble.
Luckily it appears no one ever does this in code. You'd have to manually
get there doing:
adb uninstall -k updated.system.package
Change-Id: I3110fedf2d147975a0635c71898d985dd642a2c1
2010-09-01 14:10:36 -07:00
Kenny Root
fca5677aee
Merge "Add null check for package settings" into gingerbread
2010-09-01 14:09:01 -07:00
Dianne Hackborn
23600cec3d
Merge "Missing clean step."
2010-09-01 14:07:18 -07:00
Adam Powell
6fb81376b6
am e34fe69e: Merge "DO NOT MERGE Integrate edge effects into WebView." into gingerbread
...
Merge commit 'e34fe69e66d8c9bc76453347ba84261b060300f3' into gingerbread-plus-aosp
* commit 'e34fe69e66d8c9bc76453347ba84261b060300f3':
DO NOT MERGE Integrate edge effects into WebView.
2010-09-01 14:01:44 -07:00
Jamie Gennis
8a643b411e
Merge "Add the new Stagefright ANativeWindow OMX codec API."
2010-09-01 14:00:33 -07:00
Kenny Root
9ee9274e5e
Add null check for package settings
...
A few lines down "ps" is run through a null check, so apparently there
could be some screwy system conditions where this is encountered. And,
in fact, this was encountered through an updated system pacakge that
managed to delete the package from /system/app during testing. It left
the PackageSetting in mDisabledSysPackages which would cause a deference
of a null variable.
Change-Id: Ic7faca569abd16a87a8a69c20df08c11a274a001
2010-09-01 13:59:02 -07:00
Andreas Huber
71c908c475
am 6c33904a: Merge "Now that AmrInputStream no longer relies on opencore, make sure it\'s registered in non-opencore builds." into gingerbread
...
Merge commit '6c33904ad948cb64245fbc5950c839e4d9e56de3' into gingerbread-plus-aosp
* commit '6c33904ad948cb64245fbc5950c839e4d9e56de3':
Now that AmrInputStream no longer relies on opencore, make sure it's registered in non-opencore builds.
2010-09-01 13:57:44 -07:00
Adam Powell
e34fe69e66
Merge "DO NOT MERGE Integrate edge effects into WebView." into gingerbread
2010-09-01 13:57:05 -07:00
Alex Sakhartchouk
73ea9beaf8
Merge "Cleaning up the api"
2010-09-01 13:55:16 -07:00
Andreas Huber
6c33904ad9
Merge "Now that AmrInputStream no longer relies on opencore, make sure it's registered in non-opencore builds." into gingerbread
2010-09-01 13:54:12 -07:00
Daisuke Miyakawa
f90132b3fe
Merge "Clarify the behavior of ListView#setColorHint()."
2010-09-01 13:50:20 -07:00
Nipun Kwatra
239f2e5b01
Support for auxiliary video parameters.
...
Added support for passing width, height and video bitrate
for the auxiliary video.
Also setting encoder level depending on the video size and bitrate.
Change-Id: I4a90046853f67287c3e7e6babc75b4827f0c3e73
2010-09-01 13:46:46 -07:00
Andreas Huber
52d14be119
am 47f2cf62: am 412fc7cd: Merge "Keep gtalk video chat specific code consistent with rtsp changes." into gingerbread
...
Merge commit '47f2cf620731226a9311db0f864a4e1404e54b96'
* commit '47f2cf620731226a9311db0f864a4e1404e54b96':
Keep gtalk video chat specific code consistent with rtsp changes.
2010-09-01 13:45:30 -07:00
Andreas Huber
47f2cf6207
am 412fc7cd: Merge "Keep gtalk video chat specific code consistent with rtsp changes." into gingerbread
...
Merge commit '412fc7cdb6a1c4b6afe85b58fcc794fd67271942' into gingerbread-plus-aosp
* commit '412fc7cdb6a1c4b6afe85b58fcc794fd67271942':
Keep gtalk video chat specific code consistent with rtsp changes.
2010-09-01 13:42:46 -07:00
Andreas Huber
412fc7cdb6
Merge "Keep gtalk video chat specific code consistent with rtsp changes." into gingerbread
2010-09-01 13:39:27 -07:00
Dianne Hackborn
054de0aae7
Missing clean step.
...
Change-Id: Ib91fbfe3c28bf97f88de1b0c1df697a41ac0cc27
2010-09-01 13:33:16 -07:00
Andreas Huber
8d7d413959
Now that AmrInputStream no longer relies on opencore, make sure it's registered in non-opencore builds.
...
Change-Id: Ia9748691ba60d3c4b5fcaf319ed0b4493d69abc6
related-to-bug: 2963846
2010-09-01 13:27:14 -07:00
Andreas Huber
564a9f2434
am 021a822e: am de2b1615: Merge "Properly extract all raw_data_blocks from an ADSP mpeg4 audio buffer." into gingerbread
...
Merge commit '021a822e76ab34a6404486e23157db6b6c50ec3e'
* commit '021a822e76ab34a6404486e23157db6b6c50ec3e':
Properly extract all raw_data_blocks from an ADSP mpeg4 audio buffer.
2010-09-01 13:21:13 -07:00
Daniel Sandler
901fd85c53
am 9ce87963: (-s ours) am b1387127: Merge "Fix build (restore deleted assets)." into gingerbread
...
Merge commit '9ce879636ebe6e7eabbe4fa3f525cea25d5d9c10'
* commit '9ce879636ebe6e7eabbe4fa3f525cea25d5d9c10':
Fix build (restore deleted assets).
2010-09-01 13:21:07 -07:00
Derek Sollenberger
edb3211c85
am 27c6f7d4: am 1614843e: Merge "Fix invalid comment in WebSettings." into gingerbread
...
Merge commit '27c6f7d44c592ab8685b93a2ec30a74d594c822d'
* commit '27c6f7d44c592ab8685b93a2ec30a74d594c822d':
Fix invalid comment in WebSettings.
2010-09-01 13:18:40 -07:00
Daniel Sandler
1b1c9a2e7f
am 036b3157: (-s ours) am 8f8fcfa3: Notifications are now light-on-dark in the windowshade.
...
Merge commit '036b315747200b27cb1d5bc2d7d7cda9b9f8f1f0'
* commit '036b315747200b27cb1d5bc2d7d7cda9b9f8f1f0':
Notifications are now light-on-dark in the windowshade.
2010-09-01 13:18:28 -07:00
Daisuke Miyakawa
5be37c81a7
Clarify the behavior of ListView#setColorHint().
...
Bug: 2965521
Change-Id: Iacd139b0e9eec4bfdd007eb1391cc45c1d889b00
2010-09-01 13:09:08 -07:00
Jamie Gennis
dab357bfd0
Add the new Stagefright ANativeWindow OMX codec API.
...
This change defines the two OMX_SetParameter calls that enable OMX codecs to
interact with ANativeWindows. It also adds the plumbing to the IOMX, OMX, and
OMXNodeInstance classes to use these new APIs.
Change-Id: Ibfbf893dc3513db0b3d3221bec5708c77287cddc
2010-09-01 13:07:08 -07:00
Andreas Huber
021a822e76
am de2b1615: Merge "Properly extract all raw_data_blocks from an ADSP mpeg4 audio buffer." into gingerbread
...
Merge commit 'de2b1615d27881d98f483fc9158497fbe1fc5f8d' into gingerbread-plus-aosp
* commit 'de2b1615d27881d98f483fc9158497fbe1fc5f8d':
Properly extract all raw_data_blocks from an ADSP mpeg4 audio buffer.
2010-09-01 13:03:27 -07:00
Daniel Sandler
804eb85834
Fix longpress on Menu showing IME.
...
Bug: 2964208
Change-Id: I1e66ed95978a7b67ede32d08cc32ddf161cb85e0
2010-09-01 16:02:55 -04:00
Andreas Huber
de2b1615d2
Merge "Properly extract all raw_data_blocks from an ADSP mpeg4 audio buffer." into gingerbread
2010-09-01 12:59:04 -07:00
Elliott Slaughter
7c2d1353f5
Cleanup temporary incognito mode files after last tab closes.
...
Change-Id: Iae5df353fdfd36c8eefa273a8812e80309e42841
2010-09-01 12:55:52 -07:00
Brian Carlstrom
c9ad7c6dbb
resolved conflicts for merge of 41e99538 to master
...
Change-Id: Idddb72e369f127cd74322c3c7385701c2412e343
2010-09-01 12:41:36 -07:00
Andreas Huber
4dcc6a1020
Properly extract all raw_data_blocks from an ADSP mpeg4 audio buffer.
...
Change-Id: I15e21eae50beb6057024ea42a7e9bf3b8d8a0603
related-to-bug: 2368598
2010-09-01 12:25:36 -07:00
Alex Sakhartchouk
32fc363c8c
Cleaning up the api
...
Change-Id: I86632cfde07216be7623177516710db5d9a57522
2010-09-01 12:17:10 -07:00
Adam Powell
230269d43b
DO NOT MERGE Integrate edge effects into WebView.
...
TODO Effect for scaling gestures; asset/polish tweaks.
Change-Id: Ifbc201cb64e0610dbc92a7c57ba0d3a4ee686c43
2010-09-01 11:56:56 -07:00
Daniel Sandler
9ce879636e
am b1387127: Merge "Fix build (restore deleted assets)." into gingerbread
...
Merge commit 'b1387127f18b73d7f1038dad6e432329b78264ae' into gingerbread-plus-aosp
* commit 'b1387127f18b73d7f1038dad6e432329b78264ae':
Fix build (restore deleted assets).
2010-09-01 11:48:19 -07:00