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

14507 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Marco Nelissen
21fdf08187 am 836b2d75: Merge "Don\'t clear the _data column in the audio_meta table, since it isn\'t needed, and causes a sqlite constraint exception. Bug 2671792." into froyo 
Merge commit '836b2d75ef86487ecae0ae834ecbab324fd99471' into froyo-plus-aosp

* commit '836b2d75ef86487ecae0ae834ecbab324fd99471':
  Don't clear the _data column in the audio_meta table, since it isn't
 2010-05-12 07:50:14 -07:00
Dianne Hackborn
3bf653e82a am 037cd341: Merge "Fix issue #2676378: Activity Manager Crash on FRF40" into froyo 
Merge commit '037cd3413a925c6f449050096a7cd4aab3207612' into froyo-plus-aosp

* commit '037cd3413a925c6f449050096a7cd4aab3207612':
  Fix issue #2676378: Activity Manager Crash on FRF40
 2010-05-12 07:50:09 -07:00
Scott Main
7ea9c96ed0 am 5cdf5fdc: docs: add document about app install location 
Merge commit '5cdf5fdcba846bd4659084f5f9e5a1e367dbea5d' into froyo-plus-aosp

* commit '5cdf5fdcba846bd4659084f5f9e5a1e367dbea5d':
  docs: add document about app install location
 2010-05-12 07:50:02 -07:00
Dirk Dougherty
0208978f3e am 8acb68e9: Merge "Doc Change: Docs for NDK r4." into froyo 
Merge commit '8acb68e9aae7f6766b88440ede6598da63db9fdd' into froyo-plus-aosp

* commit '8acb68e9aae7f6766b88440ede6598da63db9fdd':
  Doc Change: Docs for NDK r4.
 2010-05-12 07:49:57 -07:00
Scott Main
ee8cf6652a am c80b95a8: Merge "docs: announce froyo and update IO message" into froyo 
Merge commit 'c80b95a85ae31eba80870cb3416fd2c25821c056' into froyo-plus-aosp

* commit 'c80b95a85ae31eba80870cb3416fd2c25821c056':
  docs: announce froyo and update IO message
 2010-05-12 07:49:51 -07:00
Mike Lockwood
0904bbd87a am e1d7dca6: Merge "LocationManagerService: Call updateNetworkState on providers that are disabled." into froyo 
Merge commit 'e1d7dca608ced72c75bf906c7267a1ef30349826' into froyo-plus-aosp

* commit 'e1d7dca608ced72c75bf906c7267a1ef30349826':
  LocationManagerService: Call updateNetworkState on providers that are disabled.
 2010-05-12 07:49:45 -07:00
Andreas Huber
3469d55e9a am e0dc80f8: Merge "Support for customizable socket-read timeouts through the HTTP response." into froyo 
Merge commit 'e0dc80f878b56ed744bd06d341716fcfff4e3acc' into froyo-plus-aosp

* commit 'e0dc80f878b56ed744bd06d341716fcfff4e3acc':
  Support for customizable socket-read timeouts through the HTTP response.
 2010-05-12 07:49:39 -07:00
Andreas Huber
71661ed17f am d6ad7c85: Merge "Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)" into froyo 
Merge commit 'd6ad7c85faf55fa8d0459f0fbc4fa32abdfefb6e' into froyo-plus-aosp

* commit 'd6ad7c85faf55fa8d0459f0fbc4fa32abdfefb6e':
  Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)
 2010-05-12 07:49:31 -07:00
Costin Manolache
884e624b3a am e2055fe4: Merge "Bug 2673557: rename datamessaging" into froyo 
Merge commit 'e2055fe4258f8085a88328579c852ec26d77bb10' into froyo-plus-aosp

* commit 'e2055fe4258f8085a88328579c852ec26d77bb10':
  Bug 2673557: rename datamessaging
 2010-05-12 07:49:16 -07:00
Jean-Michel Trivi
e2eceb0ef4 am 3e90c76c: Merge "Update javadoc in android.media.AudioManager to not hide the registerAudioFocusListener() methods." into froyo 
Merge commit '3e90c76c12803cd1b116030fd124b7b870d25342' into froyo-plus-aosp

* commit '3e90c76c12803cd1b116030fd124b7b870d25342':
  Update javadoc in android.media.AudioManager to not hide the
 2010-05-12 07:49:10 -07:00
Dirk Dougherty
e0aa23a970 am fe089334: Merge "Doc Change: cherry-pick from master. ->Testing Procedures documents testing_eclipse.html, testing_otheride." into froyo 
Merge commit 'fe08933450f4be42c9b3eac900c64f23857ecd17' into froyo-plus-aosp

* commit 'fe08933450f4be42c9b3eac900c64f23857ecd17':
  Doc Change: cherry-pick from master. ->Testing Procedures documents testing_eclipse.html, testing_otheride.
 2010-05-12 07:49:00 -07:00
Jean-Michel Trivi
98dd1ec92c am aaa01b18: Merge " Fix bug 2670395 and 2599698 When the user selects a "Silent" notification sound, the Uri encoded path is an empty string. Setting this Uri as the data source of the MediaPlayer used to play notifications caused the completion listen 
Merge commit 'aaa01b181c0eea4ff6496d446e25e499b12ca14c' into froyo-plus-aosp

* commit 'aaa01b181c0eea4ff6496d446e25e499b12ca14c':
  Fix bug 2670395 and 2599698
 2010-05-12 07:48:50 -07:00
Wu-cheng Li
d76bfb35de 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
Scott Main
5f50306d26 Merge "docs: fix broken anchor names" into froyo 2010-05-11 20:13:26 -07:00
Dirk Dougherty
c42a5b0d6e Merge "Doc change: update diff report 7-> 8" into froyo 2010-05-11 19:53:04 -07:00
Scott Main
2a2c699ffa Merge "docs: remove the dashboard from the sidenav for the offline docs" into froyo 2010-05-11 19:25:19 -07:00
Brett Chabot
b7c34d1610 Merge "Fix imf tests." into froyo 2010-05-11 19:17:04 -07:00
Scott Main
6ff074cb78 Merge "docs: remove allowBackup attribute from documentation" into froyo 2010-05-11 15:25:38 -07:00
Xavier Ducrohet
4ef3c6a791 Merge "Hide two audio focus methods." into froyo 2010-05-11 14:48:48 -07:00
Marco Nelissen
ac1feedad2 Merge "Don't clear the _data column in the audio_meta table, since it isn't needed, and causes a sqlite constraint exception. Bug 2671792." into froyo 2010-05-11 14:36:16 -07:00