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

14444 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Blank
83a1c18b92 am 794cd640: Merge "Expose _id in ExtendedProperties subValues" into froyo 
Merge commit '794cd640bfa8c6d82803b59bc18cbd73627a8162' into froyo-plus-aosp

* commit '794cd640bfa8c6d82803b59bc18cbd73627a8162':
  Expose _id in ExtendedProperties subValues
 2010-04-29 15:40:30 -07:00
Marc Blank
c8ba40f759 Merge "Expose _id in ExtendedProperties subValues" into froyo 2010-04-29 15:39:37 -07:00
Kenny Root
55c91f4369 am 77a1beb1: Merge "Import revised translations" into froyo 
Merge commit '77a1beb137948ad45423bb8fcd7e424e36144133' into froyo-plus-aosp

* commit '77a1beb137948ad45423bb8fcd7e424e36144133':
  Import revised translations
 2010-04-29 15:29:22 -07:00
Kenny Root
f45bffd15c Merge "Import revised translations" into froyo 2010-04-29 15:28:15 -07:00
Scott Main
eb912814d5 am 764caf24: Merge "docs: rewrite information about using shared preferences, internal and external storage (including new apis), and sqlite databases." into froyo 
Merge commit '764caf2481d935ce6870ec141f1e845178df8b47' into froyo-plus-aosp

* commit '764caf2481d935ce6870ec141f1e845178df8b47':
  docs: rewrite information about using shared preferences, internal and
 2010-04-29 15:23:32 -07:00
Scott Main
94921632d8 Merge "docs: rewrite information about using shared preferences, internal and external storage (including new apis), and sqlite databases." into froyo 2010-04-29 15:21:34 -07:00
Dianne Hackborn
08e115f8b8 am c956f375: Fix issue #2641875: Apps on sdcard not accesible after update 
Merge commit 'c956f37567593a71271bae107eafec47575f7dcc' into froyo-plus-aosp

* commit 'c956f37567593a71271bae107eafec47575f7dcc':
  Fix issue #2641875: Apps on sdcard not accesible after update
 2010-04-29 12:20:42 -07:00
Jean-Baptiste Queru
17aab035dd Merge "Fix an NPE in InputMethodService when mExtractAction is null." 2010-04-29 10:03:40 -07:00
Adam Powell
9ee392bf96 am b40c42f1: Fix bug 2639949 - Don\'t stop a Scroller early 
Merge commit 'b40c42f1ffa124cfbd5152007491c1d0b065592d' into froyo-plus-aosp

* commit 'b40c42f1ffa124cfbd5152007491c1d0b065592d':
  Fix bug 2639949 - Don't stop a Scroller early
 2010-04-28 19:34:49 -07:00
Steve Howard
76d91325dc am 81ac367b: Merge "Fix a minor bug in transitions to left-edge-up landscape." into froyo 
Merge commit '81ac367be66905a5b53b8e7e98160546802bd98b' into froyo-plus-aosp

* commit '81ac367be66905a5b53b8e7e98160546802bd98b':
  Fix a minor bug in transitions to left-edge-up landscape.
 2010-04-28 16:03:28 -07:00
Steve Howard
16e1998488 Merge "Fix a minor bug in transitions to left-edge-up landscape." into froyo 2010-04-28 15:59:39 -07:00
The Android Open Source Project
658e62322d merge from open-source master 
Change-Id: I20fa79289d84a892def9e7f6d6e7026d9de48010
 2010-04-28 15:50:56 -07:00
Vasu Nori
bd05a99fc7 am a07c4cbe: Merge "bug:2622719 move \'forcing of cursor execution\' to ContentProvider" into froyo 
Merge commit 'a07c4cbea9756236f0a28c4f0f7e1340bf3e2f06' into froyo-plus-aosp

* commit 'a07c4cbea9756236f0a28c4f0f7e1340bf3e2f06':
  bug:2622719  move 'forcing of cursor execution' to ContentProvider
 2010-04-28 15:38:44 -07:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
James Dong
2f191544a5 am 374aee68: Switch to use software MP3 decoder Hardware MP3 decoder could lead to hang in the Music application, although the chance is very low. 
Merge commit '374aee6888edddc5bcac9a644ad3de812404d3bc' into froyo-plus-aosp

* commit '374aee6888edddc5bcac9a644ad3de812404d3bc':
  Switch to use software MP3 decoder
 2010-04-26 11:05:19 -07:00
Bjorn Bringert
ab11b0e68c am cb4c894a: Merge "bugfix for: OOM error while doing voice search repeatedly" into froyo 
Merge commit 'cb4c894afa497943258cfb053ca35436f7b8e29a' into froyo-plus-aosp

* commit 'cb4c894afa497943258cfb053ca35436f7b8e29a':
  bugfix for: OOM error while doing voice search repeatedly
 2010-04-26 10:05:57 -07:00
Bjorn Bringert
89a7523222 Merge "bugfix for: OOM error while doing voice search repeatedly" into froyo 2010-04-26 07:52:58 -07:00
Grace Kloba
a62848ae0b am 87782f2b: Merge "Restrict the range request to the servers claiming that they accept ranges. This may be too restrict as the spec says the server MAY set this in the response header. But this is the last minute change made in https://android-git.corp.google.com/g/# 
Merge commit '87782f2bdfc679fd8f3c7ae7cd72bfd0e71efdc6' into froyo-plus-aosp

* commit '87782f2bdfc679fd8f3c7ae7cd72bfd0e71efdc6':
  Restrict the range request to the servers claiming
 2010-04-23 17:14:49 -07:00
Raphael
56c1e76d5e am 29355534: Fix aapt to build in Windows SDK under Linux 
Merge commit '29355534384ee24bfe9a3bc97d7664dbe478b4fb' into froyo-plus-aosp

* commit '29355534384ee24bfe9a3bc97d7664dbe478b4fb':
  Fix aapt to build in Windows SDK under Linux
 2010-04-23 17:14:21 -07:00
Grace Kloba
286778a9e5 am 85a8dcec: Merge "Only honor the scrollbar mode at the minimum zoom level. This reduced the impact of https://android-git.corp.google.com/g/#change,48683. In GB, we need to revisit this issue." into froyo 
Merge commit '85a8dcec5460edda72e9917d4f02ad1b6a133251' into froyo-plus-aosp

* commit '85a8dcec5460edda72e9917d4f02ad1b6a133251':
  Only honor the scrollbar mode at the minimum zoom
 2010-04-23 17:14:15 -07:00
Grace Kloba
f0d64eb1af Merge "Restrict the range request to the servers claiming that they accept ranges. This may be too restrict as the spec says the server MAY set this in the response header. But this is the last minute change made in https://android-git.corp.google.com/g/#change,49444 I think it is safer to be conservative." into froyo 2010-04-23 16:19:22 -07:00