ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity
17,373 Commits 2 Branches 0 Tags 54 MiB
c1c3308f03
Commit Graph

17373 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitri Plotnikov
eb92178c5b Merge "Preventing cursor leaks when a query is interrupted" 2010-06-16 16:15:08 -07:00
James Dong
748ad2b542 Merge "When filling the cache, we always time out waiting for a condition that won't occur. We are actually improving the power consumption for streaming applications like Pandora." into froyo 2010-06-16 16:10:52 -07:00
Fabrice Di Meglio
15f68feabf Merge "Fix bug# 2772317 (CalendarDatabaseHelper internal cleanup)" 2010-06-16 15:35:31 -07:00
Brett Chabot
b4cb6343d5 am 685fcf36: am c95812e6: Merge "Move out all framework-tests classes." into gingerbread 
Merge commit '685fcf364b84d5ac911ae9cbbc4fec99f36cbd48'

* commit '685fcf364b84d5ac911ae9cbbc4fec99f36cbd48':
  Move out all framework-tests classes.
 2010-06-16 14:42:51 -07:00
Brett Chabot
f9a7e14afe am c95812e6: Merge "Move out all framework-tests classes." into gingerbread 
Merge commit 'c95812e6cacaa14748c81323bac6561453991a24' into gingerbread-plus-aosp

* commit 'c95812e6cacaa14748c81323bac6561453991a24':
  Move out all framework-tests classes.
 2010-06-16 14:41:00 -07:00
Brett Chabot
9bdf9d6a53 Merge "Move out all framework-tests classes." into gingerbread 2010-06-16 14:39:41 -07:00
Irfan Sheriff
6a2d3681e1 am 1af48920: am f897b443: Fix driver stop check 
Merge commit '1af489205a3942630e6203237213e98ef53d4118'

* commit '1af489205a3942630e6203237213e98ef53d4118':
  Fix driver stop check
 2010-06-16 14:35:51 -07:00
Irfan Sheriff
af68c0ddee am f897b443: Fix driver stop check 
Merge commit 'f897b443fed5c88c6b12e3fa1da72f231db67673' into gingerbread-plus-aosp

* commit 'f897b443fed5c88c6b12e3fa1da72f231db67673':
  Fix driver stop check
 2010-06-16 14:31:54 -07:00
Dave Sparks
e9a36f1e11 Merge "TimedEventQueue is apparently important for glitch-free media playback, and so having it inherit its priority from the thread that created it is a bad idea. Instead, set the priority explicitly, and bump it to slightly higher than normal." into froyo 2010-06-16 14:11:40 -07:00
Mason Tang
63bca99a94 Merge "Modified first animation and visibility change behavior for ViewFlipper" 2010-06-16 13:59:42 -07:00
Vasu Nori
bb9714f609 Merge "throw correct exception" 2010-06-16 12:30:48 -07:00
Patrick Scott
2e5e56b79b Merge "Move WebViewDatabase initialization into a background thread." 2010-06-16 11:58:13 -07:00
Robert Greenwalt
847ddc0318 Merge "Move the net transition wakelock to ConnService." 2010-06-16 11:07:59 -07:00
Adam Powell
59f55bd48d Merge "Fix bug 2771204" 2010-06-16 10:52:50 -07:00
Scott Main
9732a5cb53 am a0210f76: am c980ba25: am cdeae439: Merge "docs: update dashboard" into froyo 
Merge commit 'a0210f76e451a0fede557e704832f605034584c4'

* commit 'a0210f76e451a0fede557e704832f605034584c4':
  docs: update dashboard
 2010-06-15 19:48:12 -07:00
Scott Main
1856316ca9 am c980ba25: am cdeae439: Merge "docs: update dashboard" into froyo 
Merge commit 'c980ba25b0916d7c276c23e420195dd7959379a0' into gingerbread-plus-aosp

* commit 'c980ba25b0916d7c276c23e420195dd7959379a0':
  docs: update dashboard
 2010-06-15 19:45:00 -07:00
Scott Main
b49ec28380 am cdeae439: Merge "docs: update dashboard" into froyo 
Merge commit 'cdeae439a3637062dc0701654a1cb7874bfd1ae8' into gingerbread

* commit 'cdeae439a3637062dc0701654a1cb7874bfd1ae8':
  docs: update dashboard
 2010-06-15 19:39:32 -07:00
Scott Main
b7310b28e2 Merge "docs: update dashboard" into froyo 2010-06-15 19:33:03 -07:00
Romain Guy
abf143f550 Merge "Add new API to check whether a Bitmap was modified." 2010-06-15 18:06:47 -07:00
Mathias Agopian
0a91775c4d Added support for the GL_TEXTURE_EXTERNAL target 
This will allow us to support YUV surfaces.

Change-Id: I2d4da75f1006a5285bdc552695d4caeecccf2183
 2010-06-15 17:31:17 -07:00
Jason Sams
69ba481fee Merge "Remove InvokeData and add ContextFinish to generate a sync point." 2010-06-15 17:12:51 -07:00
Jeff Brown
ac69c9607f am 2dfd2aa4: am 92266a78: Merge "More work in progress on native events." into gingerbread 
Merge commit '2dfd2aa413a91965c1a247980598c795db9b4c38'

* commit '2dfd2aa413a91965c1a247980598c795db9b4c38':
  More work in progress on native events.
 2010-06-15 16:50:12 -07:00
Jeff Brown
cedf09458d am 92266a78: Merge "More work in progress on native events." into gingerbread 
Merge commit '92266a7894becc1cdf2298fd02380749ab036131' into gingerbread-plus-aosp

* commit '92266a7894becc1cdf2298fd02380749ab036131':
  More work in progress on native events.
 2010-06-15 16:48:23 -07:00
Jeff Brown
c10612c77a Merge "More work in progress on native events." into gingerbread 2010-06-15 16:44:23 -07:00
Jeff Brown
54bc281639 More work in progress on native events. 
Refactored the code to eliminate potential deadlocks due to re-entrant
calls from the policy into the dispatcher.  Also added some plumbing
that will be used to notify the framework about ANRs.

Change-Id: Iba7a10de0cb3c56cd7520d6ce716db52fdcc94ff
 2010-06-15 16:43:18 -07:00
Wei Huang
b4432f226e am 5907ffa4: am a6c52938: Merge "add new video/audio presence icons in the framework resource dirs, and make them public." into gingerbread 
Merge commit '5907ffa453cf92f2f0de760354e4013df4ea6b69'

* commit '5907ffa453cf92f2f0de760354e4013df4ea6b69':
  add new video/audio presence icons in the framework resource dirs, and make them public.
 2010-06-15 16:01:32 -07:00
Ying Wang
add3c2277c resolved conflicts for merge of 2f6f6240 to master 
Change-Id: Ia91944b5c28a04b6b3f968305266a39a376a0e85
 2010-06-15 15:58:28 -07:00
Joe Onorato
3aae2ec0c4 am c43f4784: am 987e223d: am 27357fc0: Merge "Use the droidcore goal with dist-for-goals." into froyo 
Merge commit 'c43f4784253f49189f20d131508bdb23da113197'

* commit 'c43f4784253f49189f20d131508bdb23da113197':
  Use the droidcore goal with dist-for-goals.
 2010-06-15 15:49:11 -07:00
Joe Onorato
6e74be2669 am 3d6ea3bd: am 9a5fcd1c: am 9d71860e: Merge "The aapt and aidl tools are prebuilt when we\'re doing an apps-only build, so don\'t try to build them." into froyo 
Merge commit '3d6ea3bd8690934dbcdb11aa84ae0bb22e211c28'

* commit '3d6ea3bd8690934dbcdb11aa84ae0bb22e211c28':
  The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.
 2010-06-15 15:49:05 -07:00
Wei Huang
405a852112 am a6c52938: Merge "add new video/audio presence icons in the framework resource dirs, and make them public." into gingerbread 
Merge commit 'a6c52938b144c2bbd8c1e22d24629b12e35c99a3' into gingerbread-plus-aosp

* commit 'a6c52938b144c2bbd8c1e22d24629b12e35c99a3':
  add new video/audio presence icons in the framework resource dirs, and make them public.
 2010-06-15 15:36:41 -07:00
Ying Wang
63be64f733 am 3137f8c5: am 6567adf8: Move android-common to framework/ex 
Merge commit '3137f8c54d00d8eefe011a0256e2d85a036b207c' into gingerbread-plus-aosp

* commit '3137f8c54d00d8eefe011a0256e2d85a036b207c':
  Move android-common to framework/ex
 2010-06-15 15:34:51 -07:00
Wei Huang
f497908767 Merge "add new video/audio presence icons in the framework resource dirs, and make them public." into gingerbread 2010-06-15 15:34:06 -07:00
Ying Wang
596843dc11 am 6567adf8: Move android-common to framework/ex 
Merge commit '6567adf8b637c36817625cd38d64cd4b8510b097' into gingerbread

* commit '6567adf8b637c36817625cd38d64cd4b8510b097':
  Move android-common to framework/ex
 2010-06-15 15:32:10 -07:00
Ying Wang
98294e50d7 Move android-common to framework/ex 
This is one necessary step by unbundling.

Change-Id: I9d922a52374ad6331fa2e39fa4b5e16ad7d108fa
 2010-06-15 15:28:42 -07:00
Joe Onorato
e9b6ca900d am 987e223d: am 27357fc0: Merge "Use the droidcore goal with dist-for-goals." into froyo 
Merge commit '987e223df73abe6cca47d09fff3a87be0243a085' into gingerbread-plus-aosp

* commit '987e223df73abe6cca47d09fff3a87be0243a085':
  Use the droidcore goal with dist-for-goals.
 2010-06-15 15:23:59 -07:00
Joe Onorato
104865e514 am 9a5fcd1c: am 9d71860e: Merge "The aapt and aidl tools are prebuilt when we\'re doing an apps-only build, so don\'t try to build them." into froyo 
Merge commit '9a5fcd1c14dcea951099433885ed3519dee90f48' into gingerbread-plus-aosp

* commit '9a5fcd1c14dcea951099433885ed3519dee90f48':
  The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.
 2010-06-15 15:23:55 -07:00
Joe Onorato
abc03adbca am 27357fc0: Merge "Use the droidcore goal with dist-for-goals." into froyo 
Merge commit '27357fc08802d796a6b6a1111ac5534d75fc8be7' into gingerbread

* commit '27357fc08802d796a6b6a1111ac5534d75fc8be7':
  Use the droidcore goal with dist-for-goals.
 2010-06-15 15:21:21 -07:00
Joe Onorato
0986125347 am 9d71860e: Merge "The aapt and aidl tools are prebuilt when we\'re doing an apps-only build, so don\'t try to build them." into froyo 
Merge commit '9d71860e8cbaf16ddae3cd5d06ede8e6cfc7675a' into gingerbread

* commit '9d71860e8cbaf16ddae3cd5d06ede8e6cfc7675a':
  The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.
 2010-06-15 15:21:14 -07:00
Jason Sams
2081bd613e Merge "update image processing." 2010-06-15 14:55:02 -07:00
Joe Onorato
d103af4f4e Merge "Use the droidcore goal with dist-for-goals." into froyo 2010-06-15 13:59:10 -07:00
Joe Onorato
fa5f5bc4a6 Merge "The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them." into froyo 2010-06-15 13:58:33 -07:00
The Android Open Source Project
32df01f775 merge from open-source master 
Change-Id: I0684cac9eb230d864614aef0634c072f4e3ef6a3
 2010-06-15 11:37:17 -07:00
The Android Open Source Project
0acbc14307 merge from open-source master 
Change-Id: I12af4b88c1881a6a120031459bc63d87b1dd4956
 2010-06-15 11:34:57 -07:00
James Dong
13d7cd3ffb am 56b64c75: am ac8b0d47: Merge "This patch enables each omx instance to have a separate message dispatcher, and thus eliminates the sharing of the message dispatches between omx instances." into gingerbread 
Merge commit '56b64c75c3809c55c2053f77802344a9e035343f'

* commit '56b64c75c3809c55c2053f77802344a9e035343f':
  This patch enables each omx instance to have a separate message dispatcher, and
 2010-06-15 11:20:23 -07:00
James Dong
fdbe6bac44 am ac8b0d47: Merge "This patch enables each omx instance to have a separate message dispatcher, and thus eliminates the sharing of the message dispatches between omx instances." into gingerbread 
Merge commit 'ac8b0d47011293ef713f4996317bbda579354200' into gingerbread-plus-aosp

* commit 'ac8b0d47011293ef713f4996317bbda579354200':
  This patch enables each omx instance to have a separate message dispatcher, and
 2010-06-15 10:50:43 -07:00
Scott Main
8042c8eb3d am 522d9907: am 0014296b: am 457738e6: Merge "docs: add information about known issues in resource matching for screen density and system version. Add section about providing compatibility for multiple devices" into froyo 
Merge commit '522d990741b74b4d79f9675da7f32c482253407b'

* commit '522d990741b74b4d79f9675da7f32c482253407b':
  docs: add information about known issues in resource matching
 2010-06-15 10:50:34 -07:00
Scott Main
b6cfbb7932 am fb48f3a2: am e4bca7ee: am 322e7e47: Merge "docs: fix markup error" into froyo 
Merge commit 'fb48f3a25d821a9037591aa76faa7bae46d1debd'

* commit 'fb48f3a25d821a9037591aa76faa7bae46d1debd':
  docs: fix markup error
 2010-06-15 10:50:30 -07:00
James Dong
8600d2eaf9 Merge "This patch enables each omx instance to have a separate message dispatcher, and thus eliminates the sharing of the message dispatches between omx instances." into gingerbread 2010-06-15 10:48:58 -07:00
Scott Main
870b2cfb90 am 0014296b: am 457738e6: Merge "docs: add information about known issues in resource matching for screen density and system version. Add section about providing compatibility for multiple devices" into froyo 
Merge commit '0014296b1faca612134a1daa7f74dd82ed40cc2d' into gingerbread-plus-aosp

* commit '0014296b1faca612134a1daa7f74dd82ed40cc2d':
  docs: add information about known issues in resource matching
 2010-06-15 10:47:24 -07:00
Scott Main
d0aad33171 am e4bca7ee: am 322e7e47: Merge "docs: fix markup error" into froyo 
Merge commit 'e4bca7ee60c6d361ef9f1f025881a6f80a9efdab' into gingerbread-plus-aosp

* commit 'e4bca7ee60c6d361ef9f1f025881a6f80a9efdab':
  docs: fix markup error
 2010-06-15 10:47:21 -07:00