drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,097 Commits 1 Branch 0 Tags
Commit Graph

25097 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Lockwood
dda5686092 MTP: Add support for retrieving thumbnails to MTP content provider. 
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-06-10 16:58:03 -04:00
Andreas Huber
a9aaf8ffce am c90e35c1: 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:43:53 -07:00
Andreas Huber
815758ba7d am 3ee447e4: am 75c1c8e3: Merge "Initial check in of a new http data source implementation." into kraken 2010-06-10 12:43:48 -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
97af83bca1 am fc66fa53: (-s ours) am 9a9724c3: am a2c6d5bf: (-s ours) do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch 2010-06-10 11:58:59 -07:00
Nick Kralevich
fc66fa5376 am 9a9724c3: am a2c6d5bf: (-s ours) do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch 2010-06-10 11:57:05 -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
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
163c493b50 Initial check in of a new http data source implementation. 
Change-Id: I17c358288ffe9ef690d702c58723c766d0a0cf21
 2010-06-10 11:22:56 -07:00
Mike Lockwood
0809c0e4c6 CameraBrowser: New test app for the MTP content provider. 
Change-Id: I8423d728b13ed8ac87bd2792eefddce3287598bb
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-06-10 14:08:35 -04:00
Mike Lockwood
f724eed566 MTP provider: Add columns for MTP ObjectInfo dataset to the MTP objects table 
Signed-off-by: Mike Lockwood <lockwood@android.com>

Change-Id: Ife0563ad1c3b3dbc2461e1a9e784cbb4653b3435
 2010-06-10 14:08:29 -04:00
Irfan Sheriff
1ac53c3087 Merge "Make NetworkStateTracker an interface" 2010-06-10 11:05:25 -07:00
Irfan Sheriff
d649c12815 Make NetworkStateTracker an interface 
As part of the WifiStateTracker cleanup, need
to have NetworkStateTracker as an interface.

Change-Id: I2ac48d7e4c7274ac4df40bc3b8591b182956a936
 2010-06-10 10:55:23 -07: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
f3e969a3bb am 3aede37f: am 3a0b37a0: Merge "Remove the lock/unlock workaround from CameraService" into kraken 2010-06-10 10:18:52 -07:00
Andreas Huber
c8105742ff am 7b909c05: 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:17:04 -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
051e19458d am c46f03e4: am 36921ad8: am b00854d4: Import revised translations 2010-06-09 22:35:55 -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
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
Dmitri Plotnikov
81d5dad156 Merge "Adding a stopLoading() method." 2010-06-09 20:22:03 -07:00
Dmitri Plotnikov
d92ea071c0 Adding a stopLoading() method. 
This add an API to stop and remove a loader that
is no longer needed.

Change-Id: Ibe59981bb8bc9965a3360917e80b0e710efcd8e1
 2010-06-09 20:20:38 -07:00
Mathias Agopian
533ca7b8f4 am e52d66fa: am 44bea8f8: Merge changes I00274431,I83be9404,I0359531a,Iceef1e95 into kraken 2010-06-09 19:57:01 -07:00
Mathias Agopian
e52d66fa70 am 44bea8f8: Merge changes I00274431,I83be9404,I0359531a,Iceef1e95 into kraken 2010-06-09 19:55:57 -07:00
Mathias Agopian
44bea8f803 Merge changes I00274431,I83be9404,I0359531a,Iceef1e95 into kraken 
* changes:
  update EGL headers to the latest
  update GL ES stub libraries with the new GL ES headers
  fix OpenGL ES extension headers from khronos
  update the OpenGL ES headers to the latest
 2010-06-09 19:54:29 -07:00
Mathias Agopian
6d4021a67d update EGL headers to the latest 
note that this doesn't update the EGL stubs.

Change-Id: I00274431a490249d93eb6b5ba13f274b7f2682ae
 2010-06-09 18:56:05 -07:00
Romain Guy
0889adde3b Merge "Move OpenGL support out of ViewRoot into a new HardwareRenderer class." 2010-06-09 18:27:31 -07:00
Romain Guy
2d6145993e Move OpenGL support out of ViewRoot into a new HardwareRenderer class. 
Change-Id: Iffaed924a5defc3c4df26223c390dc27eee115b1
 2010-06-09 18:27:08 -07:00
Mathias Agopian
69d2f12e79 update GL ES stub libraries with the new GL ES headers 
Change-Id: I83be94049ddfe3fd7f5bee71a21172ade1498dd5
 2010-06-09 18:20:21 -07:00
Mathias Agopian
3b512cd564 fix OpenGL ES extension headers from khronos 
the official headers have a couple typos, which
this CL fixes.

Change-Id: I0359531a05a4a62ddbdce70c5841ec1c355feb3b
 2010-06-09 18:19:11 -07:00
Mathias Agopian
958f900668 update the OpenGL ES headers to the latest 
Change-Id: Iceef1e95504897a5e3759b0401cf7031c9e74547
 2010-06-09 18:08:15 -07:00
Robert Greenwalt
9396f6e069 Merge "Clean up APN notifications." 2010-06-09 17:11:05 -07:00
Robert Greenwalt
02648a4b84 Clean up APN notifications. 
Add APNType info to notifications so you can tell what's happening.  Now, even if a new APN
shares a connection with an already-connected-to- apn type, the new type will get all
the connecting and connected messages on connect and disconnecting/disconnected on disconnect
even though the shared connection remains connected.

Cleaning out the hacks MobileDataStateTracker needed to deal with the old situation.
bug:2226092

Change-Id: Iddd7421d6b91cda7c8405f9c3d5404ac04ef8e42
 2010-06-09 16:52:01 -07:00
Jean-Baptiste Queru
e4031a3780 am 030b0ebe: merge from froyo-plus-aosp 2010-06-09 16:12:11 -07:00
Jean-Baptiste Queru
030b0ebebf merge from froyo-plus-aosp 
Change-Id: Iad8617b45d406e7f737bf68ed723755363d27e9b
 2010-06-09 16:09:19 -07:00
Jason Sams
c3db34e58f Merge "Remove float8/16 from RS type list. We will not have time to work through ABI issues for these types on arm for our ship date. Can be re-added later." 2010-06-09 15:54:35 -07:00
Nick Kralevich
dfda2adc3d am 69b04a70: am 2feafeff: Merge "Fix a problem with leaking UDP sockets." into kraken 2010-06-09 15:26:41 -07:00
Joe Onorato
8a5f10b30d resolved conflicts for merge of f7b79151 to master 
Change-Id: Ia4538f73d8bade9e6565835d484dcb650830feca
 2010-06-09 15:07:16 -07:00
Nick Kralevich
69b04a7075 am 2feafeff: Merge "Fix a problem with leaking UDP sockets." into kraken 2010-06-09 14:50:10 -07:00
Nick Kralevich
2feafeffb8 Merge "Fix a problem with leaking UDP sockets." into kraken 2010-06-09 14:49:10 -07:00
Joe Onorato
1d46191d88 am b5f9b4f1: am 302759c1: Merge changes I4a11f027,Ib2c4abf6,Id0c7ef9f,I839d7771 into kraken 2010-06-09 14:47:43 -07:00