Dianne Hackborn
15e9d474d1
am 88748e6d: am d86302df: Quiet the log.
...
* commit '88748e6dc0151916f6bd19ffde8ba96fe8fd0a87':
Quiet the log.
2011-06-10 07:46:27 -07:00
Dianne Hackborn
88748e6dc0
am d86302df: Quiet the log.
...
* commit 'd86302df0eb5eb013f7521137eabdbfea4a3a867':
Quiet the log.
2011-06-09 17:40:08 -07:00
Dianne Hackborn
d86302df0e
Quiet the log.
...
Change-Id: Ie814b579997bb555eae014c22da0f41f1a46940f
2011-06-09 17:37:00 -07:00
James Dong
dc03da0444
am 2488a943: am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2
...
* commit '2488a94350e0c0b088da2646557c9a0f3a0e9847':
Revert "Add avg bandwidth estimate every 2 seconds - do not merge."
2011-06-09 12:50:25 -07:00
Conley Owens
e668c0b698
am 644f36ea: am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"
...
* commit '644f36eab4eb9911ad897c9caae68b9c5a72388f':
stagefright aacenc/amrwbenc: Convert line breaks to Unix style
2011-06-09 12:21:05 -07:00
Conley Owens
644f36eab4
am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"
...
* commit 'd8b027b18f5a922ef729c6ee363eecb053358d47':
stagefright aacenc/amrwbenc: Convert line breaks to Unix style
2011-06-09 12:14:11 -07:00
James Dong
2488a94350
am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2
...
* commit 'e3b80c838753fe8c9049950216c6379098465810':
Revert "Add avg bandwidth estimate every 2 seconds - do not merge."
2011-06-09 12:03:52 -07:00
James Dong
e3b80c8387
Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" into honeycomb-mr2
2011-06-09 11:56:09 -07:00
Marco Nelissen
6a91953cc9
am 90dc22fa: am a02d9bf9: Make sure we don\'t read from invalid fds
...
* commit '90dc22fa09c4cddb94926b8a8f08fd3d0a404f7f':
Make sure we don't read from invalid fds
2011-06-09 11:41:57 -07:00
Conley Owens
d8b027b18f
Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"
2011-06-09 11:12:04 -07:00
Marco Nelissen
90dc22fa09
am a02d9bf9: Make sure we don\'t read from invalid fds
...
* commit 'a02d9bf9c3ff22cd449da21ff7c23170488ebd8e':
Make sure we don't read from invalid fds
2011-06-09 10:36:24 -07:00
Marco Nelissen
a02d9bf9c3
Make sure we don't read from invalid fds
...
b/4580570
Change-Id: I622f001551a404a7a840d8388a9febac2db107ad
2011-06-09 09:39:52 -07:00
Andreas Huber
8e97372913
am 8050a02b: DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls.
...
* commit '8050a02b0130f0ba2e2ddfc240aa59029ee2ac6d':
DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls.
2011-06-02 07:37:52 -07:00
Andreas Huber
8050a02b01
DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls.
...
Change-Id: Iaee1821257a25a5257d93c9f5ba3976748cad619
related-to-bug: 3362836, 4439092
2011-06-01 15:54:07 -07:00
James Dong
c004a0c925
am 05e13b9e: am c1ded373: Merge "Revert "Use pread() to get the decrypted data for container based DRM file."" into honeycomb-mr2
...
* commit '05e13b9edd3ef6edb286ddc2d92bebecf6666bf8':
Revert "Use pread() to get the decrypted data for container based DRM file."
2011-05-25 14:57:45 -07:00
James Dong
05e13b9edd
am c1ded373: Merge "Revert "Use pread() to get the decrypted data for container based DRM file."" into honeycomb-mr2
...
* commit 'c1ded373951f8bd489401e93f2dd512ff9705a49':
Revert "Use pread() to get the decrypted data for container based DRM file."
2011-05-25 14:54:19 -07:00
James Dong
64a23430f9
Revert "Use pread() to get the decrypted data for container based DRM file."
...
This reverts commit a6f1104b9d829c636b60b9387e379f9667b5df09.
2011-05-25 12:17:33 -07:00
Jeffrey Tinker
c41a17de2b
am 6e5cdca1: am ef89cc14: Merge "Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038 " into honeycomb-mr2
...
* commit '6e5cdca12bdbc26dd4d4eb1b1d986783b13601aa':
Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038
2011-05-23 18:47:17 -07:00
Jeffrey Tinker
6e5cdca12b
am ef89cc14: Merge "Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038 " into honeycomb-mr2
...
* commit 'ef89cc14957ab631346564801841190346632ac9':
Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038
2011-05-23 18:15:47 -07:00
Jeffrey Tinker
ef89cc1495
Merge "Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038 " into honeycomb-mr2
2011-05-23 18:10:10 -07:00
Jeffrey Tinker
8264641c98
Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038
...
Fix for b/4198446 HC - Support for Widevine Adaptive VOD
Change-Id: Ia777c80825e3416bab6ae6273fba46a194135e60
2011-05-23 11:09:16 -07:00
James Dong
d5762583bd
am ebae1923: am a5293d1c: Add some logging to track down where ANR happens during MediaPlayer._release().
...
* commit 'ebae1923869ee71ab119f766ac01c5a320619290':
Add some logging to track down where ANR happens during MediaPlayer._release().
2011-05-23 10:26:40 -07:00
James Dong
ebae192386
am a5293d1c: Add some logging to track down where ANR happens during MediaPlayer._release().
...
* commit 'a5293d1ca4459293f4993ea39c09ea703a022844':
Add some logging to track down where ANR happens during MediaPlayer._release().
2011-05-23 09:59:59 -07:00
James Dong
a5293d1ca4
Add some logging to track down where ANR happens during MediaPlayer._release().
...
o add a log message in AwesomePlayer::reset before acquiring the lock
Change-Id: I9f228f615f99c03c394e9d0dd78c855c0b9fcfbb
related-to-bug: 4409547
2011-05-23 09:36:31 -07:00
Gloria Wang
4d8ceada09
am dbfd055d: am a6f1104b: Use pread() to get the decrypted data for container based DRM file. For bug 4392094.
...
* commit 'dbfd055d51b51b7a6f412155c2391666efbb638a':
Use pread() to get the decrypted data for container based DRM file. For bug 4392094.
2011-05-20 11:02:31 -07:00
Gloria Wang
dbfd055d51
am a6f1104b: Use pread() to get the decrypted data for container based DRM file. For bug 4392094.
...
* commit 'a6f1104b9d829c636b60b9387e379f9667b5df09':
Use pread() to get the decrypted data for container based DRM file. For bug 4392094.
2011-05-20 10:57:51 -07:00
Gloria Wang
a6f1104b9d
Use pread() to get the decrypted data for container based DRM file.
...
For bug 4392094.
Change-Id: Icc64a26c5b413313cc35dcd02d60484dc8245dfb
2011-05-20 10:15:21 -07:00
James Dong
cd454fa91e
Revert "Add avg bandwidth estimate every 2 seconds - do not merge."
...
This reverts commit ec78f551b575b0274cbe796f8e08a9df1a706680.
2011-05-19 14:10:00 -07:00
James Dong
a8939e0d48
am 380244e9: am d148a499: Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2
...
* commit '380244e9d6c8016bc1a04691a3af0fd999ddf6b0':
Using widevine:// to stream adaptive bitrate wvm content no longer
2011-05-18 16:33:20 -07:00
James Dong
380244e9d6
am d148a499: Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2
...
* commit 'd148a499c27145e0473f89ece0500ebed38f875f':
Using widevine:// to stream adaptive bitrate wvm content no longer
2011-05-18 16:09:58 -07:00
James Dong
d148a499c2
Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2
2011-05-18 16:06:14 -07:00
Gloria Wang
8d161fe1ea
am 5a6c3d49: am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2
...
* commit '5a6c3d491ccac07ef3f6a624a8a3e0c36959b661':
DO NOT MERGE For bug 4422428 Squashed commit of the following:
2011-05-18 09:30:01 -07:00
Gloria Wang
5a6c3d491c
am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2
...
* commit '07e9267d33bb199d0a2b8de221c64541bdf2465a':
DO NOT MERGE For bug 4422428 Squashed commit of the following:
2011-05-18 09:19:56 -07:00
Gloria Wang
07e9267d33
Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2
2011-05-18 09:17:50 -07:00
Mike Lockwood
53b988ba18
am 5a79cfd7: am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2
...
* commit '5a79cfd7518defdce1911cecbc2441bb0a057e54':
StorageVolume: Add getStorageId() accessor
2011-05-17 16:49:40 -07:00
Mike Lockwood
5a79cfd751
am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2
...
* commit '27ac64eceee8d4e392983861c6bc6bd620e4c6f7':
StorageVolume: Add getStorageId() accessor
2011-05-17 16:44:51 -07:00
Mike Lockwood
fbfe555125
StorageVolume: Add getStorageId() accessor
...
This ID is used for MTP as well as per volume querying in the media provider.
Change-Id: Ic4fc986d972bd477730643f7e9450c390c0b3a4b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-17 17:19:37 -04:00
Andreas Huber
c9eb18bb72
am bf81d4be: am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2
...
* commit 'bf81d4be0514265875d7deffe50c31a344f6eac5':
DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2
2011-05-17 10:34:41 -07:00
Andreas Huber
bf81d4be05
am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2
...
* commit 'c56e81c88706d79ce51a314b5bfd3e247ca6f86c':
DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2
2011-05-17 10:31:58 -07:00
Andreas Huber
c56e81c887
Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2
2011-05-17 10:29:36 -07:00
Dianne Hackborn
f97ed77197
am d90a2c4d: am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2
...
* commit 'd90a2c4d4463085155444efb07eba2d6579b444a':
DO NOT MERGE. Integrate from master: Rework display size access.
2011-05-16 13:01:38 -07:00
Dianne Hackborn
d90a2c4d44
am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2
...
* commit '1e662c3294b740ff694ad98e4d9a366e1e4b5e62':
DO NOT MERGE. Integrate from master: Rework display size access.
2011-05-16 12:57:00 -07:00
Dianne Hackborn
1e662c3294
Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2
2011-05-16 12:54:22 -07:00
Mike Lockwood
b107f4dec3
am e23639e0: am 15afd076: Merge "MTP: Have GetStorageInfo command return correct storage type for removable storage" into honeycomb-mr2
...
* commit 'e23639e0386735df50ad208078f638c38f662d42':
MTP: Have GetStorageInfo command return correct storage type for removable storage
2011-05-16 12:41:25 -07:00
Mike Lockwood
fc4a3d37ef
am b822d246: am 0a93d875: Merge "StorageManager: Clean up and generalize storage configuration resources" into honeycomb-mr2
...
* commit 'b822d2464dc59056f736b0c49f0ac514c7cbb9d9':
StorageManager: Clean up and generalize storage configuration resources
2011-05-16 12:38:36 -07:00
Mike Lockwood
e23639e038
am 15afd076: Merge "MTP: Have GetStorageInfo command return correct storage type for removable storage" into honeycomb-mr2
...
* commit '15afd076d6070374cbb4f9dcbe28dda67caa0718':
MTP: Have GetStorageInfo command return correct storage type for removable storage
2011-05-16 12:38:18 -07:00
Mike Lockwood
b822d2464d
am 0a93d875: Merge "StorageManager: Clean up and generalize storage configuration resources" into honeycomb-mr2
...
* commit '0a93d875527c52183080b63a0b19d567856952af':
StorageManager: Clean up and generalize storage configuration resources
2011-05-16 12:36:29 -07:00
Dianne Hackborn
ac8dea12c1
DO NOT MERGE. Integrate from master: Rework display size access.
...
Applications now get the display size from the window manager. No
behavior should be changed yet, this is just prep for some real
changes.
Change-Id: I47bf8b55ecd4476c25ed6482494a7bcc5fae45d2
2011-05-16 11:58:27 -07:00
Mike Lockwood
51690544aa
MTP: Have GetStorageInfo command return correct storage type for removable storage
...
Change-Id: I09b548483c12080e7d77970babcae2eef379f2f4
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-16 14:29:45 -04:00
Mike Lockwood
2f6a388553
StorageManager: Clean up and generalize storage configuration resources
...
Replace config_emulateExternalStorage, config_externalStorageRemovable,
config_externalStoragePaths, config_externalStorageDescriptions and
config_mtpReserveSpaceMegabytes resources with an XML resource file
to describe the external storages that are available.
Add android.os.storage.StorageVolume class
StorageManager.getVolumeList() now returns an array of StorageVolume
Change-Id: I06ce1451ebf08b82f0ee825d56d59ebf72eacd3d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-16 14:29:23 -04:00