ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
15,358 Commits 2 Branches 0 Tags 54 MiB
e8de8f47c6
Commit Graph

15358 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Keith Ito
735da3103b Merge "Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter" into froyo 2010-05-10 20:41:47 -07:00
Mathias Agopian
b0eed511a2 Merge "Build software AGL library with correct get_tls() macro for ARMv7 based platforms" 2010-05-10 20:28:02 -07:00
Mathias Agopian
32a220aa6e Merge "Fix glReadPixels() to verify that both x and y are non-negative." 2010-05-10 20:26:24 -07:00
Wu-cheng Li
8ccfd2eeeb Merge "Add continuous focus mode constant." into kraken 2010-05-10 20:04:14 -07:00
Costin Manolache
7395cf239b Bug 2673557: rename datamessaging 
Change-Id: I583ac61c7b8fce69d60801dc76aeca9f13d250b2
 2010-05-10 19:12:49 -07:00
Jamie Gennis
5e67f87430 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
ff91f88305 Merge "Hopefully fix issue #2662536: Why is launcher being killed?" into froyo 2010-05-10 17:27:14 -07:00
Dirk Dougherty
d48af30682 Merge "Doc change: Final api diffs 7 -> 8." into froyo 2010-05-10 16:23:13 -07:00
Jim Miller
dbcc5242bc Merge "Fix 2660488: Add LockScreen/InCallScreen resources to preloads" into froyo 2010-05-10 15:55:41 -07:00
The Android Open Source Project
e45269d852 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
22cffae52d merge from open-source master 
Change-Id: Ia4cbea9d94b2ff34fc8ce97c1fe35ca5898d6c1c
 2010-05-10 13:48:37 -07:00
The Android Open Source Project
914b12a965 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
03ba157ee3 merge from open-source master 
Change-Id: Ic2b28b589d079cf3c9927ce9ad22bc5f9134e445
 2010-05-10 12:37:10 -07:00
James Dong
5d95f613a7 Merge "Metadata construction optimization" into kraken 2010-05-10 11:33:25 -07:00
Jean-Baptiste Queru
3658de5fdd Merge "Include the API level 4 fields in the Parcel." 2010-05-10 11:14:01 -07:00
Robert Greenwalt
7dfbfe45a6 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
3ed432dff9 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
49503107e9 Merge "String change to refer to wifi tether as hotspot" into froyo 2010-05-10 10:11:12 -07:00
Scott Main
5bc546043e 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
4f3fbc22bb 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
3bd882a0e2 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
47cd058b5f 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
205212ff1a 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
cf61c9e644 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
4dec4e2594 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
17dff2accd 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
0c7af77450 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
46bd7e9d0a 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
ee9d1a7af4 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
d4f55816a5 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
Scott Main
60cc15de8e am c4c42eef: docs: add default value and compatibility info for installLocation 
Merge commit 'c4c42eef9a62846a152094d61987e6dd2728e417' into froyo-plus-aosp

* commit 'c4c42eef9a62846a152094d61987e6dd2728e417':
  docs: add default value and compatibility info for installLocation
 2010-05-10 09:43:47 -07:00
Scott Main
ec057d4663 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 'c6cb8a78d03cda44a49a990b4d4153560bee7420' into froyo-plus-aosp

* commit 'c6cb8a78d03cda44a49a990b4d4153560bee7420':
  docs: revisions to the new resources doc based on editorial feedback
 2010-05-10 09:43:35 -07:00
Andreas Huber
6061012600 am d13efb20: Merge "A new OggExtractor/VorbisDecoder combo to support approximate seeking." into froyo 
Merge commit 'd13efb20089e44e6958cb9704864c03821f19e1c' into froyo-plus-aosp

* commit 'd13efb20089e44e6958cb9704864c03821f19e1c':
  A new OggExtractor/VorbisDecoder combo to support approximate seeking.
 2010-05-10 09:43:26 -07:00
Mathias Agopian
e7c4447296 am c69775d6: Merge "fix [2664345] Flash: Bad flicker at the end of a pinch zoom." into froyo 
Merge commit 'c69775d616c25d31dcea119ab1e7af19148853e2' into froyo-plus-aosp

* commit 'c69775d616c25d31dcea119ab1e7af19148853e2':
  fix [2664345] Flash: Bad flicker at the end of a pinch zoom.
 2010-05-10 09:43:23 -07:00
Dirk Dougherty
f79e4c7fd5 am 0dd3a239: Merge "Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files" into froyo 
Merge commit '0dd3a239519369933d4efa701479c816b4b33874' into froyo-plus-aosp

* commit '0dd3a239519369933d4efa701479c816b4b33874':
  Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files
 2010-05-10 09:43:03 -07:00
Jean-Baptiste Queru
02e9bff357 Merge "long modifier was on the wrong argument." 2010-05-10 08:55:17 -07:00
Chih-Chung Chang
2ff1971b68 Force sooner/generic/sim to use camera stub only. 
Change-Id: Ie3251e3801cd09b3f373bbd4afb5fda82a0c5818
 2010-05-10 15:04:40 +08:00
Chih-Chung Chang
8476185a96 Fix for build without a hardware camera. 
Change-Id: Ib5a0b58ea9e02ae1df9d258de541726189147567
 2010-05-10 14:36:24 +08:00
Chih-Chung Chang
5997faf931 Support multiple cameras in framework. 
Change-Id: I081f0fbdca4b633715ea7c3b3d42f8662d27598a
 2010-05-10 11:21:14 +08:00
Dan Egnor
cd836255bf Merge "Add unit test for passing thread priority & cgroup through Binder." into froyo 2010-05-09 07:03:46 -07:00
Dirk Dougherty
2f2c2bb2fe Merge "Doc change: cherry-pick from master: Testing Android Applications document (concepts)" into froyo 2010-05-07 21:07:57 -07:00
Andreas Huber
a10b8ac9f8 Merge "A new OggExtractor/VorbisDecoder combo to support approximate seeking." into froyo 2010-05-07 13:47:42 -07:00
Mathias Agopian
026fba3698 Merge "fix [2664345] Flash: Bad flicker at the end of a pinch zoom." into froyo 2010-05-07 13:39:29 -07:00
Jean-Baptiste Queru
66308738bc Merge "Added WEB_URL_PATTERN for Montenegro ".me"" 2010-05-07 12:57:02 -07:00
Dirk Dougherty
37c990e9e2 Merge "Doc change: cherry-pick from master: Activity Testing/Hello, Testing tutorials doc files" into froyo 2010-05-07 10:57:48 -07:00
Brian Carlstrom
81b3d23bd0 am e34d31e6: am e616553e: Updaing preloaded classes with removal of OpenSSLSocketImpl 
Merge commit 'e34d31e690cdfc529fe8e1e8f70e50c3719a4ccc' into kraken

* commit 'e34d31e690cdfc529fe8e1e8f70e50c3719a4ccc':
  Updaing preloaded classes with removal of OpenSSLSocketImpl$Finalizer
 2010-05-07 10:25:41 -07:00
Brian Carlstrom
bd08c07d9d am e616553e: Updaing preloaded classes with removal of OpenSSLSocketImpl 
Merge commit 'e616553ebc895bef22b7e9e1d1d4b6cffdbe82fe' into froyo-plus-aosp

* commit 'e616553ebc895bef22b7e9e1d1d4b6cffdbe82fe':
  Updaing preloaded classes with removal of OpenSSLSocketImpl$Finalizer
 2010-05-07 10:23:34 -07:00
Joe Malin
b1ad26bc8d am 9609cdc8: am e50b940f: Doc Change: cherry-pick doc change from master. -> Add images for the index file for the SpinnerTest test application sample. 
Merge commit '9609cdc8522414b61ffb7d31b4ceb2007f205129' into kraken

* commit '9609cdc8522414b61ffb7d31b4ceb2007f205129':
  Doc Change: cherry-pick doc change from master. -> Add images for the index file for the SpinnerTest test application sample.
 2010-05-07 08:58:42 -07:00
Joe Malin
bb52cb2555 am e50b940f: Doc Change: cherry-pick doc change from master. -> Add images for the index file for the SpinnerTest test application sample. 
Merge commit 'e50b940f153070a631a6c0d426cb7f3207042659' into froyo-plus-aosp

* commit 'e50b940f153070a631a6c0d426cb7f3207042659':
  Doc Change: cherry-pick doc change from master. -> Add images for the index file for the SpinnerTest test application sample.
 2010-05-07 08:54:53 -07:00
Bjorn Bringert
e349c382b8 am c8170ee2: am 75370e74: Merge "Fixing: RecognitionService logcat spam "cancel called..."" into froyo 
Merge commit 'c8170ee2055dcaf993391aacef0e54d87561bfdb' into kraken

* commit 'c8170ee2055dcaf993391aacef0e54d87561bfdb':
  Fixing: RecognitionService logcat spam "cancel called..."
 2010-05-07 03:43:48 -07:00