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

13754 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fred Quintana
acc5dba1cc am 344ba661: 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 - 
Merge commit '344ba661ab406759a91ecaba1378a4907971b119' into kraken

* commit '344ba661ab406759a91ecaba1378a4907971b119':
  some changes due to an API review
 2010-03-30 18:29:25 -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
065aa8cded am 835f41da: (-s ours) am 8acdb911: Merge "Add support for GPS privacy lock. DO NOT MERGE" into froyo 
Merge commit '835f41da7581747b6a03227bcd1e073074ea9329' into kraken

* commit '835f41da7581747b6a03227bcd1e073074ea9329':
  Add support for GPS privacy lock.  DO NOT MERGE
 2010-03-30 17:35:18 -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
51387dbfc3 am 1b679754: am 58c9a4bc: Merge "Don\'t load photo if it\'s id is 0. Saves one database query Bug:2546767" into froyo 
Merge commit '1b679754b6f6fd5da8f5fc48415cad65cc8f3a56' into kraken

* commit '1b679754b6f6fd5da8f5fc48415cad65cc8f3a56':
  Don't load photo if it's id is 0. Saves one database query
 2010-03-30 17:05:42 -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
2829aa54c4 am 9ebc9f46: am 3ac51b3d: Merge "Fix bug 2523622 - ListView invokes onItemClick for disabled adapter items" into froyo 
Merge commit '9ebc9f464f45ec30003cd30854188a376c6d155f' into kraken

* commit '9ebc9f464f45ec30003cd30854188a376c6d155f':
  Fix bug 2523622 - ListView invokes onItemClick for disabled adapter items
 2010-03-30 16:54:43 -07:00
Christopher Tate
86701c3aad am 82a8b363: am 27a63583: API CHANGE: @hide AbsoluteFileBackupHelper 
Merge commit '82a8b3632c28d18d58a585160163fbf63d0c9746' into kraken

* commit '82a8b3632c28d18d58a585160163fbf63d0c9746':
  API CHANGE: @hide AbsoluteFileBackupHelper
 2010-03-30 16:54:39 -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
6c545b685e am 6d630607: am 5cdd7858: Merge "Fix issue #2553553: API REVIEW: android.context.Context" into froyo 
Merge commit '6d63060768f9d73c6062a2b603d3c51c7d5f0043' into kraken

* commit '6d63060768f9d73c6062a2b603d3c51c7d5f0043':
  Fix issue #2553553: API REVIEW: android.context.Context
 2010-03-30 16:05:05 -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
c0ffdb7762 am 9cfc52d9: am 99e330b5: Merge "Properly fill in the component name for the software decoders." into froyo 
Merge commit '9cfc52d9f99f61c573ad845529265d4fb7a5842c' into kraken

* commit '9cfc52d9f99f61c573ad845529265d4fb7a5842c':
  Properly fill in the component name for the software decoders.
 2010-03-30 15:49:38 -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
37523777ff am e1331779: am 95a321fc: Merge "Fix for Never not existing in latest timeout values." into froyo 
Merge commit 'e133177980b908d183ed8fe46cf3ea33405b8bd5' into kraken

* commit 'e133177980b908d183ed8fe46cf3ea33405b8bd5':
  Fix for Never not existing in latest timeout values.
 2010-03-30 15:27:35 -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
0604c62a01 am 19c1ea3b: am eb643f26: Merge "Remove the shadow under url bar." into froyo 
Merge commit '19c1ea3bd05de6f0221b7807053bf03c3cfaaec7' into kraken

* commit '19c1ea3bd05de6f0221b7807053bf03c3cfaaec7':
  Remove the shadow under url bar.
 2010-03-30 14:59:19 -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
Irfan Sheriff
e5c4da1b0c am 295eb97c: am 59610c04: cherry-pick d4f3958bde05d04f97e0a4054d2a6185989d99f3 into Froyo 
Merge commit '295eb97c7623105d6199fa91e58394e474a0abb1' into kraken

* commit '295eb97c7623105d6199fa91e58394e474a0abb1':
  cherry-pick d4f3958bde05d04f97e0a4054d2a6185989d99f3 into Froyo
 2010-03-30 13:55:21 -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
2d5d669e50 am ab86fc91: am de2722af: Merge "Package manager optimizations." into froyo 
Merge commit 'ab86fc91f5b54b8b730c0f594f04bbfb4c41697a' into kraken

* commit 'ab86fc91f5b54b8b730c0f594f04bbfb4c41697a':
  Package manager optimizations.
 2010-03-30 13:42:50 -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
Andreas Huber
98b06bda70 am 0bca99e9: 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 '0bca99e987420a63ebd509093cbde015399d8522' into kraken

* commit '0bca99e987420a63ebd509093cbde015399d8522':
  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:40:11 -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
ee3e8dcc71 am b3f7fe44: am 22375e4a: Merge "Make RestoreSession.getAvailableRestoreSets() asynchronous" into froyo 
Merge commit 'b3f7fe44f5a3a6a4c04d4102eb61f29edf83129c' into kraken

* commit 'b3f7fe44f5a3a6a4c04d4102eb61f29edf83129c':
  Make RestoreSession.getAvailableRestoreSets() asynchronous
 2010-03-30 13:17:23 -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
8853a82607 am 454a956b: am a7035909: Remove logspew. 
Merge commit '454a956b52884083e3436fe2ea7e478df2bcbeea' into kraken

* commit '454a956b52884083e3436fe2ea7e478df2bcbeea':
  Remove logspew.
 2010-03-30 12:56:36 -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
a3762b480d am 7fb1a891: am ae405d56: Merge "Fix a simple logic mistake." into froyo 
Merge commit '7fb1a89128a87c30441bc839c935f8e1fb993a26' into kraken

* commit '7fb1a89128a87c30441bc839c935f8e1fb993a26':
  Fix a simple logic mistake.
 2010-03-30 11:49:12 -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
a9765095bc am 38cb6197: am 2a5d9f9b: Fix bug 2553592 API REVIEW: android.speech Change 1 of 4 Notes from API Council review: Rename RecognitionManager to SpeechRecognizer 
Merge commit '38cb619770cf7b4207f464edc4839c79c03ad372' into kraken

* commit '38cb619770cf7b4207f464edc4839c79c03ad372':
  Fix bug 2553592 API REVIEW: android.speech
 2010-03-30 11:23:23 -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
San Mehat
6a0dedd7b2 am b07d6992: (-s ours) am d4610977: Merge "framework: Hide StorageManager for froyo - DO NOT MERGE" into froyo 
Merge commit 'b07d69920199817904ccb9056e3dd56cf736e438' into kraken

* commit 'b07d69920199817904ccb9056e3dd56cf736e438':
  framework: Hide StorageManager for froyo - DO NOT MERGE
 2010-03-30 10:46:23 -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
Jaikumar Ganesh
ca0b6cf8b5 am 77239140: am 0e090309: Relax the requirement of making a DBUS call for creating the Bluez Device. 
Merge commit '772391402f26f418eee70039e89c0b6a8a9d69eb' into kraken

* commit '772391402f26f418eee70039e89c0b6a8a9d69eb':
  Relax the requirement of making a DBUS call for creating the Bluez Device.
 2010-03-30 10:36:54 -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
6c78c69bf8 am 664c7adb: am 7a17f0c0: Merge "Import revised translations" into froyo 
Merge commit '664c7adb1847dd304f36239dc63b4986bf828dc1' into kraken

* commit '664c7adb1847dd304f36239dc63b4986bf828dc1':
  Import revised translations
 2010-03-30 09:38:14 -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