ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
16,822 Commits 2 Branches 0 Tags 54 MiB
366cd9b7e9
Commit Graph

16822 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Taylor
366cd9b7e9 am 92010ff5: am dbac180d: Fix a merge problem with html mms 
Merge commit '92010ff5cf014c0ff73ee4ad4bb169dd916a15a9' into gingerbread-plus-aosp

* commit '92010ff5cf014c0ff73ee4ad4bb169dd916a15a9':
  Fix a merge problem with html mms
 2010-07-21 11:26:17 -07:00
Tom Taylor
36cdee48ec am dbac180d: Fix a merge problem with html mms 
Merge commit 'dbac180d8342a7db2bb9994f937869eecb6b50ff' into gingerbread

* commit 'dbac180d8342a7db2bb9994f937869eecb6b50ff':
  Fix a merge problem with html mms
 2010-07-21 11:22:22 -07:00
Andreas Huber
eb32ea5cc8 am 8138e841: Merge "Support finer seek control on MediaSources." into gingerbread 
Merge commit '8138e841a5adb3c5629e263f5a8cb2e936d234ce' into gingerbread-plus-aosp

* commit '8138e841a5adb3c5629e263f5a8cb2e936d234ce':
  Support finer seek control on MediaSources.
 2010-07-21 10:39:00 -07:00
Andreas Huber
976f08643c Merge "Support finer seek control on MediaSources." into gingerbread 2010-07-21 10:36:08 -07:00
Eric Laurent
368d342e18 am 7070b365: Added support for auxiliary audio effects to AudioTrack and MediaPlayer. 
Merge commit '7070b36549d511d6627538c73dfbab23fbae5b43' into gingerbread-plus-aosp

* commit '7070b36549d511d6627538c73dfbab23fbae5b43':
  Added support for auxiliary audio effects to AudioTrack and MediaPlayer.
 2010-07-21 09:49:27 -07:00
The Android Open Source Project
154ad59ade merge from open-source master 
Change-Id: Ide1539b6777faf232d5360d6dc89a5d255982747
 2010-07-21 08:07:26 -07:00
The Android Open Source Project
e090c99860 merge from open-source master 
Change-Id: I5d220f16c319e95547f133ee9bcbd0b5caabc597
 2010-07-21 08:05:45 -07:00
James Dong
cb3df93031 am d7514ec6: Merge "Progress status notification" into gingerbread 
Merge commit 'd7514ec6eb17d262d6f9605a2c2f245b7ad7c0b9' into gingerbread-plus-aosp

* commit 'd7514ec6eb17d262d6f9605a2c2f245b7ad7c0b9':
  Progress status notification
 2010-07-20 14:32:39 -07:00
James Dong
97a5e2992a Merge "Progress status notification" into gingerbread 2010-07-20 14:29:39 -07:00
Jason Parks
d316e20f7f am 29e25bd3: Merge "Only print out wake locks in the if the wakelock was held." into gingerbread 
Merge commit '29e25bd3418b04e395119bf99abe92898830a796' into gingerbread-plus-aosp

* commit '29e25bd3418b04e395119bf99abe92898830a796':
  Only print out wake locks in the if the wakelock was held.
 2010-07-20 14:04:41 -07:00
Dan Egnor
817379ca66 am 3c1363be: am 2f0dc6d9: Merge "COMMENT ONLY change to add some warnings about ParcelFileDescriptor behavior with Parcel.writeValue()." into froyo 
Merge commit '3c1363beec9c142c062d8704b8bef4230b42eae5' into gingerbread-plus-aosp

* commit '3c1363beec9c142c062d8704b8bef4230b42eae5':
  COMMENT ONLY change to add some warnings about ParcelFileDescriptor
 2010-07-20 14:04:33 -07:00
Jason Parks
24e0cd34aa Merge "Only print out wake locks in the if the wakelock was held." into gingerbread 2010-07-20 14:01:39 -07:00
Scott Main
e29d19c006 am 60a20061: am 2316d626: docs: add information about using color resources as drawables 
Merge commit '60a200617791cf4dd3660c514ac6bf17dfcb85de' into gingerbread-plus-aosp

* commit '60a200617791cf4dd3660c514ac6bf17dfcb85de':
  docs: add information about using color resources as drawables
 2010-07-20 14:01:33 -07:00
Dan Egnor
95127e043b am 2f0dc6d9: Merge "COMMENT ONLY change to add some warnings about ParcelFileDescriptor behavior with Parcel.writeValue()." into froyo 
Merge commit '2f0dc6d9f50ceece294e9db393583e655d3bf781' into gingerbread

* commit '2f0dc6d9f50ceece294e9db393583e655d3bf781':
  COMMENT ONLY change to add some warnings about ParcelFileDescriptor
 2010-07-20 13:59:43 -07:00
Dan Egnor
0dda53db5e am fb1c0fe7: Merge "resolved conflicts for merge of 9bc4039a to gingerbread" into gingerbread 
Merge commit 'fb1c0fe7fda72c29ac333f0f7d18c36d797a7a4a' into gingerbread-plus-aosp

* commit 'fb1c0fe7fda72c29ac333f0f7d18c36d797a7a4a':
  COMMENT-ONLY change to clarify Camera documentation.
 2010-07-20 13:58:57 -07:00
Dan Egnor
468c4f6de9 Merge "COMMENT ONLY change to add some warnings about ParcelFileDescriptor behavior with Parcel.writeValue()." into froyo 2010-07-20 13:57:08 -07:00
Scott Main
5933744aa3 am 2316d626: docs: add information about using color resources as drawables 
Merge commit '2316d6260862230af10d8ca3ff446ad3f560f712' into gingerbread

* commit '2316d6260862230af10d8ca3ff446ad3f560f712':
  docs: add information about using color resources as drawables
 2010-07-20 13:53:55 -07:00
Dan Egnor
e26a37d259 Merge "resolved conflicts for merge of 9bc4039a to gingerbread" into gingerbread 2010-07-20 13:23:09 -07:00
Dan Egnor
a53040a705 resolved conflicts for merge of 9bc4039a to gingerbread 
Change-Id: I6f9262fb293a67cbc04e5756205ae56e28c299ec
 2010-07-20 11:30:17 -07:00
Eric Laurent
4efee95664 am 22a2d718: Merge "Audio policy manager changes for audio effects" into gingerbread 
Merge commit '22a2d7186d015efcd648dff99500f8467463be82' into gingerbread-plus-aosp

* commit '22a2d7186d015efcd648dff99500f8467463be82':
  Audio policy manager changes for audio effects
 2010-07-20 11:28:26 -07:00
Eric Laurent
af1b8029d7 Merge "Audio policy manager changes for audio effects" into gingerbread 2010-07-20 11:25:35 -07:00
Jean-Baptiste Queru
6c980fe9dd Merge "Shoud specify the Resource class instance as an argument of the method newDrawable and change the name from 'DrawableCacheClear' to 'clearDrawableCache' (additional changes for ID:15815) https://review.source.android.com/#change,15815" 2010-07-20 11:22:45 -07:00
Romain Guy
f00404a78e Merge "replaced deprecated setButton Methods" 2010-07-20 11:11:20 -07:00
Andreas Huber
e4aad70d46 am cc14a839: Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we\'ll still play it back correctly. 
Merge commit 'cc14a8393b92cd1ed6cba74829396045605ab211' into gingerbread-plus-aosp

* commit 'cc14a8393b92cd1ed6cba74829396045605ab211':
  Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we'll still play it back correctly.
 2010-07-20 10:40:39 -07:00
The Android Open Source Project
61be2642e4 merge from open-source master 
Change-Id: I1901177e8a4bd32a707020c581f25f21349ba571
 2010-07-20 10:33:38 -07:00
The Android Open Source Project
e38fb359a9 merge from open-source master 
Change-Id: I2a8ec9d290fc1040ba53b9fe73f92b7f90dfdf16
 2010-07-20 10:25:37 -07:00
Andreas Huber
4a2f4622f9 am faf1d46a: Merge "Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled." into gingerbread 
Merge commit 'faf1d46a60518fcc3e58c91740e673e8a3f2d3cc' into gingerbread-plus-aosp

* commit 'faf1d46a60518fcc3e58c91740e673e8a3f2d3cc':
  Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled.
 2010-07-20 09:24:53 -07:00
Andreas Huber
c49422fba4 Merge "Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled." into gingerbread 2010-07-20 09:18:58 -07:00
Dan Egnor
351778fa02 Merge "COMMENT-ONLY change to clarify Camera documentation." into froyo 2010-07-19 18:14:50 -07:00
Jamie Gennis
26dad22920 am ff7049ab: Remove some debug logging that I accidentally committed. 
Merge commit 'ff7049ab2886acc73e145367118646f7741ce333' into gingerbread-plus-aosp

* commit 'ff7049ab2886acc73e145367118646f7741ce333':
  Remove some debug logging that I accidentally committed.
 2010-07-19 16:33:11 -07:00
Jamie Gennis
ac07cd613f Remove some debug logging that I accidentally committed. 
Change-Id: Ib182455fad5e5b3f3f59b3ff24f59dcd7f638292
 2010-07-19 16:09:26 -07:00
Vasu Nori
0c7f4e5e81 am a5fe776a: Merge "fix javadoc error which breaks SDK build in gingerbread" into gingerbread 
Merge commit 'a5fe776a7933b2241858ef83f01b812c7badc231' into gingerbread-plus-aosp

* commit 'a5fe776a7933b2241858ef83f01b812c7badc231':
  fix javadoc error which breaks SDK build in gingerbread
 2010-07-19 15:29:10 -07:00
Vasu Nori
9f63ea27d5 Merge "fix javadoc error which breaks SDK build in gingerbread" into gingerbread 2010-07-19 15:26:39 -07:00
The Android Open Source Project
f0c6f6437d ignore from open-source master 
Change-Id: Id828527be6c49886f3e40cc2dbe61a5c9c965e71
 2010-07-19 15:19:44 -07:00
Scott Main
4501daf0f2 am 945ac54d: am 85e7ae9b: Merge "docs: add troubleshooting to eclipse guide about restarting adb" into froyo 
Merge commit '945ac54da56f79c8407c0111d6ded25afcc159fc' into gingerbread-plus-aosp

* commit '945ac54da56f79c8407c0111d6ded25afcc159fc':
  docs: add troubleshooting to eclipse guide about restarting adb
 2010-07-19 14:52:35 -07:00
Scott Main
dfe85d8b12 am 85e7ae9b: Merge "docs: add troubleshooting to eclipse guide about restarting adb" into froyo 
Merge commit '85e7ae9bbb6f2e8bc4259073eafda5ce5b037d7d' into gingerbread

* commit '85e7ae9bbb6f2e8bc4259073eafda5ce5b037d7d':
  docs: add troubleshooting to eclipse guide about restarting adb
 2010-07-19 14:50:32 -07:00
Scott Main
7125c105c4 Merge "docs: add troubleshooting to eclipse guide about restarting adb" into froyo 2010-07-19 14:42:13 -07:00
Danica Chang
fc17349f38 am f23682f1: Merge "fixed parsing issue in BluetoothService so that it parses the UUID property correctly" into gingerbread 
Merge commit 'f23682f128151def4d83d3e2422aea36e0a00061' into gingerbread-plus-aosp

* commit 'f23682f128151def4d83d3e2422aea36e0a00061':
  fixed parsing issue in BluetoothService so that it parses the UUID property correctly
 2010-07-19 13:50:49 -07:00
Danica Chang
4978e7814f Merge "fixed parsing issue in BluetoothService so that it parses the UUID property correctly" into gingerbread 2010-07-19 13:47:50 -07:00
The Android Open Source Project
29bff32cc0 merge from open-source master 
Change-Id: Ia37601f1c8e38a81bfc82b90a05bd3dae20dac88
 2010-07-19 12:49:39 -07:00
The Android Open Source Project
d5ffb200b6 merge from open-source master 
Change-Id: Iae0a5fadd57d651a614ed1c07afc949fe0637551
 2010-07-19 12:17:53 -07:00
Romain Guy
499bcdb41c Merge "Replaced deprecated calls to setButton and setButton2" 2010-07-19 10:30:16 -07:00
Romain Guy
7b2e5b69d9 Merge "Replaced deprecated setButton Methodcalls" 2010-07-19 10:29:59 -07:00
Xavier Ducrohet
32afe04a54 am 80e62ac6: Fix the layoutlib Paint.set(Paint) method. Do not merge. 
Merge commit '80e62ac61c297452c003919f71c4dcd7063d1b43' into gingerbread-plus-aosp

* commit '80e62ac61c297452c003919f71c4dcd7063d1b43':
  Fix the layoutlib Paint.set(Paint) method. Do not merge.
 2010-07-19 10:22:59 -07:00
Eric Laurent
07b9d4c5de am 7203272f: Merge "Fixed problems in audio effect volume control." into gingerbread 
Merge commit '7203272f35e40bf9d4b76f1b2f9b0077738df118' into gingerbread-plus-aosp

* commit '7203272f35e40bf9d4b76f1b2f9b0077738df118':
  Fixed problems in audio effect volume control.
 2010-07-19 10:19:49 -07:00
Eric Laurent
b04f72e609 Merge "Fixed problems in audio effect volume control." into gingerbread 2010-07-19 10:13:27 -07:00
The Android Open Source Project
cc0820bfcd merge from open-source master 
Change-Id: I84a8efc2d58476c72e84170c19dc692dc180b97d
 2010-07-19 09:04:02 -07:00
Adam Bliss
1045ed607e am 9714d2c4: Merge "Don\'t throw an exception from isProviderEnabled and getLastKnownLocation" into gingerbread 
Merge commit '9714d2c4d2a7563ce5ffdc1726461b24e9f1e599' into gingerbread-plus-aosp

* commit '9714d2c4d2a7563ce5ffdc1726461b24e9f1e599':
  Don't throw an exception from isProviderEnabled and getLastKnownLocation
 2010-07-19 08:36:26 -07:00
Adam Bliss
39a9bd6d49 Merge "Don't throw an exception from isProviderEnabled and getLastKnownLocation" into gingerbread 2010-07-19 08:09:19 -07:00
James Dong
0fa9b27cfa am faf775e7: Fix simulator build (1st attempt) 
Merge commit 'faf775e772e329e821d81ba735474df097b1e1e9' into gingerbread-plus-aosp

* commit 'faf775e772e329e821d81ba735474df097b1e1e9':
  Fix simulator build (1st attempt)
 2010-07-18 15:03:15 -07:00