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

2013 Commits

Author SHA1 Message Date
James Dong
40287c8f11 am 814f430c: am dca66e1c: Fixed a typo - maybe we should do comparison ignoring the case? 
Merge commit '814f430cb5e313316600fd6694ed338edd5fff7d'

* commit '814f430cb5e313316600fd6694ed338edd5fff7d':
  Fixed a typo - maybe we should do comparison ignoring the case?
 2010-06-14 14:43:57 -07:00
James Dong
dca66e1c3b Fixed a typo - maybe we should do comparison ignoring the case? 
Change-Id: I498f8242e6ba3e3e8b8c7b714ed49bff51a3010b
 2010-06-14 11:14:38 -07:00
Mike Lockwood
44cf0a0682 MTP: Fix uninitialized pointer bug. 
Change-Id: Ia07ebd48aeb483e66957f5a174992d200494a744
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-06-14 09:13:11 -07:00
Eric Laurent
7f5ee3b58d am 184a3ff6: am e0219539: am 01f7ac64: Merge "Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI." into kraken 
Merge commit '184a3ff64ba71e7e860b70b9a836c0132b447138'

* commit '184a3ff64ba71e7e860b70b9a836c0132b447138':
  Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI.
 2010-06-14 09:10:32 -07:00
Eric Laurent
e0219539c6 am 01f7ac64: Merge "Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI." into kraken 
Merge commit '01f7ac64488027492b2909b99d70491e7a391015' into gingerbread

* commit '01f7ac64488027492b2909b99d70491e7a391015':
  Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI.
 2010-06-14 09:04:33 -07:00
Eric Laurent
01f7ac6448 Merge "Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI." into kraken 2010-06-14 09:02:13 -07:00
Mike Lockwood
70bd2f2099 CameraBrowser: Requery the device list when MTP devices are added and removed. 
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-06-12 21:35:30 -04:00
Mike Lockwood
74f094fe22 MTP: Add interface to MtpClient for receiving device added/removed events. 
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-06-12 21:35:27 -04:00
Andreas Huber
30d5ca398d am df60830a: am 126ca6f9: Merge "Must hold lock here..." into gingerbread 
Merge commit 'df60830a42580af976b0fc88784d1d32191bd1d7'

* commit 'df60830a42580af976b0fc88784d1d32191bd1d7':
  Must hold lock here...
 2010-06-11 16:01:34 -07:00
Andreas Huber
126ca6f9ec Merge "Must hold lock here..." into gingerbread 2010-06-11 15:58:19 -07:00
Mike Lockwood
5bd667a3a7 Merge "CameraBrowser: Support for deleting pictures." 2010-06-11 15:14:16 -07:00
Mike Lockwood
0cd0e797da Merge "MTP: Add host support for deleting objects." 2010-06-11 15:13:38 -07:00
Mike Lockwood
147717c267 CameraBrowser: Support for deleting pictures. 
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-06-11 17:47:38 -04:00
Mike Lockwood
e0a89f611d MTP: Add host support for deleting objects. 
For example, deleting pictures on a digital camera.

Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-06-11 17:47:35 -04:00
James Dong
188c432c70 am ae2c4774: am f62c57d6: Merge "Initial checkin for pause and resume control" into kraken 
Merge commit 'ae2c47746b5fda636a157c4fdb0365a67d4604c3'

* commit 'ae2c47746b5fda636a157c4fdb0365a67d4604c3':
  Initial checkin for pause and resume control
 2010-06-11 14:34:09 -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
Andreas Huber
4fee974adf am 0905ba7b: am f5eafe40: Merge "Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned." into kraken 
Merge commit '0905ba7ba62567c1d1b5b0567827c35d40390b52'

* commit '0905ba7ba62567c1d1b5b0567827c35d40390b52':
  Restore feature parity with the old HTTPDataSource as far as support for extra headers (cookies?) and socket-timeout are concerned.
 2010-06-11 11:00:44 -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
Andreas Huber
20b35c7046 am b165719e: am e577e87a: Fix a typo in NuCachedSource2 that would trigger an assert near the end of a stream. 
Merge commit 'b165719e93dd390b4f71f5d5e993880529cc841f'

* commit 'b165719e93dd390b4f71f5d5e993880529cc841f':
  Fix a typo in NuCachedSource2 that would trigger an assert near the end of a stream.
 2010-06-11 10:16:39 -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
Eric Laurent
948235c06e Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI. 
Added AudioEffect C++ class. AudioEffect is the base class for effect specific implementations,
OpenSL ES effect interfaces and audio effect JNI.

Added the AudioEffect JNI and AudioEffect JAVA class. AudioEffect is the base class
to implement more specific JAVA classes to control audio effects from JAVA applications.

Change-Id: If300a1b708f2e6605891261e67bfb4f8330a4624
 2010-06-11 06:26:31 -07:00
Andreas Huber
2dabef2f4e am 627a0019: 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 16:13:37 -07:00
Andreas Huber
422c5a1408 am 566e64af: am fbdb5f1b: Merge "Switch LiveSource to use the new http data source instead of the old one." into kraken 2010-06-10 16:13:24 -07:00
Andreas Huber
6ee780de7f am 960a0ff1: am c81d2c12: Merge "Initial check-in of new caching/prefetching data source implementation." into kraken 2010-06-10 16:13:11 -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
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
c81d2c12de Merge "Initial check-in of new caching/prefetching data source implementation." into kraken 2010-06-10 15:15:29 -07:00
Mike Lockwood
99b3452f40 CameraBrowser: Display thumbnails for camera images. 
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-06-10 16:58:05 -04:00
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
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
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
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
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
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
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
James Dong
71d714ccbf Remove the lock/unlock workaround from CameraService 
bug - 2677772

Change-Id: I7c996daad8b3bfc89e9fa2d655dc18c9a5c68f2f
 2010-06-09 21:30:43 -07:00
James Dong
86de46125c am 689497fb: am 457d5ae3: Fix a potential(observed sometimes) media server crash 2010-06-09 11:31:47 -07:00
James Dong
457d5ae3c9 Fix a potential(observed sometimes) media server crash 
The problem is that we are referring an temp object returned from a function call.
When the function call returned, the temp object is gone; and thus the reference
may be invalidated.

-- rebased

bug - 2734946

Change-Id: I1993c4462df95610ca478f816adc30058af5850e
 2010-06-09 11:27:03 -07:00