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

15224 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vasu Nori
4196629d75 Merge "bug:2622719 move 'forcing of cursor execution' to ContentProvider" into froyo 2010-04-28 15:35:57 -07:00
Amith Yamasani
3e7271634a am 087b25f7: am 6e4895b6: Merge "Make timezone changes apply to status bar time in 24hr mode. Bug: 2632681" into froyo 
Merge commit '087b25f7e2669497cf217d873437e8726c139abd' into kraken

* commit '087b25f7e2669497cf217d873437e8726c139abd':
  Make timezone changes apply to status bar time in 24hr mode. Bug: 2632681
 2010-04-28 15:25:05 -07:00
Amith Yamasani
08464b5b36 am 6e4895b6: Merge "Make timezone changes apply to status bar time in 24hr mode. Bug: 2632681" into froyo 
Merge commit '6e4895b63aa64a8df64dd69c49a414b7566932d3' into froyo-plus-aosp

* commit '6e4895b63aa64a8df64dd69c49a414b7566932d3':
  Make timezone changes apply to status bar time in 24hr mode. Bug: 2632681
 2010-04-28 15:21:37 -07:00
Amith Yamasani
2bbb1cce02 Merge "Make timezone changes apply to status bar time in 24hr mode. Bug: 2632681" into froyo 2010-04-28 15:18:15 -07:00
Fred Quintana
93d41f38bb am 00b92b94: am 9aaf24f2: Merge "revert a change in the SyncManager that caused it to not cancel long running syncs if the next sync had the same account and authority." into froyo 
Merge commit '00b92b943ff397cb7f7c4827a0eea9df7aa22071' into kraken

* commit '00b92b943ff397cb7f7c4827a0eea9df7aa22071':
  revert a change in the SyncManager that caused it to not cancel
 2010-04-28 14:18:19 -07:00
Fred Quintana
e47930cd65 am 9aaf24f2: Merge "revert a change in the SyncManager that caused it to not cancel long running syncs if the next sync had the same account and authority." into froyo 
Merge commit '9aaf24f2a46eacd1e342f8c0300c3093646e2814' into froyo-plus-aosp

* commit '9aaf24f2a46eacd1e342f8c0300c3093646e2814':
  revert a change in the SyncManager that caused it to not cancel
 2010-04-28 14:13:55 -07:00
Fred Quintana
23894ce086 Merge "revert a change in the SyncManager that caused it to not cancel long running syncs if the next sync had the same account and authority." into froyo 2010-04-28 14:10:05 -07:00
Dianne Hackborn
93120c58c4 am 725f731c: am bc5a0328: Merge "Fix issue #2569139: Sapphire user cannot login to last.fm..." into froyo 
Merge commit '725f731cb9368f52a0c6664d2961ef4340c8f7a0' into kraken

* commit '725f731cb9368f52a0c6664d2961ef4340c8f7a0':
  Fix issue #2569139: Sapphire user cannot login to last.fm...
 2010-04-28 13:19:25 -07:00
Dianne Hackborn
240d6d2042 am bc5a0328: Merge "Fix issue #2569139: Sapphire user cannot login to last.fm..." into froyo 
Merge commit 'bc5a03286a72dc3627cee313d473178f5a123049' into froyo-plus-aosp

* commit 'bc5a03286a72dc3627cee313d473178f5a123049':
  Fix issue #2569139: Sapphire user cannot login to last.fm...
 2010-04-28 13:14:43 -07:00
Dianne Hackborn
6f34aa18b7 Merge "Fix issue #2569139: Sapphire user cannot login to last.fm..." into froyo 2010-04-28 12:42:00 -07:00
James Dong
3204749935 Merge "Use timestamp from camera driver for CameraSource" into kraken 2010-04-28 12:03:55 -07:00
James Dong
f06bb989d6 Use timestamp from camera driver for CameraSource 
Change-Id: I09ddec69997c43b8f17fdd21304c76cb4c5ab8cf
 2010-04-28 11:55:47 -07:00
Kenny Root
fa8e0c18a8 am 9fe55514: am 4bba2149: Merge "Import revised translations" into froyo 
Merge commit '9fe55514524993936eafe9e77e3dd98ba17a78b6' into kraken

* commit '9fe55514524993936eafe9e77e3dd98ba17a78b6':
  Import revised translations
 2010-04-28 09:47:27 -07:00
Scott Main
48cebd44c4 am ca54674c: am eaa801e2: Merge "docs: update information about developing on a device. Remove details about ADP1 and revise intro. Add links to the device doc from installing guides. Revise the procedures for Running Your Application in both the Eclipse and Other IDE 
Merge commit 'ca54674c656b5cf66cfeda42ef7a640971618f2a' into kraken

* commit 'ca54674c656b5cf66cfeda42ef7a640971618f2a':
  docs: update information about developing on a device.
 2010-04-28 09:47:19 -07:00
Kenny Root
8345be2b2d am 4bba2149: Merge "Import revised translations" into froyo 
Merge commit '4bba2149f3f2709b24dc40118461c5d683ed6965' into froyo-plus-aosp

* commit '4bba2149f3f2709b24dc40118461c5d683ed6965':
  Import revised translations
 2010-04-28 09:32:55 -07:00
Scott Main
4e6c55e259 am eaa801e2: Merge "docs: update information about developing on a device. Remove details about ADP1 and revise intro. Add links to the device doc from installing guides. Revise the procedures for Running Your Application in both the Eclipse and Other IDE guides to sp 
Merge commit 'eaa801e22abb3ea952ecd70ed7d0a876a1e2e3c9' into froyo-plus-aosp

* commit 'eaa801e22abb3ea952ecd70ed7d0a876a1e2e3c9':
  docs: update information about developing on a device.
 2010-04-28 09:31:28 -07:00
Kenny Root
10159e9986 Merge "Import revised translations" into froyo 2010-04-28 08:05:03 -07:00
Scott Main
1ffd118cab Merge "docs: update information about developing on a device. Remove details about ADP1 and revise intro. Add links to the device doc from installing guides. Revise the procedures for Running Your Application in both the Eclipse and Other IDE guides to specifically describe using a device and make both docs more consistent with each other." into froyo 2010-04-27 18:35:53 -07:00
Vasu Nori
2267e70cb3 am 785c8983: am 996960de: Merge "remove myname accidentally included in one of the files" into froyo 
Merge commit '785c89835741ca735fbb766bc2e1aeb68a4d5169' into kraken

* commit '785c89835741ca735fbb766bc2e1aeb68a4d5169':
  remove myname accidentally included in one of the files
 2010-04-27 16:53:16 -07:00
Vasu Nori
dff737bf08 am 996960de: Merge "remove myname accidentally included in one of the files" into froyo 
Merge commit '996960dea8ae0c2c5668e1051c5a9c5a4fb4d888' into froyo-plus-aosp

* commit '996960dea8ae0c2c5668e1051c5a9c5a4fb4d888':
  remove myname accidentally included in one of the files
 2010-04-27 16:49:29 -07:00
Dianne Hackborn
0e9659ab93 am 048b40eb: am e367896e: Merge "Fix issue #2594388: WallpaperService doesn\'t always call onSurfaceDestroyed()" into froyo 
Merge commit '048b40ebdc980906193cfcb66274e2a1f3ec6093' into kraken

* commit '048b40ebdc980906193cfcb66274e2a1f3ec6093':
  Fix issue #2594388: WallpaperService doesn't always call onSurfaceDestroyed()
 2010-04-27 16:45:19 -07:00
Vasu Nori
321e49b260 Merge "remove myname accidentally included in one of the files" into froyo 2010-04-27 16:44:58 -07:00
Dianne Hackborn
f3a7bca481 am e367896e: Merge "Fix issue #2594388: WallpaperService doesn\'t always call onSurfaceDestroyed()" into froyo 
Merge commit 'e367896e91a0d75250f00f2de3929495595719d4' into froyo-plus-aosp

* commit 'e367896e91a0d75250f00f2de3929495595719d4':
  Fix issue #2594388: WallpaperService doesn't always call onSurfaceDestroyed()
 2010-04-27 16:42:42 -07:00
Dianne Hackborn
779ed61c05 Merge "Fix issue #2594388: WallpaperService doesn't always call onSurfaceDestroyed()" into froyo 2010-04-27 16:39:44 -07:00
Shimeng (Simon) Wang
c0c787a397 am 447beb52: am 05fd7e7d: Add good international characters to the path part of Url pattern. 
Merge commit '447beb52be8f97154db2273b4130fd83bf34d840' into kraken

* commit '447beb52be8f97154db2273b4130fd83bf34d840':
  Add good international characters to the path part of Url pattern.
 2010-04-27 12:37:41 -07:00
Shimeng (Simon) Wang
e509aa54e4 am 05fd7e7d: Add good international characters to the path part of Url pattern. 
Merge commit '05fd7e7d328261260a348c0b6ba840bc1f60cb14' into froyo-plus-aosp

* commit '05fd7e7d328261260a348c0b6ba840bc1f60cb14':
  Add good international characters to the path part of Url pattern.
 2010-04-27 12:34:03 -07:00
Adam Powell
c1fd9fd97f am b40cfc16: am 2ea21a84: Merge "Fix a WebView scrolling regression - bug 2633572." into froyo 
Merge commit 'b40cfc162fc473aece63f449eaa1dd643d24b9c0' into kraken

* commit 'b40cfc162fc473aece63f449eaa1dd643d24b9c0':
  Fix a WebView scrolling regression - bug 2633572.
 2010-04-27 12:11:04 -07:00
Adam Powell
212fc1bfea am 2ea21a84: Merge "Fix a WebView scrolling regression - bug 2633572." into froyo 
Merge commit '2ea21a84ef81849153f30bbea213acd5be110c08' into froyo-plus-aosp

* commit '2ea21a84ef81849153f30bbea213acd5be110c08':
  Fix a WebView scrolling regression - bug 2633572.
 2010-04-27 12:08:01 -07:00
Adam Powell
8e33f1b115 Merge "Fix a WebView scrolling regression - bug 2633572." into froyo 2010-04-27 12:05:40 -07:00
Fred Quintana
cefcae7275 am b2dbae87: am 6ce78924: Merge "Add JavaDoc for SyncResult http://b/2420252" into froyo 
Merge commit 'b2dbae879d32ce654528ab550c0dd017b67d7b08' into kraken

* commit 'b2dbae879d32ce654528ab550c0dd017b67d7b08':
  Add JavaDoc for SyncResult
 2010-04-27 12:02:32 -07:00
Fred Quintana
3ce307f151 am 6ce78924: Merge "Add JavaDoc for SyncResult http://b/2420252" into froyo 
Merge commit '6ce78924ebd179611c71122b864807dc4525f593' into froyo-plus-aosp

* commit '6ce78924ebd179611c71122b864807dc4525f593':
  Add JavaDoc for SyncResult
 2010-04-27 11:59:12 -07:00
Fred Quintana
e8bc3ee3a1 Merge "Add JavaDoc for SyncResult http://b/2420252" into froyo 2010-04-27 11:56:16 -07:00
San Mehat
e050f4ef6d am bd535646: am 57fff78a: dumpstate: Add blocked process wait-channel info to bugreport 
Merge commit 'bd5356468a5e6823fe4dce040ee75fbef66488dc' into kraken

* commit 'bd5356468a5e6823fe4dce040ee75fbef66488dc':
  dumpstate: Add blocked process wait-channel info to bugreport
 2010-04-27 11:21:17 -07:00
Dianne Hackborn
d369cc7466 am 44f2c6ba: am 2e4b98dc: Merge "Whoops a little more on issue #2631417: Expose FLAG_EXTERNAL_STORAGE" into froyo 
Merge commit '44f2c6baa68e02f7837cd1ca285d5c4f0f871b18' into kraken

* commit '44f2c6baa68e02f7837cd1ca285d5c4f0f871b18':
  Whoops a little more on issue #2631417: Expose FLAG_EXTERNAL_STORAGE
 2010-04-27 11:18:24 -07:00
Jean-Michel Trivi
50b93a33f1 am 8f36a744: am cd24dae9: Merge "Fix bug 2605504 Don\'t leak a metric ton of NotificationPlayer threads The Looper on the thread created in order to be notified of the playback completion of notification sounds, was never stopped, causing the threads to stay around in 
Merge commit '8f36a744bc8933396f237fbda8f21c31ed41d504' into kraken

* commit '8f36a744bc8933396f237fbda8f21c31ed41d504':
  Fix bug 2605504 Don't leak a metric ton of NotificationPlayer threads
 2010-04-27 11:17:59 -07:00
San Mehat
85e0ae7216 am 57fff78a: dumpstate: Add blocked process wait-channel info to bugreport 
Merge commit '57fff78a70c82ca09beb91c4f92d97b6f0b897e4' into froyo-plus-aosp

* commit '57fff78a70c82ca09beb91c4f92d97b6f0b897e4':
  dumpstate: Add blocked process wait-channel info to bugreport
 2010-04-27 11:13:56 -07:00
Dianne Hackborn
50352926c2 resolved conflicts for merge of 5a8f877c to kraken 
Change-Id: I3e320cfe9fcafe4f49e1863eaeddac96bc3f72c6
 2010-04-27 11:06:43 -07:00
Dianne Hackborn
23ee1cfec4 am 2e4b98dc: Merge "Whoops a little more on issue #2631417: Expose FLAG_EXTERNAL_STORAGE" into froyo 
Merge commit '2e4b98dcd88f14fdb35e46236ec916493c570f28' into froyo-plus-aosp

* commit '2e4b98dcd88f14fdb35e46236ec916493c570f28':
  Whoops a little more on issue #2631417: Expose FLAG_EXTERNAL_STORAGE
 2010-04-26 18:54:06 -07:00
Dianne Hackborn
818d04abb4 Merge "Whoops a little more on issue #2631417: Expose FLAG_EXTERNAL_STORAGE" into froyo 2010-04-26 18:51:31 -07:00
Jean-Michel Trivi
739c26b4d4 am cd24dae9: Merge "Fix bug 2605504 Don\'t leak a metric ton of NotificationPlayer threads The Looper on the thread created in order to be notified of the playback completion of notification sounds, was never stopped, causing the threads to stay around in wait state. T 
Merge commit 'cd24dae9ca6550b24333f889935e1de068759ce5' into froyo-plus-aosp

* commit 'cd24dae9ca6550b24333f889935e1de068759ce5':
  Fix bug 2605504 Don't leak a metric ton of NotificationPlayer threads
 2010-04-26 18:05:28 -07:00
Jean-Michel Trivi
91e964265e Merge "Fix bug 2605504 Don't leak a metric ton of NotificationPlayer threads The Looper on the thread created in order to be notified of the playback completion of notification sounds, was never stopped, causing the threads to stay around in wait state. The fix consists in quitting the Looper used for the previous sound when a new sound is started." into froyo 2010-04-26 18:02:35 -07:00
Dianne Hackborn
a30123986d am 3202d380: Fix issue #2631417: Expose FLAG_EXTERNAL_STORAGE 
Merge commit '3202d380226043fa665df3c92252f791f8c52d55' into froyo-plus-aosp

* commit '3202d380226043fa665df3c92252f791f8c52d55':
  Fix issue #2631417: Expose FLAG_EXTERNAL_STORAGE
 2010-04-26 18:00:08 -07:00
Marco Nelissen
c4e2c6ecdb resolved conflicts for merge of 86303198 to kraken 
Change-Id: Idd921c7108e4c2cd4a861ee1fb8b43e5d56f8f2f
 2010-04-26 17:42:07 -07:00
Marco Nelissen
91db1ada52 am 8138cb49: Make Surface.toString() show more useful info to help debug bug 2594388. 
Merge commit '8138cb49e47f9a9905a316a217757710185c66aa' into froyo-plus-aosp

* commit '8138cb49e47f9a9905a316a217757710185c66aa':
  Make Surface.toString() show more useful info to help debug bug 2594388.
 2010-04-26 17:19:58 -07:00
Robert Greenwalt
349397e744 am b3444560: am 27fba679: Fix Throttle reset. 
Merge commit 'b344456083a4fa3911ebf58c73f022827cc073eb' into kraken

* commit 'b344456083a4fa3911ebf58c73f022827cc073eb':
  Fix Throttle reset.
 2010-04-26 15:47:28 -07:00
Robert Greenwalt
573828c96f am 27fba679: Fix Throttle reset. 
Merge commit '27fba6797b07583ef6c280bc287bf327e47f5e66' into froyo-plus-aosp

* commit '27fba6797b07583ef6c280bc287bf327e47f5e66':
  Fix Throttle reset.
 2010-04-26 15:43:27 -07:00
Mathias Agopian
c34c748ffd Merge "fix [2615973] ViewRoot locks the Surface even when the dirty region is empty" into kraken 2010-04-26 15:14:16 -07:00
Robert Greenwalt
4e6a058447 am 0ff9212d: am 19681af4: Merge "Handle throttling being disabled via policy change" into froyo 
Merge commit '0ff9212d077e77f8b3e0afa232293306c0f72d07' into kraken

* commit '0ff9212d077e77f8b3e0afa232293306c0f72d07':
  Handle throttling being disabled via policy change
 2010-04-26 11:22:54 -07:00
Robert Greenwalt
0e44489d1f am 19681af4: Merge "Handle throttling being disabled via policy change" into froyo 
Merge commit '19681af44b7c7494ae8de28dab8aacc3e9d92390' into froyo-plus-aosp

* commit '19681af44b7c7494ae8de28dab8aacc3e9d92390':
  Handle throttling being disabled via policy change
 2010-04-26 11:18:45 -07:00
Robert Greenwalt
5b1336d1a3 Merge "Handle throttling being disabled via policy change" into froyo 2010-04-26 11:13:11 -07:00