22722 Commits

Author SHA1 Message Date
Wu-cheng Li
b339013589 am d8c33747: am 78624e41: Add remove method in CameraParameters class.
Merge commit 'd8c33747afbe98e893e0569f3bf45b67a9e8e728' into kraken

* commit 'd8c33747afbe98e893e0569f3bf45b67a9e8e728':
  Add remove method in CameraParameters class.
2010-05-12 07:55:00 -07:00
Wu-cheng Li
d8c33747af am 78624e41: Add remove method in CameraParameters class.
Merge commit '78624e41da166712aaa5ae47e4d3467337ac810a' into froyo-plus-aosp

* commit '78624e41da166712aaa5ae47e4d3467337ac810a':
  Add remove method in CameraParameters class.
2010-05-12 07:48:41 -07:00
James Dong
2cd841d485 Added initial validation on video/audio encoding parameters before/at start()
Change-Id: I1a40dd247202f70e3e5429d74533d349b88f1d54
2010-05-11 13:10:02 -07:00
Jamie Gennis
25c2af99bf Merge "Add incStrong and decStrong methods to android_native_{window,buffer}_t." into kraken 2010-05-11 12:25:31 -07:00
James Dong
b5e742397d Output streamable MP4 file during MP4 file recording
When the reserved moov box space is not big enough,
fall back to non-streamable MP4 file.

Change-Id: I93382d037d657a3f3fe2af31e4ea26e1898b4d95
2010-05-11 10:36:43 -07:00
Keith Ito
8528fcb199 am a8d8cb12: am be65399b: Merge "Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter" into froyo
Merge commit 'a8d8cb12b3dbe5e196a3ff2549f8594a704ecde4' into kraken

* commit 'a8d8cb12b3dbe5e196a3ff2549f8594a704ecde4':
  Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter
2010-05-11 10:24:03 -07:00
Nicolas Roard
2f68be5417 am 373b4913: am f78acacb: Fix the \'wobbling fixed elements\' bug. Cherry-picked from master. This CL has a corresponding C++ counterpart (https://android-git.corp.google.com/g/#change,51149)
Merge commit '373b4913ab5398736551ab718eb8c39d6f76e5d0' into kraken

* commit '373b4913ab5398736551ab718eb8c39d6f76e5d0':
  Fix the 'wobbling fixed elements' bug.
2010-05-11 10:24:00 -07:00
Dianne Hackborn
7d5cea988b am 7e76b6d1: am 6d00151c: Merge "Hopefully fix issue #2662536: Why is launcher being killed?" into froyo
Merge commit '7e76b6d191e1173bd85337a2861d9914922f5a0d' into kraken

* commit '7e76b6d191e1173bd85337a2861d9914922f5a0d':
  Hopefully fix issue #2662536: Why is launcher being killed?
2010-05-11 10:23:56 -07:00
Dirk Dougherty
c5803869ff am 02168c41: am 1926c471: Merge "Doc change: Final api diffs 7 -> 8." into froyo
Merge commit '02168c41c444e4f601a2809d6d948e4b051b3a3e' into kraken

* commit '02168c41c444e4f601a2809d6d948e4b051b3a3e':
  Doc change: Final api diffs 7 -> 8.
2010-05-11 10:23:52 -07:00
Dirk Dougherty
0ab047c732 am 769612e1: am b32c2402: Doc change: add toc references to tictactoe sample apps and screen shots.
Merge commit '769612e160c9be01c96371412e12d367e5063e9f' into kraken

* commit '769612e160c9be01c96371412e12d367e5063e9f':
  Doc change: add toc references to tictactoe sample apps and screen shots.
2010-05-11 10:23:48 -07:00
Jim Miller
99dcfe7cda am 4d89954d: am a2757901: Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo
Merge commit '4d89954dc4572a05339dc7a95ec683892558162b' into kraken

* commit '4d89954dc4572a05339dc7a95ec683892558162b':
  Fix 2660488: Add LockScreen/InCallScreen resources to preloads
2010-05-11 10:23:42 -07:00
Keith Ito
a8d8cb12b3 am be65399b: Merge "Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter" into froyo
Merge commit 'be65399baf23855094596e27c25763ff92e9e027' into froyo-plus-aosp

* commit 'be65399baf23855094596e27c25763ff92e9e027':
  Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter
2010-05-11 10:19:06 -07:00
Nicolas Roard
373b4913ab am f78acacb: Fix the \'wobbling fixed elements\' bug. Cherry-picked from master. This CL has a corresponding C++ counterpart (https://android-git.corp.google.com/g/#change,51149)
Merge commit 'f78acacb0d7a8e4d9e85a1cd6eed0f6bb38d6776' into froyo-plus-aosp

* commit 'f78acacb0d7a8e4d9e85a1cd6eed0f6bb38d6776':
  Fix the 'wobbling fixed elements' bug.
2010-05-11 10:18:59 -07:00
Dianne Hackborn
7e76b6d191 am 6d00151c: Merge "Hopefully fix issue #2662536: Why is launcher being killed?" into froyo
Merge commit '6d00151c519d5c131cc1480978fe4417cc7bcc79' into froyo-plus-aosp

* commit '6d00151c519d5c131cc1480978fe4417cc7bcc79':
  Hopefully fix issue #2662536: Why is launcher being killed?
2010-05-11 10:18:55 -07:00
Dirk Dougherty
02168c41c4 am 1926c471: Merge "Doc change: Final api diffs 7 -> 8." into froyo
Merge commit '1926c471a3acde38931f2cbd55415decc9879d2d' into froyo-plus-aosp

* commit '1926c471a3acde38931f2cbd55415decc9879d2d':
  Doc change: Final api diffs 7 -> 8.
2010-05-11 10:18:51 -07:00
Dirk Dougherty
769612e160 am b32c2402: Doc change: add toc references to tictactoe sample apps and screen shots.
Merge commit 'b32c2402c2b9d58b4f74be62dac6ce2781caec05' into froyo-plus-aosp

* commit 'b32c2402c2b9d58b4f74be62dac6ce2781caec05':
  Doc change: add toc references to tictactoe sample apps and screen shots.
2010-05-11 10:18:47 -07:00
Jim Miller
4d89954dc4 am a2757901: Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo
Merge commit 'a27579016caf1438400a3637e3896bec653e3756' into froyo-plus-aosp

* commit 'a27579016caf1438400a3637e3896bec653e3756':
  Fix 2660488: Add LockScreen/InCallScreen resources to preloads
2010-05-11 10:18:38 -07:00
Wu-cheng Li
78624e41da Add remove method in CameraParameters class.
bug:2672651
Change-Id: I537c817b5ca6a3d925f22febe9a5769156354d00
2010-05-11 12:54:14 +08:00
Keith Ito
be65399baf Merge "Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter" into froyo 2010-05-10 20:41:47 -07:00
Wu-cheng Li
e1b2b3b0d2 Merge "Add continuous focus mode constant." into kraken 2010-05-10 20:04:14 -07:00
Nicolas Roard
f78acacb0d Fix the 'wobbling fixed elements' bug.
Cherry-picked from master.
This CL has a corresponding C++ counterpart (https://android-git.corp.google.com/g/#change,51149)

Bug:2665696
Change-Id: I0a044661ff21ef601ba34782db8acdc9531f98e7
2010-05-10 19:31:54 -07:00
Keith Ito
9114a8bb8b Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter
Change-Id: I10b02306478d9c595dbcae0767b44c403d50e24a
2010-05-10 18:27:23 -07:00
Jamie Gennis
505cef3330 Add incStrong and decStrong methods to android_native_{window,buffer}_t.
This change adds the methods necessary to use sp<> to handle refcounting
android_native_window_t and android_native_buffer_t.  The new methods forward
the refcounting operations to the corresponding android_native_base_t
functions.

Change-Id: I7de8e262728e439bc1efdf69374a2a9f6f432ced
2010-05-10 17:33:32 -07:00
Dianne Hackborn
6d00151c51 Merge "Hopefully fix issue #2662536: Why is launcher being killed?" into froyo 2010-05-10 17:27:14 -07:00
Dianne Hackborn
906497c574 Hopefully fix issue #2662536: Why is launcher being killed?
It looks like there was a subtle bug where Process.setOomAdj() could
return false just because the given process doesn't exist, even though
it is documented to only return false if OOM killing is not supported
at all.  This would cause the activity manager to fall into its code
path of trying to clean up processes itself, which it does a much
poorer problem at.  I am thinking we may be seeing this problem more
now that the activity manager is killing background processes itself
when there are too many of them.

In addition, this change cleans up and reduces some of the logging
around killing processes.

Finally, try to improve process LRU management a bit by taking
into account process dependencies.  Any dependent processes are
pulled up in the LRU list with the processes that is actually
moving.  Also, we bring a process up if someone accesses its content
provider.

Change-Id: I34ea161f839679345578ffe681e8d9c5d26ab948
2010-05-10 17:19:58 -07:00
Dirk Dougherty
1926c471a3 Merge "Doc change: Final api diffs 7 -> 8." into froyo 2010-05-10 16:23:13 -07:00
Dirk Dougherty
b32c2402c2 Doc change: add toc references to tictactoe sample apps and screen shots.
Change-Id: I7d520587c0e6b2252e819029a2f053893fdcd7c3
2010-05-10 16:19:52 -07:00
Jim Miller
a27579016c Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo 2010-05-10 15:55:41 -07:00
Jim Miller
7d38886ba6 Fix 2660488: Add LockScreen/InCallScreen resources to preloads
This adds the base SlidinTab drawable resources shared by
InCallScreen and LockScreen into the zygote process. It should
save approximately 375kB (mdpi) and 825kB (hdpi) of RAM by
sharing resource between the LockScreen and InCallScreen.

Change-Id: I05bcafa894ed27d419b171ad5041bd83134461f7
2010-05-10 15:24:47 -07:00
The Android Open Source Project
e88ae544e3 am b6f0cbdc: merge from open-source master
Merge commit 'b6f0cbdcbb566368ebe0468f61de024f644db6e1' into kraken

* commit 'b6f0cbdcbb566368ebe0468f61de024f644db6e1':
  Include the API level 4 fields in the Parcel.
2010-05-10 13:50:32 -07:00
The Android Open Source Project
b6f0cbdcbb merge from open-source master
Change-Id: Ia4cbea9d94b2ff34fc8ce97c1fe35ca5898d6c1c
2010-05-10 13:48:37 -07:00
The Android Open Source Project
38a410f12a am 686d9ff5: merge from open-source master
Merge commit '686d9ff53c32ded9b2b02eb9f2040f2030846e51' into kraken

* commit '686d9ff53c32ded9b2b02eb9f2040f2030846e51':
  Use isLocationProviderEnabled to test for enabled providers
  Added WEB_URL_PATTERN for Montenegro ".me"
  long modifier was on the wrong argument.
2010-05-10 12:53:28 -07:00
The Android Open Source Project
686d9ff53c merge from open-source master
Change-Id: Ic2b28b589d079cf3c9927ce9ad22bc5f9134e445
2010-05-10 12:37:10 -07:00
James Dong
4000e06ef6 Merge "Metadata construction optimization" into kraken 2010-05-10 11:33:25 -07:00
Jean-Baptiste Queru
855a9e6d12 Merge "Include the API level 4 fields in the Parcel." 2010-05-10 11:14:01 -07:00
Robert Greenwalt
da7bf20608 am c8d1556f: am b74a239f: Merge "String change to refer to wifi tether as hotspot" into froyo
Merge commit 'c8d1556fb8e78dc6cecc8dc52f2bf0e093c968f4' into kraken

* commit 'c8d1556fb8e78dc6cecc8dc52f2bf0e093c968f4':
  String change to refer to wifi tether as hotspot
2010-05-10 10:14:51 -07:00
Robert Greenwalt
c8d1556fb8 am b74a239f: Merge "String change to refer to wifi tether as hotspot" into froyo
Merge commit 'b74a239fd2e729c41b0cb87cbc606530ed631a41' into froyo-plus-aosp

* commit 'b74a239fd2e729c41b0cb87cbc606530ed631a41':
  String change to refer to wifi tether as hotspot
2010-05-10 10:12:58 -07:00
Robert Greenwalt
b74a239fd2 Merge "String change to refer to wifi tether as hotspot" into froyo 2010-05-10 10:11:12 -07:00
Scott Main
9d5b754bce am 717e135c: am 62c28cae: Merge "docs: change SearchableDictionary to "v2" and remove old "new" superscripts from resources toc" into froyo
Merge commit '717e135c17239ff3dd0698eb82b26f8e8ade0d08' into kraken

* commit '717e135c17239ff3dd0698eb82b26f8e8ade0d08':
  docs: change SearchableDictionary to "v2" and remove old "new" superscripts from resources toc
2010-05-10 09:58:30 -07:00
Scott Main
717e135c17 am 62c28cae: Merge "docs: change SearchableDictionary to "v2" and remove old "new" superscripts from resources toc" into froyo
Merge commit '62c28caee4a26e106134264f917bacef77438483' into froyo-plus-aosp

* commit '62c28caee4a26e106134264f917bacef77438483':
  docs: change SearchableDictionary to "v2" and remove old "new" superscripts from resources toc
2010-05-10 09:56:43 -07:00
Scott Main
62c28caee4 Merge "docs: change SearchableDictionary to "v2" and remove old "new" superscripts from resources toc" into froyo 2010-05-10 09:54:30 -07:00
Dan Egnor
1a373db021 am 5610c287: am 7d167376: Merge "Add unit test for passing thread priority & cgroup through Binder." into froyo
Merge commit '5610c2871b5a8abab081c9e209925e2f0f2e3966' into kraken

* commit '5610c2871b5a8abab081c9e209925e2f0f2e3966':
  Add unit test for passing thread priority & cgroup through Binder.
2010-05-10 09:49:41 -07:00
Dirk Dougherty
31e4f45eba am e4682e8a: am fb70ffd9: Merge "Doc change: cherry-pick from master: Testing Android Applications document (concepts)" into froyo
Merge commit 'e4682e8ae75d573c12ddabce13b8b5c39011a86f' into kraken

* commit 'e4682e8ae75d573c12ddabce13b8b5c39011a86f':
  Doc change: cherry-pick from master: Testing Android Applications document (concepts)
2010-05-10 09:49:37 -07:00
Scott Main
25d2406176 am fe5921aa: am c4c42eef: docs: add default value and compatibility info for installLocation
Merge commit 'fe5921aa7e4ed5a1de02259d4ac468b7b013fa83' into kraken

* commit 'fe5921aa7e4ed5a1de02259d4ac468b7b013fa83':
  docs: add default value and compatibility info for installLocation
2010-05-10 09:49:34 -07:00
Scott Main
3d3853a618 am d2f2a80e: am c6cb8a78: docs: revisions to the new resources doc based on editorial feedback plus some fixes to resource references and other misc revisions
Merge commit 'd2f2a80e9ff7f0b2229d921f24682d984e3b5673' into kraken

* commit 'd2f2a80e9ff7f0b2229d921f24682d984e3b5673':
  docs: revisions to the new resources doc based on editorial feedback
2010-05-10 09:49:30 -07:00
Andreas Huber
248597ae64 am 17078510: am d13efb20: Merge "A new OggExtractor/VorbisDecoder combo to support approximate seeking." into froyo
Merge commit '1707851090e6512a77247b0c260dd673ef687589' into kraken

* commit '1707851090e6512a77247b0c260dd673ef687589':
  A new OggExtractor/VorbisDecoder combo to support approximate seeking.
2010-05-10 09:49:24 -07:00
Mathias Agopian
4cfc21ecd9 am 56aed6bd: am c69775d6: Merge "fix [2664345] Flash: Bad flicker at the end of a pinch zoom." into froyo
Merge commit '56aed6bde0c52658d2cb1207c0cfe8ba0a764c59' into kraken

* commit '56aed6bde0c52658d2cb1207c0cfe8ba0a764c59':
  fix [2664345] Flash: Bad flicker at the end of a pinch zoom.
2010-05-10 09:49:19 -07:00
Dirk Dougherty
47de84c359 am aff856d0: am 0dd3a239: Merge "Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files" into froyo
Merge commit 'aff856d053ba239114e7f16d3cdd240a6d973f2f' into kraken

* commit 'aff856d053ba239114e7f16d3cdd240a6d973f2f':
  Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files
2010-05-10 09:49:13 -07:00
Dan Egnor
5610c2871b am 7d167376: Merge "Add unit test for passing thread priority & cgroup through Binder." into froyo
Merge commit '7d16737668685b5b4e6158a6ff6f79a92ed3b4d9' into froyo-plus-aosp

* commit '7d16737668685b5b4e6158a6ff6f79a92ed3b4d9':
  Add unit test for passing thread priority & cgroup through Binder.
2010-05-10 09:43:53 -07:00
Dirk Dougherty
e4682e8ae7 am fb70ffd9: Merge "Doc change: cherry-pick from master: Testing Android Applications document (concepts)" into froyo
Merge commit 'fb70ffd993a9ec60c806b873014b2f0f6e874c77' into froyo-plus-aosp

* commit 'fb70ffd993a9ec60c806b873014b2f0f6e874c77':
  Doc change: cherry-pick from master: Testing Android Applications document (concepts)
2010-05-10 09:43:50 -07:00