67364 Commits

Author SHA1 Message Date
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
b64807855c am 1c90e73f: Merge "Refactored ISurfaceTexture calls from SurfaceTexture into BufferQueue."
* commit '1c90e73f5d22c3d8e07b236ec8f33a42c01e056f':
  Refactored ISurfaceTexture calls from SurfaceTexture into BufferQueue.
2012-02-09 11:09:30 -08:00
Jamie Gennis
1c90e73f5d Merge "Refactored ISurfaceTexture calls from SurfaceTexture into BufferQueue." 2012-02-09 11:08:02 -08:00
Steve Block
491d50b0c0 am 0777d2df: Merge "Clarify comments for WebSettings."
* commit '0777d2df89e4c5269fce6054ee1a0446043ce112':
  Clarify comments for WebSettings.
2012-02-09 03:29:24 -08:00
Steve Block
0777d2df89 Merge "Clarify comments for WebSettings." 2012-02-09 03:04:49 -08:00
Eric Fischer
e42fe553a7 Import translations. DO NOT MERGE
Change-Id: Id6eb7d951bbbd8d01ce11670946282eecd7bc984
2012-02-08 18:46:47 -08:00
Glenn Kasten
0765c448ab No newline or space at end of ALOG format string
Change-Id: I0bef580cbc818cb7c87aea23919d26f1446cec32
2012-02-08 17:21:49 -08:00
Marco Nelissen
de7408c94e Fix "dumpsys activity provider"
Change-Id: Ic0678a6edb539bb5648529dd9c38a382bc9cc3fb
2012-02-08 14:57:38 -08:00
Justin Ho
cc3669ab9c am fe07b9a2: Merge "Tentative fix for mysteriously recycled bitmap"
* commit 'fe07b9a2ab54305de553332d0ab278fdf7158ae4':
  Tentative fix for mysteriously recycled bitmap
2012-02-08 13:00:39 -08:00
Justin Ho
fe07b9a2ab Merge "Tentative fix for mysteriously recycled bitmap" 2012-02-08 12:59:17 -08:00
Glenn Kasten
3773334fbd Move declaration of stream_type_t up earlier
stream_type_t is used by AudioFlinger class, so it should be declared there.
This way we don't have to peek into PlaybackThread to get the declaration.

Change-Id: Ie08bab1604699214d1e8df2d48d3fbfbbc436e96
2012-02-08 12:54:31 -08:00
Glenn Kasten
aae26c8de4 Rename type() to streamType()
This avoids possible confusion with thread's type().
Also remove redundant cast "(audio_stream_type_t)".

Change-Id: I320b9177b6c267a102d215f002228bcf988c437a
2012-02-08 12:52:00 -08:00
Dianne Hackborn
0181fbc42c am f6a7e1f7: Merge "Don\'t wait for current activity to pause before resuming next."
* commit 'f6a7e1f7cd12fbbb2e35391850aec7d7d57b8f66':
  Don't wait for current activity to pause before resuming next.
2012-02-08 11:40:04 -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
49786bbdb5 am e1a409ba: Merge "Enable B frame support in MPEG4Writer"
* commit 'e1a409ba68087c66238c986b270c17932e39f0ba':
  Enable B frame support in MPEG4Writer
2012-02-08 10:44:44 -08:00
James Dong
e1a409ba68 Merge "Enable B frame support in MPEG4Writer" 2012-02-08 10:42:35 -08:00
Glenn Kasten
50c1e12bdb am 52835f5d: Merge "Combine duplicate code & document wp<> in mClients"
* commit '52835f5d201ac05743586f3553ced856d62a08fb':
  Combine duplicate code & document wp<> in mClients
2012-02-08 10:29:48 -08:00
Gilles Debunne
9059f1a5b1 am c067717c: Merge "Invalidate text display list when text properties change."
* commit 'c067717c1e4e25c511c3712e213c6f0ce2451d57':
  Invalidate text display list when text properties change.
2012-02-08 10:29:46 -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
850e388b7f am 8e0cc398: Merge "Use audio_io_handle_t consistently instead of int"
* commit '8e0cc398e348f2c75498f813560bc73be6640371':
  Use audio_io_handle_t consistently instead of int
2012-02-08 10:23:31 -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
b203520129 am b3f04a65: Merge "Delete entries in bulk"
* commit 'b3f04a656907abb0d89485edb24517249a0a9142':
  Delete entries in bulk
2012-02-08 10:17:18 -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
aba367242f am f31d0500: Simplify destructors
* commit 'f31d05007c9cc5db90e0641e4f8621f5463dcb4e':
  Simplify destructors
2012-02-08 09:52:58 -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
c73fcba30a am c722ba33: Merge "Effect UUID inputs passed by pointer are const"
* commit 'c722ba33dd1225cd26d9d758e08234a1bb8f4864':
  Effect UUID inputs passed by pointer are const
2012-02-08 09:39:49 -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
ab9cfbc54a am 1b651212: Merge "Add ril.test.emergency system property."
* commit '1b6512127b11256b615c3f8e9049494fb0ad4f1b':
  Add ril.test.emergency system property.
2012-02-08 09:21:24 -08:00
Wink Saville
1b6512127b Merge "Add ril.test.emergency system property." 2012-02-08 09:19:19 -08:00
Glenn Kasten
f56593afa0 am a5a6580d: Merge "Use pid_t not int"
* commit 'a5a6580d17acbad9407a92e7372598aeed3d0a70':
  Use pid_t not int
2012-02-08 08:42:22 -08:00
Glenn Kasten
8b86df6aae am 1b33107f: Merge "Don\'t double destruct audio_track_cblk_t"
* commit '1b33107f3798636cb85cc876b17d4e2adbf1294a':
  Don't double destruct audio_track_cblk_t
2012-02-08 08:42:18 -08:00
Glenn Kasten
0ec520ce27 am cd330e7f: Merge "AudioFlinger methods const and inline"
* commit 'cd330e7f38bf72290c1a230cb93b8177470e88bf':
  AudioFlinger methods const and inline
2012-02-08 08:42:16 -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
Glenn Kasten
ca41e6ef17 am 1e3a8d30: Merge "Remove dead mutex in AudioTrack/AudioRecord thread"
* commit '1e3a8d3090f2a33562201f95f736949a8d2df576':
  Remove dead mutex in AudioTrack/AudioRecord thread
2012-02-08 08:37:52 -08:00
Glenn Kasten
1a60c3077f am cbe8b722: Merge "Use virtual destructors"
* commit 'cbe8b722479c7777c1ada27a898cefa47c1acdc7':
  Use virtual destructors
2012-02-08 08:35:41 -08:00
Glenn Kasten
1e3a8d3090 Merge "Remove dead mutex in AudioTrack/AudioRecord thread" 2012-02-08 08:34:33 -08:00
Mikhail Naganov
605a491c28 Clarify comments for WebSettings.
setLoadsImagesAutomatically
getLoadsImagesAutomatically
setBlockNetworkImage
getBlockNetworkImage
setBlockNetworkLoads
getBlockNetworkLoads

Change-Id: Ic1486266a77254044425cdb51cce5c982ea0617c
2012-02-08 16:34:29 +00:00
Glenn Kasten
cbe8b72247 Merge "Use virtual destructors" 2012-02-08 08:33:41 -08:00
Glenn Kasten
1c7b728008 am 22776652: Merge "Improve performance for sp<> on stack"
* commit '2277665266780eae75d6c25df4826bffbffa00cc':
  Improve performance for sp<> on stack
2012-02-08 07:47:29 -08:00
Glenn Kasten
e8791620fc am 09b9ba0d: Merge "AudioTrack declare more methods const"
* commit '09b9ba0db29aaebe682b7391d93ae179b8bd8ee8':
  AudioTrack declare more methods const
2012-02-08 07:45:22 -08:00