23464 Commits

Author SHA1 Message Date
Brad Fitzpatrick
94f14aeca9 Merge "More StrictMode work, handling violations in ActivityManagerService." into gingerbread 2010-06-11 18:27:20 -07:00
Dirk Dougherty
3a010fa619 am 1067e689: Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo
Merge commit '1067e6895e941f56edc7bc3d7c16a7122fb5259b' into gingerbread

* commit '1067e6895e941f56edc7bc3d7c16a7122fb5259b':
  Doc change: remove pdf summary of guidelines from templates archive.
2010-06-11 16:56:04 -07:00
Dirk Dougherty
1067e6895e Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo 2010-06-11 16:49:14 -07:00
Brad Fitzpatrick
46d4238746 More StrictMode work, handling violations in ActivityManagerService.
Also starts to do duplicate-suppression.

Change-Id: I0502f6ab6c45fa319298de4874ecfe44b7829d21
2010-06-11 16:11:26 -07:00
Dirk Dougherty
e6727df7a7 Doc change: remove pdf summary of guidelines from templates archive.
Change-Id: I5394d1f95013ddf7790beda1f33e212bfbaee641
2010-06-11 15:59:47 -07:00
Andreas Huber
126ca6f9ec Merge "Must hold lock here..." into gingerbread 2010-06-11 15:58:19 -07:00
Irfan Sheriff
c2bc66d405 Merge "Dont persist config on failure" into gingerbread 2010-06-11 15:28:24 -07:00
Irfan Sheriff
afadc8b4e1 Dont persist config on failure
If soft AP bring up does not go through successfully,
dont persist the config. This has the benefit of recovering
from the case where things fail on "=" and "," for SSID since
the IOCTL parsing in driver on broadcom cannot handle it
at this time.

Change-Id: Iaa60fd05972db434500753dcb59092995dab07b1
2010-06-11 14:43:14 -07:00
James Dong
f62c57d684 Merge "Initial checkin for pause and resume control" into kraken 2010-06-11 14:28:55 -07:00
Andreas Huber
9e937269a6 Must hold lock here...
Change-Id: I179a5582c9246f78c988f85e2f969f32d547ac89
2010-06-11 14:16:12 -07:00
James Dong
08c7473ce9 Initial checkin for pause and resume control
Change-Id: Ibdcf7bea5fb66baa81878704ba4091dfcfe382ee
2010-06-11 13:48:48 -07:00
Dianne Hackborn
9f8cc518e1 Merge "Adjust activity manager process OOM adj." into kraken 2010-06-11 10:53:16 -07:00
Andreas Huber
f5eafe40cd Merge "Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned." into kraken 2010-06-11 10:52:00 -07:00
Dianne Hackborn
32907cfb38 Adjust activity manager process OOM adj.
Modify OOM adj classes a bit, to take into account the new
heavy weight app type, and give "foreground services" their
own category to have a bettery chance to manager them when
things go wrong.

Also add some new code to battery stats to keep a history
of changes to the battery level.

Change-Id: I29f5ab6938777e1a7eafd7d8c38b5e564cc9f96a
2010-06-11 10:39:11 -07:00
Andreas Huber
3a53dc5ad9 Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned.
Change-Id: I506dc501faec60e974bf4968d8ba661df7a49aa8
2010-06-11 09:57:46 -07:00
Andreas Huber
e577e87a2d Fix a typo in NuCachedSource2 that would trigger an assert near the end of a stream.
Change-Id: I963ad7074b830d553b67c8925efd5369d0b7a5b9
2010-06-11 09:22:48 -07:00
Chih-Chung Chang
b8bb78f54b Change camera interface to support multiple cameras.
Change-Id: Ie88fe706d2278acf762eca87780de349434778a4
2010-06-11 16:47:33 +08:00
Wu-cheng Li
2fd73a4522 Unhide camera metering mode API.
Change-Id: Ia3ca83e2a0b5b322e5dbf9ae3d5c1d3b89e0fd31
2010-06-11 15:29:49 +08:00
Irfan Sheriff
f4f614f5ed am 9f2a0115: Merge "Remove indefinite DHCP retries" into froyo
Merge commit '9f2a0115220c8e288c32d8cf90e235a2f2be115b' into kraken

* commit '9f2a0115220c8e288c32d8cf90e235a2f2be115b':
  Remove indefinite DHCP retries
2010-06-10 18:59:42 -07:00
Irfan Sheriff
9f2a011522 Merge "Remove indefinite DHCP retries" into froyo 2010-06-10 18:56:04 -07:00
Mathias Agopian
9d8e8dcc84 Merge "fix [2757903] Crash in EGL when creating an EGLSurface" into kraken 2010-06-10 17:12:42 -07:00
Mathias Agopian
8b73ae4a1e fix [2757903] Crash in EGL when creating an EGLSurface
Change-Id: I995947ac40d1a5c86dce495550baf6864ecf5f54
2010-06-10 17:06:27 -07:00
Irfan Sheriff
60d0d22c75 Remove indefinite DHCP retries
Replace indefinite DHCP retries
with a sufficiently large retry count

Bug: 2761057
Change-Id: I4570b74476aa78c71c73e06c2aafac33d924e867
2010-06-10 16:34:16 -07:00
Mike Lockwood
4001120e45 am f4a502a2: Merge "Don\'t adjust lights if screen or button brightness is changed when the screen is off." into froyo
Merge commit 'f4a502a235e9f9ea0bcd2d5ca4981dc6e1a619c4' into kraken

* commit 'f4a502a235e9f9ea0bcd2d5ca4981dc6e1a619c4':
  Don't adjust lights if screen or button brightness is changed when the screen is off.
2010-06-10 15:30:41 -07:00
Mike Lockwood
f4a502a235 Merge "Don't adjust lights if screen or button brightness is changed when the screen is off." into froyo 2010-06-10 15:28:31 -07:00
Andreas Huber
4d61f602bf Switch stagefright's approach to prefetching to the new model. The java MediaPlayer is now notified about rebuffering start/end via info messages.
Change-Id: If8185ba329ce8b6663b1ad39a4efb0ad3be81df2
2010-06-10 15:16:57 -07:00
Andreas Huber
a6ef19a8f4 Merge "Simplify the code in the stagefright commandline utility." into kraken 2010-06-10 15:15:50 -07:00
Andreas Huber
fbdb5f1bb6 Merge "Switch LiveSource to use the new http data source instead of the old one." into kraken 2010-06-10 15:15:43 -07:00
Andreas Huber
8f86451314 Merge "Fix String8 to free its memory only after assignment operations based on pointers are finished in case that pointer referred to the string's original contents." into kraken 2010-06-10 15:15:37 -07:00
Andreas Huber
c81d2c12de Merge "Initial check-in of new caching/prefetching data source implementation." into kraken 2010-06-10 15:15:29 -07:00
Brad Fitzpatrick
438d059512 Introduce "StrictMode"
This is a new public API for developers to opt-in to strict rules
about what they're allowed to do on certain threads.  (this is the
public face of the @hide dalvik.system.BlockGuard, added recently...)

In practice this will be used for developers to opt-in to declaring
that they don't want to be allowed to do various operations (such as
disk I/O or network operations) on their main UI threads.  (these
operations are often accidental, or even when they are fast come with
a good chance of being slow or very slow in some cases....)

Implementation wise, this is just a thread-local integer that has a
bitmask of the things that aren't allowed, and more bits for saying
what the violation penalty is.  The penalties, of which multiple can
be chosen, include:

  * logging
  * dropbox uploading for analysis/reporting
  * annoying dialog
  * full-on crashing

These are all only very roughly implemented at this point, but all
parts now minimally work end-to-end now, so this is a good checkpoint
commit before this gets too large.

Future CLs will polish all the above 4 penalties, including
checksumming of stacktraces and minimizing penalties for duplicate
violations.

Change-Id: Icbe61a2e950119519e7364030b10c3c28d243abe
2010-06-10 14:38:58 -07:00
Adam Powell
8f1bfb001b am 8f2ca788: Merge "Fix bug 2757693 - Multi-touch coordinates can jump when a finger goes down." into froyo
Merge commit '8f2ca788f369892370477212cf9e7a67721a8c16' into kraken

* commit '8f2ca788f369892370477212cf9e7a67721a8c16':
  Fix bug 2757693 - Multi-touch coordinates can jump when a finger goes down.
2010-06-10 14:13:51 -07:00
Adam Powell
8f2ca788f3 Merge "Fix bug 2757693 - Multi-touch coordinates can jump when a finger goes down." into froyo 2010-06-10 14:09:50 -07:00
Andreas Huber
8d30028065 Merge "Support "pausing" of MediaSources with the effect that they no longer pull on their upstream source until a subsequent read-with-seek." into kraken 2010-06-10 12:41:05 -07:00
Andreas Huber
75c1c8e3f5 Merge "Initial check in of a new http data source implementation." into kraken 2010-06-10 12:40:39 -07:00
Nick Kralevich
9a9724c3be am a2c6d5bf: (-s ours) do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch
Merge commit 'a2c6d5bf308181c019ade0aac6d25fe33dc3d76c' into kraken

* commit 'a2c6d5bf308181c019ade0aac6d25fe33dc3d76c':
  do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch
2010-06-10 11:54:53 -07:00
Andreas Huber
c0668843d3 Simplify the code in the stagefright commandline utility.
Change-Id: Ia222b25ef12af34f6434421fd96b67eca800d1ab
2010-06-10 11:27:06 -07:00
Andreas Huber
82f8fd6a49 Switch LiveSource to use the new http data source instead of the old one.
Change-Id: I9623c480628c495dbfbe02bdc6372724a107e2e8
2010-06-10 11:26:24 -07:00
Andreas Huber
62a2aa0152 Fix String8 to free its memory only after assignment operations based on pointers are finished in case that pointer referred to the string's original contents.
Change-Id: I6961f3cf10ba3b728579ea63262db750a4cf8577
2010-06-10 11:25:51 -07:00
Andreas Huber
1f24b30fe4 Support "pausing" of MediaSources with the effect that they no longer pull on their upstream source until a subsequent read-with-seek.
Change-Id: Ie4153a10ab36c1135f5fcfb572958129d886bcc3
2010-06-10 11:24:49 -07:00
Andreas Huber
b206319122 Initial check-in of new caching/prefetching data source implementation.
Change-Id: I97a6e3f03c69c9b1219f1f06bd109c0102f2c504
2010-06-10 11:23:56 -07:00
Andreas Huber
163c493b50 Initial check in of a new http data source implementation.
Change-Id: I17c358288ffe9ef690d702c58723c766d0a0cf21
2010-06-10 11:22:56 -07:00
Mike Lockwood
f527c715d7 Don't adjust lights if screen or button brightness is changed when the screen is off.
Change-Id: I798a240374c3a739e1f1eaf36fa9fdef8416f2a2
BUG: 2758292

Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-06-10 14:14:00 -04:00
Nick Kralevich
a2c6d5bf30 do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch
Change-Id: Ie20371234a531f65f523682a0d0c27394dc30afa
2010-06-10 10:39:42 -07:00
James Dong
3a0b37a04e Merge "Remove the lock/unlock workaround from CameraService" into kraken 2010-06-10 10:14:38 -07:00
Andreas Huber
66b89a62aa Merge "Apparently the TI video decoder only supports H.264 up to baseline profile/level 3, not level 3.x as previously assumed." into kraken 2010-06-10 10:12:57 -07:00
Andreas Huber
e2f85077a2 Apparently the TI video decoder only supports H.264 up to baseline profile/level 3, not level 3.x as previously assumed.
Change-Id: I4a9aa80f392dbef72f81e25c67e5bd0654848b2c
2010-06-10 09:52:11 -07:00
Kenny Root
36921ad858 am b00854d4: Import revised translations
Merge commit 'b00854d4c07ee8c810d1e32984543297bfa80a8e' into kraken

* commit 'b00854d4c07ee8c810d1e32984543297bfa80a8e':
  Import revised translations
2010-06-09 22:31:32 -07:00
Kenny Root
b00854d4c0 Import revised translations
Change-Id: I25faf1ade5252fa29cf43aa13e99fef9fc31b418
2010-06-09 22:25:58 -07:00
James Dong
71d714ccbf Remove the lock/unlock workaround from CameraService
bug - 2677772

Change-Id: I7c996daad8b3bfc89e9fa2d655dc18c9a5c68f2f
2010-06-09 21:30:43 -07:00