65532 Commits

Author SHA1 Message Date
Dianne Hackborn
21fbd1f7da Some cruft removal.
Change-Id: If4a94bfd4a033748eb13e8f3ff25e24382746778
2012-02-10 10:54:15 -08:00
Dianne Hackborn
d10035d52b Merge "Some hardening of isolated processes by restricting access to services." 2012-02-09 18:08:38 -08:00
Dianne Hackborn
a573f6a1d9 Some hardening of isolated processes by restricting access to services.
Services now must explicitly opt in to being accessed by isolated
processes.  Currently only the activity manager and surface flinger
allow this.  Activity manager is needed so that we can actually
bring up the process; SurfaceFlinger is needed to be able to get the
display information for creating the Configuration.  The SurfaceFlinger
should be safe because the app doesn't have access to the window
manager so can't actually get a surface to do anything with.

The activity manager now protects most of its entry points against
isolated processes.

Change-Id: I0dad8cb2c873575c4c7659c3c2a7eda8e98f46b0
2012-02-09 18:06:01 -08:00
Fabrice Di Meglio
8bb8dc9b5f Merge "Update BiDiTests app" 2012-02-09 17:35:21 -08:00
Fabrice Di Meglio
2a7e7a08d9 Update BiDiTests app
- add more unit tests for GridLayout (layout created by code)

Change-Id: I462c41a7c5bdcb6c5d3762570f5d415cc0fa0bde
2012-02-09 17:32:24 -08:00
Scott Main
9c81154dfe am ad231a30: am db7da7ee: am d9c8bbd5: docs: fix xss issue bug 5125642
* commit 'ad231a303ee8fe7f8b51900d7b57971ab9963ad4':
  docs: fix xss issue bug 5125642
2012-02-09 16:06:31 -08:00
Scott Main
ad231a303e am db7da7ee: am d9c8bbd5: docs: fix xss issue bug 5125642
* commit 'db7da7ee40231225861f4d39ea2f256bbca06f24':
  docs: fix xss issue bug 5125642
2012-02-09 16:04:15 -08:00
Scott Main
db7da7ee40 am d9c8bbd5: docs: fix xss issue bug 5125642
* commit 'd9c8bbd56a9c76a111f9441871e79516c521aa75':
  docs: fix xss issue bug 5125642
2012-02-09 16:01:51 -08:00
Scott Main
d9c8bbd56a docs: fix xss issue
bug 5125642

Change-Id: I326b619643e3b3de20aa9303e92c9218fdfe50f7
2012-02-09 15:57:09 -08:00
James Dong
4f0106cca0 Merge "Finish up B frame support in MPEG4Writer" 2012-02-09 15:22:58 -08:00
Jason Sams
468a971512 Merge "Remove unused param." 2012-02-09 15:17:27 -08:00
James Dong
9975229a73 Finish up B frame support in MPEG4Writer
o optimize to reduce the size of the size of the ctts box
o change the type for the time offset field in ctts table entry from int32_t to uint32_t according to the mp4 file spec
o also moved away from MediaDebug and used ADebug instead.

o related-to-bug: 4232183

Change-Id: I19364303728da64359c63169eec7487508c1d0f8
2012-02-09 15:02:08 -08:00
Andreas Huber
8f0f10a80a Merge "Experiment with seeking to closest frame instead of closest syncframe" 2012-02-09 14:52:58 -08:00
Jason Sams
87e2721f89 Remove unused param.
Change-Id: Idf26c3bf4eec7ed17dbfb99b40c314bce7996101
2012-02-09 14:50:50 -08:00
Andreas Huber
713f90f3ca Experiment with seeking to closest frame instead of closest syncframe
Also supports SEEK_CLOSEST mode in the Matroska/Webm extractor.

Change-Id: I257771648dfe41392a4cf8932f625489dcb9f234
2012-02-09 14:32:08 -08:00
Joe Fernandez
f4aaf1f562 am 4f21e3a0: am 20b9c795: am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1
* commit '4f21e3a08adefbb5e109e2f844386ed844c1c436':
  docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)
2012-02-09 13:51:00 -08:00
Joe Fernandez
4f21e3a08a am 20b9c795: am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1
* commit '20b9c795d4dedaabac335eb5bcd8f7ba32e38af3':
  docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)
2012-02-09 13:48:46 -08:00
Joe Fernandez
20b9c795d4 am 1c66faab: Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1
* commit '1c66faab73b2ce54bfe362f3c051ce95ed89fb22':
  docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)
2012-02-09 13:46:41 -08:00
Joe Fernandez
1c66faab73 Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1 2012-02-09 13:45:01 -08:00
Scott Main
e7eeace594 am ec12ae99: am 79cfde69: am 52bfc243: docs: fix misc doc bugs from external issue tracker
* commit 'ec12ae9933e463181338834387caa7c58b330635':
  docs: fix misc doc bugs from external issue tracker
2012-02-09 12:53:12 -08:00
Scott Main
ec12ae9933 am 79cfde69: am 52bfc243: docs: fix misc doc bugs from external issue tracker
* commit '79cfde69fdd9952d51d4d9915c8b7fca98331e2c':
  docs: fix misc doc bugs from external issue tracker
2012-02-09 12:50:18 -08:00
Scott Main
79cfde69fd am 52bfc243: docs: fix misc doc bugs from external issue tracker
* commit '52bfc243684b2f340da326aaa38e9021e4e3b2e6':
  docs: fix misc doc bugs from external issue tracker
2012-02-09 12:48:08 -08:00
Scott Main
52bfc24368 docs: fix misc doc bugs from external issue tracker
Change-Id: If6ff3476670e42b321d56d4a1482ccff96d4d500
2012-02-09 12:45:16 -08:00
Eric Fischer
48e1b91b36 Merge "Import translations. DO NOT MERGE" 2012-02-09 11:37:18 -08:00
Eric Fischer
351fc6b1e3 Import translations. DO NOT MERGE
Change-Id: Icc9762f02ccee5f0f4fe1dc1adb66ef82f42fdf6
2012-02-09 11:33:43 -08:00
Eric Fischer
c725a3705b Merge "Import translations. DO NOT MERGE" 2012-02-09 11:26:02 -08:00
Eric Fischer
d1828a7e8b Import translations. DO NOT MERGE
Change-Id: Ia7b72ee16445bfee6586be9f768e4e755e779a30
2012-02-09 11:23:34 -08:00
Dianne Hackborn
7ff3144aa6 Merge "Add new feature for running services in "isolated" sandbox processes." 2012-02-09 11:20:07 -08:00
Dianne Hackborn
a0c283eac3 Add new feature for running services in "isolated" sandbox processes.
This reserves a range of uids (for each user) in which these processes
run.  These uids are not associated with an application, so they
effectively run with no permissions.  When a Service requests to
run in such a process through android:isolatedProcess="true", each
time it is brought up a new isolated process is started with its
own unique uid.

What we have so far gives us the basic infrastructure; more work
remains to further lock down what these uids have access to.

Change-Id: Ibfd27c75619cba61f528f46ede9113f98dc5f45b
2012-02-09 11:18:33 -08:00
Joe Fernandez
a61f842040 docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)
Change-Id: I9d504017c507b2e203b8e0448d720714bec32e8c
2012-02-09 11:16:20 -08:00
Jamie Gennis
1c90e73f5d Merge "Refactored ISurfaceTexture calls from SurfaceTexture into BufferQueue." 2012-02-09 11:08:02 -08:00
Steve Block
0777d2df89 Merge "Clarify comments for WebSettings." 2012-02-09 03:04:49 -08:00
Justin Ho
fe07b9a2ab Merge "Tentative fix for mysteriously recycled bitmap" 2012-02-08 12:59:17 -08:00
Dianne Hackborn
f6a7e1f7cd Merge "Don't wait for current activity to pause before resuming next." 2012-02-08 11:38:23 -08:00
Romain Guy
4e525a6e5a Tentative fix for mysteriously recycled bitmap
This code should not be triggered with scale == 1.0f because of the
density comparisons above though.

Change-Id: I9e39e3769a3b6550c97df3b213457947ec1f554b
2012-02-08 11:19:11 -08:00
James Dong
e1a409ba68 Merge "Enable B frame support in MPEG4Writer" 2012-02-08 10:42:35 -08:00
Glenn Kasten
52835f5d20 Merge "Combine duplicate code & document wp<> in mClients" 2012-02-08 10:27:58 -08:00
Gilles Debunne
c067717c1e Merge "Invalidate text display list when text properties change." 2012-02-08 10:27:46 -08:00
Glenn Kasten
803a86a546 Combine duplicate code & document wp<> in mClients
Change-Id: Iea8cfe8e57563337fb2484a1246ef79d6ad3db18
2012-02-08 10:24:54 -08:00
Glenn Kasten
8e0cc398e3 Merge "Use audio_io_handle_t consistently instead of int" 2012-02-08 10:22:11 -08:00
Marco Nelissen
b3f04a6569 Merge "Delete entries in bulk" 2012-02-08 10:15:01 -08:00
Marco Nelissen
9ff4774cac Delete entries in bulk
Deleting entries from the database in bulk greatly speeds up the media
scanner in some cases; removing 31k entries used to take about 2 hours,
now it takes about 15 minutes.

Change-Id: Ia8f3fd6d828289e3d67178e9ad10399ded8d70d2
2012-02-08 10:13:11 -08:00
Glenn Kasten
39d00cb442 Use audio_io_handle_t consistently instead of int
Other:
 - add a comment to nextUniqueId
 - made ThreadBase::mId const, since it is only assigned in constructor.

Change-Id: I4e8b7bec4e45badcde6274d574b8a9aabd046837
2012-02-08 10:06:32 -08:00
Glenn Kasten
f31d05007c Simplify destructors
Remove explicit clear() when the order doesn't matter.

Change-Id: I5931bc7ef5f681c7ce329aa9ec0a6e46d34a56c5
2012-02-08 09:49:14 -08:00
Glenn Kasten
c722ba33dd Merge "Effect UUID inputs passed by pointer are const" 2012-02-08 09:37:26 -08:00
Glenn Kasten
6731333584 Effect UUID inputs passed by pointer are const
Change-Id: I1f5c338bcb7368e3dd8cd5f804b2e6d9fbe087f8
2012-02-08 09:21:39 -08:00
Wink Saville
1b6512127b Merge "Add ril.test.emergency system property." 2012-02-08 09:19:19 -08:00
Glenn Kasten
a5a6580d17 Merge "Use pid_t not int" 2012-02-08 08:40:28 -08:00
Glenn Kasten
1b33107f37 Merge "Don't double destruct audio_track_cblk_t" 2012-02-08 08:40:15 -08:00
Glenn Kasten
cd330e7f38 Merge "AudioFlinger methods const and inline" 2012-02-08 08:39:39 -08:00