ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
13,942 Commits 2 Branches 0 Tags 54 MiB
4672704eaa
Commit Graph

13942 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fred Quintana
fd9a81ba8f am 77c560f3: - changed periodic sync scheduling to just creating pending and changed the "get next operation to sync" logic just look at pending syncs, rather than them and periodic syncs - made syncoperation dup-detection ignore the initialization sync extra - 
Merge commit '77c560f3d7891d9ae1ad714b5f65a22ff4f4c06b' into froyo-plus-aosp

* commit '77c560f3d7891d9ae1ad714b5f65a22ff4f4c06b':
  - changed periodic sync scheduling to just creating pending
 2010-03-30 18:38:46 -07:00
Fred Quintana
63618db61f am 23243aca: missing current.xml change 
Merge commit '23243acabdf8ff6022395cf67632c8387d286989' into froyo-plus-aosp

* commit '23243acabdf8ff6022395cf67632c8387d286989':
  missing current.xml change
 2010-03-30 18:24:19 -07:00
Fred Quintana
73fbf6703c am d5e4fdc8: some changes due to an API review - make EntityIterator extend Iterator and thus not throw a RemoteException, instead converting it into a RuntimeException. - rename ActiveSyncInfo to SyncInfo - change getActiveSync to getCurrentSync - remove the a 
Merge commit 'd5e4fdc8a4743abc0d9fe3cb952a78f9ad078c6b' into froyo-plus-aosp

* commit 'd5e4fdc8a4743abc0d9fe3cb952a78f9ad078c6b':
  some changes due to an API review
 2010-03-30 18:24:15 -07:00
Mike Lockwood
8bbc1b619b am 8acdb911: Merge "Add support for GPS privacy lock. DO NOT MERGE" into froyo 
Merge commit '8acdb911f4b9c38d1cafd3ab464d6bec54564c84' into froyo-plus-aosp

* commit '8acdb911f4b9c38d1cafd3ab464d6bec54564c84':
  Add support for GPS privacy lock.  DO NOT MERGE
 2010-03-30 17:32:24 -07:00
Mike Lockwood
964d29a953 Merge "Add support for GPS privacy lock. DO NOT MERGE" into froyo 2010-03-30 17:29:41 -07:00
Daniel Lehmann
9aad16d6e5 am 58c9a4bc: Merge "Don\'t load photo if it\'s id is 0. Saves one database query Bug:2546767" into froyo 
Merge commit '58c9a4bca0ce20ebf63a8c9619d405b788a98b9b' into froyo-plus-aosp

* commit '58c9a4bca0ce20ebf63a8c9619d405b788a98b9b':
  Don't load photo if it's id is 0. Saves one database query
 2010-03-30 17:01:45 -07:00
Daniel Lehmann
53108f3901 Merge "Don't load photo if it's id is 0. Saves one database query Bug:2546767" into froyo 2010-03-30 16:58:38 -07:00
Adam Powell
dfb864451e am 3ac51b3d: Merge "Fix bug 2523622 - ListView invokes onItemClick for disabled adapter items" into froyo 
Merge commit '3ac51b3d6f19ecfdfea9014a9a26e7ad8b4afa45' into froyo-plus-aosp

* commit '3ac51b3d6f19ecfdfea9014a9a26e7ad8b4afa45':
  Fix bug 2523622 - ListView invokes onItemClick for disabled adapter items
 2010-03-30 16:50:41 -07:00
Christopher Tate
a4a24e0bc2 am 27a63583: API CHANGE: @hide AbsoluteFileBackupHelper 
Merge commit '27a63583bfb8b4668911a819f3c7827ef0cc2ec8' into froyo-plus-aosp

* commit '27a63583bfb8b4668911a819f3c7827ef0cc2ec8':
  API CHANGE: @hide AbsoluteFileBackupHelper
 2010-03-30 16:50:36 -07:00
Adam Powell
07b8f00c47 Merge "Fix bug 2523622 - ListView invokes onItemClick for disabled adapter items" into froyo 2010-03-30 16:46:21 -07:00
Dianne Hackborn
e31835943b am 5cdd7858: Merge "Fix issue #2553553: API REVIEW: android.context.Context" into froyo 
Merge commit '5cdd78589db7f31c59df2e40146bd761a6570d13' into froyo-plus-aosp

* commit '5cdd78589db7f31c59df2e40146bd761a6570d13':
  Fix issue #2553553: API REVIEW: android.context.Context
 2010-03-30 16:00:41 -07:00
Dianne Hackborn
48bcc5aa85 Merge "Fix issue #2553553: API REVIEW: android.context.Context" into froyo 2010-03-30 15:55:37 -07:00
Andreas Huber
b2d203c43b am 99e330b5: Merge "Properly fill in the component name for the software decoders." into froyo 
Merge commit '99e330b5a64d8f982f2a3d97cee58cc20fc8cfdc' into froyo-plus-aosp

* commit '99e330b5a64d8f982f2a3d97cee58cc20fc8cfdc':
  Properly fill in the component name for the software decoders.
 2010-03-30 15:44:23 -07:00
Andreas Huber
f6517d2d75 Merge "Properly fill in the component name for the software decoders." into froyo 2010-03-30 15:40:38 -07:00
Amith Yamasani
27756e5d55 am 95a321fc: Merge "Fix for Never not existing in latest timeout values." into froyo 
Merge commit '95a321fcde17cbb79d89244eee3c1297c449b1a0' into froyo-plus-aosp

* commit '95a321fcde17cbb79d89244eee3c1297c449b1a0':
  Fix for Never not existing in latest timeout values.
 2010-03-30 15:24:51 -07:00
Amith Yamasani
75713ec76b Merge "Fix for Never not existing in latest timeout values." into froyo 2010-03-30 15:19:00 -07:00
Grace Kloba
cbf14323dd am eb643f26: Merge "Remove the shadow under url bar." into froyo 
Merge commit 'eb643f2685bd404ef5abb622123cea0aa17939d7' into froyo-plus-aosp

* commit 'eb643f2685bd404ef5abb622123cea0aa17939d7':
  Remove the shadow under url bar.
 2010-03-30 14:56:14 -07:00
Grace Kloba
3c21699f33 Merge "Remove the shadow under url bar." into froyo 2010-03-30 14:51:48 -07:00
David Turner
ecf9b68112 Merge "gl_code : add end of line." 2010-03-30 14:50:44 -07:00
Irfan Sheriff
41093e83eb am 59610c04: cherry-pick d4f3958bde05d04f97e0a4054d2a6185989d99f3 into Froyo 
Merge commit '59610c041a9cdd45e1040a7a4592af42f49d7a5d' into froyo-plus-aosp

* commit '59610c041a9cdd45e1040a7a4592af42f49d7a5d':
  cherry-pick d4f3958bde05d04f97e0a4054d2a6185989d99f3 into Froyo
 2010-03-30 13:51:46 -07:00
Dianne Hackborn
db0ee987d5 am de2722af: Merge "Package manager optimizations." into froyo 
Merge commit 'de2722af35d7bd0dc19478f6dbe8b0ff329b3fa8' into froyo-plus-aosp

* commit 'de2722af35d7bd0dc19478f6dbe8b0ff329b3fa8':
  Package manager optimizations.
 2010-03-30 13:40:24 -07:00
Dianne Hackborn
b89603e391 Merge "Package manager optimizations." into froyo 2010-03-30 13:35:33 -07:00
Andreas Huber
27c8839273 am 8899186b: Merge "Timeout on socket recv calls after 5secs, retry connection also if server unexpectedly closed the connection on its end and we know that there should\'ve been more data available." into froyo 
Merge commit '8899186b60bcbfa783217a0f773e4cd032911f3c' into froyo-plus-aosp

* commit '8899186b60bcbfa783217a0f773e4cd032911f3c':
  Timeout on socket recv calls after 5secs, retry connection also if server unexpectedly closed the connection on its end and we know that there should've been more data available.
 2010-03-30 13:34:39 -07:00
Andreas Huber
f734b65e83 Merge "Timeout on socket recv calls after 5secs, retry connection also if server unexpectedly closed the connection on its end and we know that there should've been more data available." into froyo 2010-03-30 13:31:57 -07:00
Christopher Tate
fb2dbb6c9a am 22375e4a: Merge "Make RestoreSession.getAvailableRestoreSets() asynchronous" into froyo 
Merge commit '22375e4a736c0d646c3cf0905c15126f7f4107c2' into froyo-plus-aosp

* commit '22375e4a736c0d646c3cf0905c15126f7f4107c2':
  Make RestoreSession.getAvailableRestoreSets() asynchronous
 2010-03-30 13:13:52 -07:00
Christopher Tate
8cb8614fdc Merge "Make RestoreSession.getAvailableRestoreSets() asynchronous" into froyo 2010-03-30 13:09:50 -07:00
Daniel Sandler
2b1545b216 am a7035909: Remove logspew. 
Merge commit 'a7035909453c9980a5f8547f5090c70c4281156c' into froyo-plus-aosp

* commit 'a7035909453c9980a5f8547f5090c70c4281156c':
  Remove logspew.
 2010-03-30 12:53:28 -07:00
Patrick Scott
2943c181a4 am ae405d56: Merge "Fix a simple logic mistake." into froyo 
Merge commit 'ae405d56215e4ab43e8210b66e741a0bf9d5edcf' into froyo-plus-aosp

* commit 'ae405d56215e4ab43e8210b66e741a0bf9d5edcf':
  Fix a simple logic mistake.
 2010-03-30 11:45:55 -07:00
Patrick Scott
85cf79e0df Merge "Fix a simple logic mistake." into froyo 2010-03-30 11:41:29 -07:00
Jean-Michel Trivi
ad136f611c am 2a5d9f9b: Fix bug 2553592 API REVIEW: android.speech Change 1 of 4 Notes from API Council review: Rename RecognitionManager to SpeechRecognizer 
Merge commit '2a5d9f9b577376768372837723f0f42098aba13b' into froyo-plus-aosp

* commit '2a5d9f9b577376768372837723f0f42098aba13b':
  Fix bug 2553592 API REVIEW: android.speech
 2010-03-30 11:20:32 -07:00
The Android Open Source Project
f282e93b43 merge from open-source master 
Change-Id: Iad50c5ab4915d0868b3f79ea6ba0d657a6f98525
 2010-03-30 11:13:47 -07:00
Romain Guy
dced134a0b Merge "Fix last character of password field being visible after rotation" 2010-03-30 10:54:40 -07:00
San Mehat
07cdc8a5d8 am d4610977: Merge "framework: Hide StorageManager for froyo - DO NOT MERGE" into froyo 
Merge commit 'd4610977d9217cbd70dd59f61914c74d1ca61036' into froyo-plus-aosp

* commit 'd4610977d9217cbd70dd59f61914c74d1ca61036':
  framework: Hide StorageManager for froyo - DO NOT MERGE
 2010-03-30 10:39:36 -07:00
San Mehat
e3b8bab8f7 Merge "framework: Hide StorageManager for froyo - DO NOT MERGE" into froyo 2010-03-30 10:35:44 -07:00
Jaikumar Ganesh
560bc8af03 am 0e090309: Relax the requirement of making a DBUS call for creating the Bluez Device. 
Merge commit '0e09030977aea8b40fd177139528d4b5637c9771' into froyo-plus-aosp

* commit '0e09030977aea8b40fd177139528d4b5637c9771':
  Relax the requirement of making a DBUS call for creating the Bluez Device.
 2010-03-30 10:30:48 -07:00
Kenny Root
1efb57f8cc am 7a17f0c0: Merge "Import revised translations" into froyo 
Merge commit '7a17f0c04e0d09d003e6842f9af1d7cd0efc198f' into froyo-plus-aosp

* commit '7a17f0c04e0d09d003e6842f9af1d7cd0efc198f':
  Import revised translations
 2010-03-30 09:27:15 -07:00
Kenny Root
857f556c02 Merge "Import revised translations" into froyo 2010-03-30 09:23:16 -07:00
Bjorn Bringert
0c75c21dc6 am fef8cebc: Clean up SearchableInfo API, JavaDoc and formatting 
Merge commit 'fef8cebcdcf0cbd4a0dafba87e33e3b500fb1321' into froyo-plus-aosp

* commit 'fef8cebcdcf0cbd4a0dafba87e33e3b500fb1321':
  Clean up SearchableInfo API, JavaDoc and formatting
 2010-03-30 03:59:36 -07:00
Dianne Hackborn
041c512c14 am e2522466: Fix issue #2547337: switching night modes 
Merge commit 'e2522466552f9c6b7fcea866709710f53aa1f2a8' into froyo-plus-aosp

* commit 'e2522466552f9c6b7fcea866709710f53aa1f2a8':
  Fix issue #2547337: switching night modes
 2010-03-29 21:19:39 -07:00
Dianne Hackborn
46f86aa4d5 am ad5499dd: Hopefully get rid of some ANRs. 
Merge commit 'ad5499dd204a1512471778462a805a288595f2f2' into froyo-plus-aosp

* commit 'ad5499dd204a1512471778462a805a288595f2f2':
  Hopefully get rid of some ANRs.
 2010-03-29 21:19:36 -07:00
Adam Powell
33e232955d am 9d32d24d: Remove overscrolling 
Merge commit '9d32d24dbd8a015c9d5c44ed4901d5a666eb8e7f' into froyo-plus-aosp

* commit '9d32d24dbd8a015c9d5c44ed4901d5a666eb8e7f':
  Remove overscrolling
 2010-03-29 21:02:47 -07:00
Oscar Montemayor
fe6015b4f6 am f5f30067: Merge "DO NOT MERGE Removing unused features from source tree. Please refer to Bug#2502219." into froyo 
Merge commit 'f5f300678abb79574bb56eee13c8dd2b7b98b740' into froyo-plus-aosp

* commit 'f5f300678abb79574bb56eee13c8dd2b7b98b740':
  DO NOT MERGE
 2010-03-29 19:01:16 -07:00
Oscar Montemayor
0e23025c0d Merge "DO NOT MERGE Removing unused features from source tree. Please refer to Bug#2502219." into froyo 2010-03-29 18:56:57 -07:00
Charles Chen
88cef743df am a599dafe: Merge "Fix for bug 2548048 - it was impossible for applications to discover if their TTS settings were being overridden by the user or not." into froyo 
Merge commit 'a599dafe4ffc3e6cc4953a7e3d33f4da80aabf45' into froyo-plus-aosp

* commit 'a599dafe4ffc3e6cc4953a7e3d33f4da80aabf45':
  Fix for bug 2548048 - it was impossible for applications to discover
 2010-03-29 18:41:48 -07:00
Charles Chen
a9bdac378b Merge "Fix for bug 2548048 - it was impossible for applications to discover if their TTS settings were being overridden by the user or not." into froyo 2010-03-29 18:37:41 -07:00
Amith Yamasani
2bfddb7f6f am 8c6af52f: Merge "Fix preloaded classes for API rename of BackupAgentHelper" into froyo 
Merge commit '8c6af52fdd572e19cd40a0be53615eb6c80ccde5' into froyo-plus-aosp

* commit '8c6af52fdd572e19cd40a0be53615eb6c80ccde5':
  Fix preloaded classes for API rename of BackupAgentHelper
 2010-03-29 18:28:14 -07:00
Amith Yamasani
c5363eb4ef Merge "Fix preloaded classes for API rename of BackupAgentHelper" into froyo 2010-03-29 18:24:59 -07:00
Oscar Montemayor
e0cec3cea1 DO NOT MERGE 
Removing unused features from source tree.
Please refer to Bug#2502219.

Change-Id: I879c29bfd5ffe933f64bb1082aaae7c956450a5a
 2010-03-29 18:12:24 -07:00
Joe Onorato
90137726d3 am 59fc58dc: fix the build 
Merge commit '59fc58dc3f164e33a96aee09505fac5818747cb6' into froyo-plus-aosp

* commit '59fc58dc3f164e33a96aee09505fac5818747cb6':
  fix the build
 2010-03-29 18:10:09 -07:00
Romain Guy
bf63f52f42 am 691b806f: Merge "Fix possible security issue. Bug #2553187" into froyo 
Merge commit '691b806ff8b4a6428588e8495cb1a5819a0aee99' into froyo-plus-aosp

* commit '691b806ff8b4a6428588e8495cb1a5819a0aee99':
  Fix possible security issue.
 2010-03-29 16:34:46 -07:00