ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
32,809 Commits 2 Branches 0 Tags 54 MiB
30a1fafdd7
Commit Graph

32809 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Lockwood
30a1fafdd7 Merge "MountService: Fix running media scanner at boot." 2011-04-05 12:41:47 -07:00
Mike Lockwood
cd72877125 Merge "Fix deadlock in MountService" 2011-04-05 12:41:35 -07:00
Eric Laurent
3a35b53aaa Merge "New fix for issue 4111672: control block flags" 2011-04-05 12:23:28 -07:00
Adam Powell
b8d46ae37e am 2e68ec1b: am 2bb59637: am 030b38ff: Merge "Fix bug 4207704 - Gestures can be lost when Flash is enabled" into honeycomb-mr1 
* commit '2e68ec1bc6e9ab57cd884d32b08dbb389189e7a4':
  Fix bug 4207704 - Gestures can be lost when Flash is enabled
 2011-04-05 11:30:52 -07:00
Mike LeBeau
5c57302201 Merge "Support speech recognizer confidence values." 2011-04-05 11:27:55 -07:00
Adam Powell
9fd2edebe8 am 2bb59637: am 030b38ff: Merge "Fix bug 4207704 - Gestures can be lost when Flash is enabled" into honeycomb-mr1 
* commit '2bb59637caa71d7e05f7c94d3da425fbfd425ea7':
  Fix bug 4207704 - Gestures can be lost when Flash is enabled
 2011-04-05 11:27:23 -07:00
Eric Fischer
1fac50707f Merge "Import revised translations." 2011-04-05 11:18:57 -07:00
Adam Powell
7ce2ea95e9 am 030b38ff: Merge "Fix bug 4207704 - Gestures can be lost when Flash is enabled" into honeycomb-mr1 
* commit '030b38ffc21ef3962b31d5bac5170531293b6046':
  Fix bug 4207704 - Gestures can be lost when Flash is enabled
 2011-04-05 11:14:27 -07:00
Adam Powell
78b135de42 Merge "Fix bug 4207704 - Gestures can be lost when Flash is enabled" into honeycomb-mr1 2011-04-05 10:45:25 -07:00
Eric Laurent
512283f4ae am 7a492a9a: am b7a76e84: am a482d83c: Merge "Issue 4157048: mic gain for VoIP/SIP calls." into gingerbread 
* commit '7a492a9ad42947a3a7b777b0eb6eec56f5bb942b':
  Issue 4157048: mic gain for VoIP/SIP calls.
 2011-04-05 10:27:06 -07:00
Mike Lockwood
c30e2fa200 am 824c6edc: (-s ours) am 179122ad: (-s ours) am a8731e1e: Merge "DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust" into gingerbread 
* commit '824c6edce8f79aac9c98caabd9b8857d4c580629':
  DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust
 2011-04-05 10:27:03 -07:00
Trevor Johns
2c8999b4b9 am fa6b7889: am ea477d20: am cafbe87d: Merge "Fixing line in Market IAB docs that explains how to bind to the MarketService." into gingerbread 
* commit 'fa6b78890b17f6df2175b143783174ab5e7f7758':
  Fixing line in Market IAB docs that explains how to bind to the MarketService.
 2011-04-05 10:27:01 -07:00
Simon Wilson
e6b56e35de am 442bf4cd: (-s ours) am d7a8e845: (-s ours) am ec944728: Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread 
* commit '442bf4cd1efb24ea29fcc3b6b4d54f89f3a1dc7a':
  DO NOT MERGE Disable WiMAX when "Data Enabled" is off
 2011-04-05 10:26:54 -07:00
Eric Laurent
2c33e89577 am b7a76e84: am a482d83c: Merge "Issue 4157048: mic gain for VoIP/SIP calls." into gingerbread 
* commit 'b7a76e84fde7fe534d46aaaa71e3224798354009':
  Issue 4157048: mic gain for VoIP/SIP calls.
 2011-04-04 17:44:50 -07:00
Mike Lockwood
e26dbc56ce am 179122ad: (-s ours) am a8731e1e: Merge "DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust" into gingerbread 
* commit '179122ad56f12bd802fd29fe0b6606dd23ec5ba9':
  DO NOT MERGE: UsbService: Make USB disconnect handling for accessory mode more robust
 2011-04-04 17:44:46 -07:00
Trevor Johns
b5ab4f3aa8 am ea477d20: am cafbe87d: Merge "Fixing line in Market IAB docs that explains how to bind to the MarketService." into gingerbread 
* commit 'ea477d2043eeb8c20435f17b139bd5dd1248d763':
  Fixing line in Market IAB docs that explains how to bind to the MarketService.
 2011-04-04 17:44:42 -07:00
Simon Wilson
8757f75762 am d7a8e845: (-s ours) am ec944728: Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread 
* commit 'd7a8e8453d8302ac9820af49b4b112468efdf36d':
  DO NOT MERGE Disable WiMAX when "Data Enabled" is off
 2011-04-04 17:44:38 -07:00
Christopher Tate
56f6526949 Merge "Fix deadlock in BackupManagerService" 2011-04-04 17:41:22 -07:00
Mike Lockwood
5799997584 Merge "StorageManager: Add getVolumeList() and getVolumeState() methods" 2011-04-04 17:39:21 -07:00
Mike Lockwood
30e4b4adee Merge "MountService: Add support for multiple volumes" 2011-04-04 17:39:15 -07:00
Bill Gruber
a6caaa0a86 am 0ac3183c: am f0d2c1c4: am 63ac0379: am d36bc32e: Merge "SDK doc updates" into honeycomb 
* commit '0ac3183c6489120fa84df9e289b2db31fb49c842':
  SDK doc updates
 2011-04-04 17:37:46 -07:00
Bill Gruber
5baaac6fbb am f0d2c1c4: am 63ac0379: am d36bc32e: Merge "SDK doc updates" into honeycomb 
* commit 'f0d2c1c4eb613130e34a4f377d8f82f935170873':
  SDK doc updates
 2011-04-04 17:35:34 -07:00
Bill Gruber
fed3b263c6 am 63ac0379: am d36bc32e: Merge "SDK doc updates" into honeycomb 
* commit '63ac03794df9ca383416c3a782812b9a9c03456d':
  SDK doc updates
 2011-04-04 17:31:23 -07:00
Bill Gruber
24fe32e301 am d36bc32e: Merge "SDK doc updates" into honeycomb 
* commit 'd36bc32ea9a109596308a0516b3e0898c82cebc5':
  SDK doc updates
 2011-04-04 17:21:25 -07:00
Bill Gruber
6cba82c9da Merge "SDK doc updates" into honeycomb 2011-04-04 17:15:08 -07:00
Eric Fischer
82881420f0 am 2e715df8: (-s ours) am d20023ae: (-s ours) am 8b312c6c: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit '2e715df8d4a568d3a6d7e2ee569ab1331dcafaa7':
  Import revised translations.  DO NOT MERGE
 2011-04-04 16:46:38 -07:00
Jason parks
d66f55e1f7 am 5ee250aa: am 1d733625: am cca2f2f9: Merge "Send out a broadcast that the system is being factory reset." into gingerbread 
* commit '5ee250aa744720c90b264966f9721cfb9d256e96':
  Send out a broadcast that the system is being factory reset.
 2011-04-04 16:46:34 -07:00
Justin Ho
4f9dabb61d am d95fa2ff: am 0f5e36de: am 87805ca3: Updated CDMA roaming icons 
* commit 'd95fa2ff8cf7cc302dab5de0f1becf67bd298898':
  Updated CDMA roaming icons
 2011-04-04 16:46:31 -07:00
Jean-Baptiste Queru
0e35493791 am e2fbd0a9: am 0c61e105: am bef31431: No-op - reconcile with open-source gingerbread 
* commit 'e2fbd0a9b03956dbb7d787ed435b895cfc735780':
 2011-04-04 16:46:29 -07:00
Robert Greenwalt
f4af360d11 am e716a551: resolved conflicts for merge of ab2194aa to honeycomb-plus-aosp 
* commit 'e716a5515bfb9d9f1f8a5b87fee8b75bef3a1a96':
  Only leave one default network up at a time.
 2011-04-04 16:44:25 -07:00
Eric Fischer
ec180cff05 am d20023ae: (-s ours) am 8b312c6c: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit 'd20023ae44e611b104b58bc23aae6a42b219a503':
  Import revised translations.  DO NOT MERGE
 2011-04-04 16:43:48 -07:00
Jason parks
a22e688842 am 1d733625: am cca2f2f9: Merge "Send out a broadcast that the system is being factory reset." into gingerbread 
* commit '1d73362597c49f4692a580460bc8697a8f1d0efa':
  Send out a broadcast that the system is being factory reset.
 2011-04-04 16:43:34 -07:00
Justin Ho
5d6b9f785d am 0f5e36de: am 87805ca3: Updated CDMA roaming icons 
* commit '0f5e36deee14b9d21dcf8ca2986e63b38fa9354b':
  Updated CDMA roaming icons
 2011-04-04 16:43:23 -07:00
Jean-Baptiste Queru
dc23f67c67 am 0c61e105: am bef31431: No-op - reconcile with open-source gingerbread 
* commit '0c61e105906f96e5139beb8162c0ead8787faf7a':
 2011-04-04 16:43:15 -07:00
Chet Haase
691a02566f Merge "Fix bug with values in cloned animators." 2011-04-04 16:27:38 -07:00
Robert Greenwalt
e9e3d1dec2 resolved conflicts for merge of ab2194aa to honeycomb-plus-aosp 
Change-Id: I99a29f920336b00b26b9aadafd2bd835049f48cf
 2011-04-04 16:26:42 -07:00
Robert Greenwalt
6f8798744e am da8beef5: am 37229514: Merge "resolved conflicts for merge of 7544b23e to gingerbread-plus-aosp" into gingerbread-plus-aosp 
* commit 'da8beef55612738d87d6aa520445377a9e4ae784':
  Fix Default route after secondary net use.
 2011-04-04 15:28:56 -07:00
Brad Fitzpatrick
c6335654db am 5851b866: am 27e00544: am 9907d161: Merge "Fix data corruption when writing to Bluetooth socket" 
* commit '5851b8662dc95372d68df293cb13c59da0cf8582':
  Fix data corruption when writing to Bluetooth socket
 2011-04-04 15:28:54 -07:00
Brad Fitzpatrick
118dfc93d4 am e511fb33: am 9b1b6439: am 2ed72048: Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()" 
* commit 'e511fb33d33f0ba83ce437f615fa236f369b5ade':
  Always return a valid index from Rfc822Tokenizer.findTokenEnd()
 2011-04-04 15:28:51 -07:00
Brad Fitzpatrick
a72f719083 am 8f7aad14: am f7a34b15: am e558a000: Merge "Avoid crash in system server when mounting container" 
* commit '8f7aad147d790b25bae7301827e070df72690341':
  Avoid crash in system server when mounting container
 2011-04-04 15:28:48 -07:00
Robert Greenwalt
9319fc55df am 37229514: Merge "resolved conflicts for merge of 7544b23e to gingerbread-plus-aosp" into gingerbread-plus-aosp 
* commit '37229514c56dac0c1e3cef6bc8229232d0c75b96':
  Fix Default route after secondary net use.
 2011-04-04 15:25:45 -07:00
Brad Fitzpatrick
bb58f515ba am 27e00544: am 9907d161: Merge "Fix data corruption when writing to Bluetooth socket" 
* commit '27e00544ea08d25e8e9b1b94264205f9d53030fb':
  Fix data corruption when writing to Bluetooth socket
 2011-04-04 15:25:39 -07:00
Brad Fitzpatrick
c52b5703d1 am 9b1b6439: am 2ed72048: Merge "Always return a valid index from Rfc822Tokenizer.findTokenEnd()" 
* commit '9b1b64399502af0a08beac3014f2294644753602':
  Always return a valid index from Rfc822Tokenizer.findTokenEnd()
 2011-04-04 15:25:33 -07:00
Brad Fitzpatrick
11f34d8880 am f7a34b15: am e558a000: Merge "Avoid crash in system server when mounting container" 
* commit 'f7a34b15986f8c00bc6fb941a40f9acbe2c21aff':
  Avoid crash in system server when mounting container
 2011-04-04 15:25:21 -07:00
Robert Greenwalt
05505014c4 am 549177e4: Merge "resolved conflicts for merge of 92d72ca0 to honeycomb-plus-aosp" into honeycomb-plus-aosp 
* commit '549177e4f3f5e2a92e1431c157cebb985068a5ee':
  Fix bad merge.
 2011-04-04 15:12:13 -07:00
Robert Greenwalt
7ed6fe4847 Merge "resolved conflicts for merge of 92d72ca0 to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-04-04 15:07:41 -07:00
Robert Greenwalt
98bf2c5d1e resolved conflicts for merge of 92d72ca0 to honeycomb-plus-aosp 
Change-Id: Ide9ed301618b89a1cced4885062c13047980890c
 2011-04-04 15:00:13 -07:00
Alex Sakhartchouk
4fbddaadc3 Merge "First draft of fbo in renderscript. Updating samples and benchmark" 2011-04-04 14:33:19 -07:00
Gilles Debunne
d1ecae2804 Merge "IME is no longer shown when an EditText gets focus." 2011-04-04 14:25:45 -07:00
Roman Nurik
38c0829b6d am 84967294: am 91315577: am 5a41a8a0: Merge "Document support for .TS video containers." into honeycomb-mr1 
* commit '84967294f25d223ff2c5e62378b40f20fd853c4c':
  Document support for .TS video containers.
 2011-04-04 13:51:18 -07:00