Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,844 Commits 3 Branches 0 Tags
dac5e0013d1ea396f0b3a3f07654f2ecbfb79ac9
Commit Graph

23844 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chih-Chung Chang
dac5e0013d am b8bb78f5: Change camera interface to support multiple cameras. 
Merge commit 'b8bb78f54b48868465a9d69d65fda08524ab5ae1' into gingerbread-plus-aosp

* commit 'b8bb78f54b48868465a9d69d65fda08524ab5ae1':
  Change camera interface to support multiple cameras.
 2010-06-11 03:27:30 -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
e5dd62e873 am 2fd73a45: Unhide camera metering mode API. 
Merge commit '2fd73a452268d2acb6e72a1d23a422085ed3c510' into gingerbread-plus-aosp

* commit '2fd73a452268d2acb6e72a1d23a422085ed3c510':
  Unhide camera metering mode API.
 2010-06-11 00:33:37 -07:00
Wu-cheng Li
2fd73a4522 Unhide camera metering mode API. 
Change-Id: Ia3ca83e2a0b5b322e5dbf9ae3d5c1d3b89e0fd31
 2010-06-11 15:29:49 +08:00
Irfan Sheriff
749defb0ca am f4f614f5: am 9f2a0115: Merge "Remove indefinite DHCP retries" into froyo 2010-06-10 19:02:23 -07: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
5b669581b3 am 9d8e8dcc: Merge "fix [2757903] Crash in EGL when creating an EGLSurface" into kraken 2010-06-10 17:15:12 -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
799f0e5076 am 4001120e: am f4a502a2: Merge "Don\'t adjust lights if screen or button brightness is changed when the screen is off." into froyo 2010-06-10 15:32:51 -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
627a001966 am 4d61f602: Switch stagefright\'s approach to prefetching to the new model. The java MediaPlayer is now notified about rebuffering start/end via info messages. 2010-06-10 15:19:29 -07:00
Andreas Huber
32d8b25fe6 am a6ef19a8: Merge "Simplify the code in the stagefright commandline utility." into kraken 2010-06-10 15:17:40 -07:00
Andreas Huber
566e64af84 am fbdb5f1b: Merge "Switch LiveSource to use the new http data source instead of the old one." into kraken 2010-06-10 15:17:35 -07:00
Andreas Huber
b9d7b46ba3 am 8f864513: 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:17:30 -07:00
Andreas Huber
960a0ff1f4 am c81d2c12: Merge "Initial check-in of new caching/prefetching data source implementation." into kraken 2010-06-10 15:17:24 -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
f37cbe6bb6 am 438d0595: Introduce "StrictMode" 2010-06-10 15:03:26 -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
45c3f843d6 am 8f1bfb00: am 8f2ca788: Merge "Fix bug 2757693 - Multi-touch coordinates can jump when a finger goes down." into froyo 2010-06-10 14:16:32 -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
c90e35c1fc am 8d300280: 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:42:10 -07:00
Andreas Huber
3ee447e4f7 am 75c1c8e3: Merge "Initial check in of a new http data source implementation." into kraken 2010-06-10 12:42:06 -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
fc66fa5376 am 9a9724c3: am a2c6d5bf: (-s ours) do not merge: cherry-picked 929b4855b8 from master branch 2010-06-10 11:57:05 -07:00
Nick Kralevich
9a9724c3be am a2c6d5bf: (-s ours) do not merge: cherry-picked 929b4855b8 from master branch 
Merge commit 'a2c6d5bf308181c019ade0aac6d25fe33dc3d76c' into kraken

* commit 'a2c6d5bf308181c019ade0aac6d25fe33dc3d76c':
  do not merge: cherry-picked 929b4855b8 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 929b4855b8 from master branch 
Change-Id: Ie20371234a531f65f523682a0d0c27394dc30afa
 2010-06-10 10:39:42 -07:00
James Dong
3aede37f19 am 3a0b37a0: Merge "Remove the lock/unlock workaround from CameraService" into kraken 2010-06-10 10:16:55 -07:00
Andreas Huber
7b909c0553 am 66b89a62: 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:14:50 -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
c46f03e4a9 am 36921ad8: am b00854d4: Import revised translations 2010-06-09 22:33:47 -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