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

14627 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
1e588cfedc am 59cfe713: Merge "Doc change: adjustments to the api changes description" into froyo 
Merge commit '59cfe7137ca411bdbb5ffcdf418eecc55d65d09e' into froyo-plus-aosp

* commit '59cfe7137ca411bdbb5ffcdf418eecc55d65d09e':
  Doc change: adjustments to the api changes description
 2010-05-14 13:48:04 -07:00
Dirk Dougherty
2363a9d496 Merge "Doc change: adjustments to the api changes description" into froyo 2010-05-14 13:46:42 -07:00
Dirk Dougherty
b7a9cbc7e1 am bba70cdb: Merge "Doc change: add note about future instruction set support." into froyo 
Merge commit 'bba70cdba284c3d76cab9843e44097d664882938' into froyo-plus-aosp

* commit 'bba70cdba284c3d76cab9843e44097d664882938':
  Doc change: add note about future instruction set support.
 2010-05-14 13:45:17 -07:00
Dirk Dougherty
c04d390b92 Merge "Doc change: add note about future instruction set support." into froyo 2010-05-14 13:43:19 -07:00
Dirk Dougherty
4d8158737f am 89969d4c: Merge "Doc change: documentation for library projects in sdk." into froyo 
Merge commit '89969d4cdaf7abbbf6d3fce86c274e7b79113e8d' into froyo-plus-aosp

* commit '89969d4cdaf7abbbf6d3fce86c274e7b79113e8d':
  Doc change: documentation for library projects in sdk.
 2010-05-14 13:40:19 -07:00
Jean-Baptiste Queru
6b4a87862e Merge "Only hold a weak pointer on SurfaceComposerClients" 2010-05-14 13:39:48 -07:00
Dirk Dougherty
a3f10c57af Merge "Doc change: documentation for library projects in sdk." into froyo 2010-05-14 13:38:20 -07:00
Scott Main
62cabab267 am b83a283a: docs: add dev guide for backup 
Merge commit 'b83a283ac178ab0a72f1d811189d79b26097835e' into froyo-plus-aosp

* commit 'b83a283ac178ab0a72f1d811189d79b26097835e':
  docs: add dev guide for backup
 2010-05-14 11:53:44 -07:00
Jean-Baptiste Queru
d181206cab Merge "SetLocaleByCarrier, only if its not an unknown carrier." 2010-05-14 11:39:06 -07:00
The Android Open Source Project
f614ba9a79 merge from open-source master 
Change-Id: I934cf85c4673f9ca3a9549c2074907ad572310f4
 2010-05-14 09:44:36 -07:00
The Android Open Source Project
d69ec09f47 merge from open-source master 
Change-Id: I57f108d2b3415eddb0b20a4a9dec4c44285de226
 2010-05-14 09:11:31 -07:00
Jean-Baptiste Queru
a7b36de932 Merge "Accept media files by file extension in case insensitive manner." 2010-05-14 09:06:43 -07:00
Dirk Dougherty
dee7dcb4c3 am fb473bb6: Merge "Doc change: adjustments for ndk feature description" into froyo 
Merge commit 'fb473bb6118f6b82fdeda443b4fdc4ce31d3ed60' into froyo-plus-aosp

* commit 'fb473bb6118f6b82fdeda443b4fdc4ce31d3ed60':
  Doc change: adjustments for ndk feature description
 2010-05-13 21:32:21 -07:00
Dirk Dougherty
32374efa5f Merge "Doc change: adjustments for ndk feature description" into froyo 2010-05-13 21:31:10 -07:00
Dirk Dougherty
706ca4bcea am a0711e7b: Doc change: Add compatibility article. 
Merge commit 'a0711e7b3995f4ae3d8b116030c6b3ed13ad2f99' into froyo-plus-aosp

* commit 'a0711e7b3995f4ae3d8b116030c6b3ed13ad2f99':
  Doc change: Add compatibility article.
 2010-05-13 21:26:22 -07:00
Joe Onorato
0edd269995 Merge "Put the wifi status icon in the right place." 2010-05-13 16:33:22 -07:00
Suchi Amalapurapu
ad89c7dd02 am c928a11e: Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo 
Merge commit 'c928a11e34678296511d5ea34582292be7368618' into froyo-plus-aosp

* commit 'c928a11e34678296511d5ea34582292be7368618':
  Fix 2672155
 2010-05-13 16:04:24 -07:00
Suchi Amalapurapu
60ef6d786f Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo 2010-05-13 16:02:20 -07:00
The Android Open Source Project
7541e1e1d6 merge from open-source master 
Change-Id: I88a580162b34a80d1e3e7987b7a301c253afa0e8
 2010-05-13 14:50:16 -07:00
Mike Lockwood
a5cdbc86b3 am 098e58da: Use SystemClock.elapsedRealtime in ShutdownThread timeout logic 
Merge commit '098e58da93f304d7d7791f193c6237870b94989d' into froyo-plus-aosp

* commit '098e58da93f304d7d7791f193c6237870b94989d':
  Use SystemClock.elapsedRealtime in ShutdownThread timeout logic
 2010-05-13 14:04:30 -07:00
Dianne Hackborn
f0f0539b04 Merge "Corrected debug message in WindowManager" 2010-05-13 13:25:16 -07:00
Jean-Baptiste Queru
27ed27860c Merge "New test in FrameworkTest for the VelocityTracker class" 2010-05-13 11:39:51 -07:00
Andreas Huber
6e8d3ab4da am 3c78a1b5: Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config. 
Merge commit '3c78a1b58957e31d2991fb6a609abecbb1987b3b' into froyo-plus-aosp

* commit '3c78a1b58957e31d2991fb6a609abecbb1987b3b':
  Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.
 2010-05-13 11:16:43 -07:00
Jean-Baptiste Queru
4232019338 Merge "Preserve '+' in phone numbers imported from SIM." 2010-05-13 11:06:28 -07:00
The Android Open Source Project
e154bdd19d merge from open-source master 
Change-Id: I51b4eccfde8e74c69ab8e0c051bb8ea718ee7101
 2010-05-13 09:04:45 -07:00
Costin Manolache
58ed31eafe am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" into froyo 
Merge commit '8ea9f130d24a7dd1e505ba0cf437bdd8a660975e' into froyo-plus-aosp

* commit '8ea9f130d24a7dd1e505ba0cf437bdd8a660975e':
  Bug 2680071: Rename the Cloud to Device
 2010-05-12 19:06:39 -07:00
Costin Manolache
c7e64a8e4b Merge "Bug 2680071: Rename the Cloud to Device" into froyo 2010-05-12 19:04:27 -07:00
Costin Manolache
b4490ffd58 Bug 2680071: Rename the Cloud to Device 
Change-Id: I12ab32de393e44a499e3f9e3a0b38f4682156ff5
 2010-05-12 16:16:34 -07:00
Scott Main
a4d5d705ae am 38b523af: Merge "docs: add missing path-permissions document" into froyo 
Merge commit '38b523af5c233dd5f8631ada2cd80b2d75b0efde' into froyo-plus-aosp

* commit '38b523af5c233dd5f8631ada2cd80b2d75b0efde':
  docs: add missing path-permissions document
 2010-05-12 15:33:38 -07:00
Scott Main
d9cb81c4d1 am f0e4ae56: Merge "docs: fix broken links" into froyo 
Merge commit 'f0e4ae563228db584041d517672aeadacecba61f' into froyo-plus-aosp

* commit 'f0e4ae563228db584041d517672aeadacecba61f':
  docs: fix broken links
 2010-05-12 15:33:35 -07:00
Grace Kloba
7f2992db53 am 336d7dcb: The default AlertDialog allows cancel. But the default JSConfim doesn\'t have a cancel listener. So when user cancel the dialog, we do not wake up the WebCoreThread. The same code is already done for JSPrompt dialog correctly. 
Merge commit '336d7dcb105a43ee4de51fd0f26f277c63662f02' into froyo-plus-aosp

* commit '336d7dcb105a43ee4de51fd0f26f277c63662f02':
  The default AlertDialog allows cancel. But the default
 2010-05-12 15:33:30 -07:00
Scott Main
7a789c8b1a Merge "docs: add missing path-permissions document" into froyo 2010-05-12 15:01:31 -07:00
The Android Open Source Project
7b880ae492 merge from open-source master 
Change-Id: Ifb008642faddf6b83769cdaa5bd67d21591b9eaa
 2010-05-12 14:54:38 -07:00
Scott Main
003f8c3ea6 Merge "docs: fix broken links" into froyo 2010-05-12 14:53:35 -07:00
The Android Open Source Project
e0281b61c7 merge from open-source master 
Change-Id: If6730b50627b2231bd345e594d8d30a37557849e
 2010-05-12 14:53:25 -07:00
The Android Open Source Project
327e55780f merge from open-source master 
Change-Id: Ib092e6ae5151bbcdf56b9b3a7adbaee7bb5df8b5
 2010-05-12 14:39:38 -07:00
The Android Open Source Project
56151325d0 merge from open-source master 
Change-Id: Ib5ea9745c2b652d64646e3e28c12e63815321ff9
 2010-05-12 14:10:23 -07:00
The Android Open Source Project
049570cbb1 merge from open-source master 
Change-Id: I24ecfac151c0ddc27237d711c95b8fe488d7931b
 2010-05-12 12:33:35 -07:00
The Android Open Source Project
c77a20a9d6 merge from open-source master 
Change-Id: I022d0781a232396e2b8a67a420ecf50e64b87d8c
 2010-05-12 11:58:14 -07:00
Dirk Dougherty
cd406480fa am a04202b3: Merge "Doc change: remove Google I/O 09 from carousel." into froyo 
Merge commit 'a04202b3258845688bcd8c6208222235569df733' into froyo-plus-aosp

* commit 'a04202b3258845688bcd8c6208222235569df733':
  Doc change: remove Google I/O 09 from carousel.
 2010-05-12 11:08:46 -07:00
Dirk Dougherty
5d8d9f1ff1 Merge "Doc change: remove Google I/O 09 from carousel." into froyo 2010-05-12 11:05:03 -07:00
Scott Main
af0ff93c4c am 18dc51d4: Merge "docs: fix broken anchor names" into froyo 
Merge commit '18dc51d4137c5cf8364541e25ad9ded203342c6b' into froyo-plus-aosp

* commit '18dc51d4137c5cf8364541e25ad9ded203342c6b':
  docs: fix broken anchor names
 2010-05-12 07:50:59 -07:00
Dirk Dougherty
d3f9cedda4 am 0d1b0814: Doc change: updates for new tools, platform, adt versions. Misc other fixes updates in doc files. 
Merge commit '0d1b0814be24f501395bf175fba8691117f782d5' into froyo-plus-aosp

* commit '0d1b0814be24f501395bf175fba8691117f782d5':
  Doc change: updates for new tools, platform, adt versions. Misc other fixes updates in doc files.
 2010-05-12 07:50:57 -07:00
Dirk Dougherty
977359ce04 am 4d5275e7: Merge "Doc change: update diff report 7-> 8" into froyo 
Merge commit '4d5275e723221df67aad00a440dd6a2e9a22caae' into froyo-plus-aosp

* commit '4d5275e723221df67aad00a440dd6a2e9a22caae':
  Doc change: update diff report 7-> 8
 2010-05-12 07:50:53 -07:00
Scott Main
755d956245 am 827a50dd: Merge "docs: remove the dashboard from the sidenav for the offline docs" into froyo 
Merge commit '827a50dda4c1900ab5333f8c2d3705796ff4649d' into froyo-plus-aosp

* commit '827a50dda4c1900ab5333f8c2d3705796ff4649d':
  docs: remove the dashboard from the sidenav for the offline docs
 2010-05-12 07:50:48 -07:00
Brett Chabot
4048d08b82 am b4c9a8f6: Merge "Fix imf tests." into froyo 
Merge commit 'b4c9a8f664f1dd57644e6d6cf2723eff9a505072' into froyo-plus-aosp

* commit 'b4c9a8f664f1dd57644e6d6cf2723eff9a505072':
  Fix imf tests.
 2010-05-12 07:50:44 -07:00
Scott Main
ad80451b91 am bb129dc5: docs: make Notifying the User an expandable list 
Merge commit 'bb129dc57b4a5be24ab7c5e436fa591f61e28d3d' into froyo-plus-aosp

* commit 'bb129dc57b4a5be24ab7c5e436fa591f61e28d3d':
  docs: make Notifying the User an expandable list
 2010-05-12 07:50:41 -07:00
Scott Main
fc6fc77805 am a225e3b1: docs: add quickview box with "see also" links for some articles 
Merge commit 'a225e3b1cd02da0f748f1a8e7341c727eff28085' into froyo-plus-aosp

* commit 'a225e3b1cd02da0f748f1a8e7341c727eff28085':
  docs: add quickview box with "see also" links for some articles
 2010-05-12 07:50:36 -07:00
Scott Main
4c628a4331 am 6bc3304b: Merge "docs: remove allowBackup attribute from documentation" into froyo 
Merge commit '6bc3304b74ba41bf9fd132d48c7bb764d631d3fa' into froyo-plus-aosp

* commit '6bc3304b74ba41bf9fd132d48c7bb764d631d3fa':
  docs: remove allowBackup attribute from documentation
 2010-05-12 07:50:30 -07:00
Xavier Ducrohet
d6dc7432e1 am b1235a57: Merge "Hide two audio focus methods." into froyo 
Merge commit 'b1235a57a09174179553acecef2370354bdcbf41' into froyo-plus-aosp

* commit 'b1235a57a09174179553acecef2370354bdcbf41':
  Hide two audio focus methods.
 2010-05-12 07:50:19 -07:00