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

14363 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Dianne Hackborn
cd4d3b6287 Merge "Fix issue #2676378: Activity Manager Crash on FRF40" into froyo 2010-05-11 14:26:43 -07:00
Dirk Dougherty
0feef91d2b Merge "Doc Change: Docs for NDK r4." into froyo 2010-05-11 14:20:24 -07:00
Scott Main
2577b83dfe Merge "docs: announce froyo and update IO message" into froyo 2010-05-11 14:04:49 -07:00
Mike Lockwood
c9797fed88 Merge "LocationManagerService: Call updateNetworkState on providers that are disabled." into froyo 2010-05-11 13:26:25 -07:00
Andreas Huber
c5417a7da5 Merge "Support for customizable socket-read timeouts through the HTTP response." into froyo 2010-05-11 12:21:14 -07:00
Andreas Huber
1722e37f40 Merge "Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)" into froyo 2010-05-11 12:20:55 -07:00
Costin Manolache
8e254d83ec Merge "Bug 2673557: rename datamessaging" into froyo 2010-05-11 11:42:58 -07:00
Jean-Michel Trivi
edd2838a25 Merge "Update javadoc in android.media.AudioManager to not hide the registerAudioFocusListener() methods." into froyo 2010-05-11 11:40:21 -07:00
Dirk Dougherty
6f29001ba5 Merge "Doc Change: cherry-pick from master. ->Testing Procedures documents testing_eclipse.html, testing_otheride." into froyo 2010-05-11 11:33:13 -07:00
Keith Ito
cf8fd0834e 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
bdb8e89e84 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
ead2a8ad7d 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
4d6b182101 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
3675b0e4b1 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
0528895b0d 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
Jean-Michel Trivi
d657af3915 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 listener to not be called, which with the AudioFocus logic causes the Music app to pause and never resume. The NotificationPlayer modifications cause the MediaPlayer for the notification to only request audio focus when the data source is not empty. The audio focus code in AudioService is defensively synchronized against a unique lock, and the exception observed in bug 2670395 is explicitely caught in case another edge case wasn't caught by this fix. The AudioFocus handling in AudioManager is modified so only the requestAudioFocus and abandonAudioFocus methods are meant to be used, as registerAudioFocusListener and unregisterAudioFocusListener provided no additional functionality over the request/abandon methods. abandonAudioFocus() also removes the listener from the map in AudioManager since after abandonning focus, the listener would no longer be called." into froyo 2010-05-11 09:42:41 -07:00
Keith Ito
735da3103b Merge "Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter" into froyo 2010-05-10 20:41:47 -07:00
Costin Manolache
7395cf239b Bug 2673557: rename datamessaging 
Change-Id: I583ac61c7b8fce69d60801dc76aeca9f13d250b2
 2010-05-10 19:12:49 -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
22cffae52d merge from open-source master 
Change-Id: Ia4cbea9d94b2ff34fc8ce97c1fe35ca5898d6c1c
 2010-05-10 13:48:37 -07:00
The Android Open Source Project
03ba157ee3 merge from open-source master 
Change-Id: Ic2b28b589d079cf3c9927ce9ad22bc5f9134e445
 2010-05-10 12:37:10 -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
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
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
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