Commit Graph

23959 Commits

Author SHA1 Message Date
Brett Chabot
685fcf364b 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
c95812e6ca Merge "Move out all framework-tests classes." into gingerbread 2010-06-16 14:39:41 -07:00
Irfan Sheriff
1af489205a 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
Irfan Sheriff
f897b443fe Fix driver stop check
- Remove check for supplicant command: setScanResultHandling
- Add check for stopDriver
- Fix condition for rest of commands

Bug: 2771298
Change-Id: I1262b2228814c4f6a4c251390af2f445c5f47234
2010-06-16 14:14:22 -07:00
Scott Main
a0210f76e4 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
c980ba25b0 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
cdeae439a3 Merge "docs: update dashboard" into froyo 2010-06-15 19:33:03 -07:00
Jeff Brown
2dfd2aa413 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
92266a7894 Merge "More work in progress on native events." into gingerbread 2010-06-15 16:44:23 -07:00
Jeff Brown
9c3cda04d9 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
5907ffa453 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
2f6f6240fd 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
a6c52938b1 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
3137f8c54d 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
6567adf8b6 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
c43f478425 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
3d6ea3bd86 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
987e223df7 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
9a5fcd1c14 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
Wei Huang
2b24ecfbb2 add new video/audio presence icons in the framework resource dirs, and make them public.
- add definitions for

presence_video_away
presence_video_busy
presence_video_online
presence_audio_away
presence_audio_busy
presence_audio_online

in the public.xml, and update current.xml

- the actual icons for the audio versions are not yet done, so I used the video versions as placeholders.

Change-Id: I9e2be5dd05619cbdbbb61dc231e9da1984ddbb36
2010-06-15 15:19:40 -07:00
Joe Onorato
27357fc088 Merge "Use the droidcore goal with dist-for-goals." into froyo 2010-06-15 13:59:10 -07:00
Joe Onorato
9d71860e8c 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
James Dong
56b64c75c3 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
James Dong
ac8b0d4701 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
522d990741 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
fb48f3a25d 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
Scott Main
0014296b1f 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 '457738e628ee4d165014996bcf4e8d1983ac5929' into gingerbread

* commit '457738e628ee4d165014996bcf4e8d1983ac5929':
  docs: add information about known issues in resource matching
2010-06-15 10:43:10 -07:00
Scott Main
e4bca7ee60 am 322e7e47: Merge "docs: fix markup error" into froyo
Merge commit '322e7e477d89aca18d65cbd289343e716c45a699' into gingerbread

* commit '322e7e477d89aca18d65cbd289343e716c45a699':
  docs: fix markup error
2010-06-15 10:42:52 -07:00
Scott Main
b102a5e8c2 docs: update dashboard
Change-Id: If8d1ad8aa99d93f707635631a44e6c359895302a
2010-06-15 10:42:10 -07:00
Scott Main
457738e628 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 2010-06-15 10:36:27 -07:00
Scott Main
322e7e477d Merge "docs: fix markup error" into froyo 2010-06-15 10:36:14 -07:00
Mathias Agopian
5126633a3e am 2d468c5d: Make sure SurfaceView use a 565 surface when requesting an OPAQUE format.
Merge commit '2d468c5d73cc1cefbcfa8d98e30622c54756918c' into gingerbread-plus-aosp

* commit '2d468c5d73cc1cefbcfa8d98e30622c54756918c':
  Make sure SurfaceView use a 565 surface when requesting an OPAQUE format.
2010-06-14 22:00:40 -07:00
Mathias Agopian
2d468c5d73 Make sure SurfaceView use a 565 surface when requesting an OPAQUE format.
this is needed for backward compatibility with somewhat buggy applications.
not a big deal, since the app can request another format explicitely.

Change-Id: Ic73f8acedf94ffc0115637efac28fa8ffaa7e5a4
2010-06-14 21:56:34 -07:00
James Dong
c52ced0726 This patch enables each omx instance to have a separate message dispatcher, and
thus eliminates the sharing of the message dispatches between omx instances.

If the omx audio and video encoders share the same dispatcher, when the audio read
blocks in the AudioSource, the message dispatcher thread gets blocked. As a result,
the message for the omx video encoder can not be dispatched, hence gets blocked too.
If the blocking time is long enough, the video frame rate decreases significantly.
This is the case when we read 2048 bytes by default each time. Reading smaller blocks
of audio data helps mitigate the above-mentioned problem, but it is not an ideal
solution for two reasons: a) it is not efficient, and thus can cause a lot of overhead
passing buffers between the frame work and the omx encoders; b) also, the audio record
thread can overflow as a result, which lead to the loss of recorded audio frames.

This patch affects both authoring engine and the playback engine.

Change-Id: I26dfde7ac46c8752cf1793ce1bfcc7be7724580e
2010-06-14 17:28:05 -07:00
Brett Chabot
be81f4f15d Move out all framework-tests classes.
Previously tests/framework-tests contained a quarantined set of test classes
that needed access to package-private framework api. Running these tests
normally would cause the dalvik verifier to throw errors.

runtest now has support for turning off the dalvik verifier for frameworks
tests, so move this tests into their recommended location, close to the source
being tested.

Also move policy source into a 'src' folder to accommodate the tests move.

Change-Id: I62f839da185a55bc553b653bf583fd99da438512
2010-06-14 17:23:08 -07:00
Jeff Brown
e0e5da0d64 am 96e59eb8: Merge "Support for multiple tests" into gingerbread
Merge commit '96e59eb8f34e999deb9eb4974cbfc07c71df3cab' into gingerbread-plus-aosp

* commit '96e59eb8f34e999deb9eb4974cbfc07c71df3cab':
  Support for multiple tests
2010-06-14 16:32:28 -07:00
Jeff Brown
96e59eb8f3 Merge "Support for multiple tests" into gingerbread 2010-06-14 15:49:57 -07:00
Jeff Brown
f1d3802ea2 Support for multiple tests
The build system enforces some invariants that were being ignored
before.

Change-Id: Ie7675042af7f961a507386c13b2a0b592b591af8
2010-06-14 15:46:08 -07:00
Brad Fitzpatrick
92dd85d02a am 742b282e: Merge "StrictMode: implement the log-to-DropBox option" into gingerbread
Merge commit '742b282e1168ed3820cb549a89753f39f4de0fa6' into gingerbread-plus-aosp

* commit '742b282e1168ed3820cb549a89753f39f4de0fa6':
  StrictMode: implement the log-to-DropBox option
2010-06-14 15:21:21 -07:00
Brad Fitzpatrick
742b282e11 Merge "StrictMode: implement the log-to-DropBox option" into gingerbread 2010-06-14 15:19:51 -07:00
Dianne Hackborn
13792057e4 am 7e900cbf: Merge "Update build version information." into gingerbread
Merge commit '7e900cbf1d600a8895e63a0247f45c116ff05172' into gingerbread-plus-aosp

* commit '7e900cbf1d600a8895e63a0247f45c116ff05172':
  Update build version information.
2010-06-14 14:13:07 -07:00
Dianne Hackborn
7e900cbf1d Merge "Update build version information." into gingerbread 2010-06-14 14:10:43 -07:00
Dianne Hackborn
3e03cfa3af Update build version information.
Change-Id: If53f16d494255230859a30f561e9a78ec49c6c10
2010-06-14 14:08:20 -07:00
Brad Fitzpatrick
143666f0ca StrictMode: implement the log-to-DropBox option
Change-Id: I51d12e264155078f953028241f8c5cbdc47262e8
2010-06-14 13:38:01 -07:00
James Dong
814f430cb5 am dca66e1c: Fixed a typo - maybe we should do comparison ignoring the case?
Merge commit 'dca66e1c3bc8842b0d44e0cb004e507a456e4b8f' into gingerbread-plus-aosp

* commit 'dca66e1c3bc8842b0d44e0cb004e507a456e4b8f':
  Fixed a typo - maybe we should do comparison ignoring the case?
2010-06-14 13:20:54 -07:00
Scott Main
7ef674b596 docs: add information about known issues in resource matching
for screen density and system version.
Add section about providing compatibility for multiple devices

bug: 2760561

Change-Id: I9b3a515a14d53923a15b1931f6dd24f295874362
2010-06-14 12:57:54 -07:00
The Android Open Source Project
864c68ea45 merge from froyo-plus-aosp
Change-Id: I9cede57e10df9d6ba411b2960a77d7b9b60a1489
2010-06-14 11:35:51 -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
The Android Open Source Project
d7b814188d merge from open-source master
Change-Id: Ica77cebdbb8880345faeb1ee819f51b0b7ff7a0c
2010-06-14 11:07:32 -07:00
The Android Open Source Project
51a9839ec6 merge from open-source master
Change-Id: I7a9f23192372fc6973d9f3eb399f895f4765f6b2
2010-06-14 11:06:33 -07:00