ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
35,290 Commits 2 Branches 0 Tags 54 MiB
4839f5c3fe
Commit Graph

35290 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philip Milne
4839f5c3fe Merge "Fix for baseline alignment in LinearLayout compatibiity mode." 2011-06-09 10:10:26 -07:00
Alex Sakhartchouk
ed0108b46b Merge "More work to make libRS buildable on the host." 2011-06-09 09:42:28 -07:00
Xavier Ducrohet
29951e3d5e am 3eb9f832: (-s ours) am 67f09cd0: (-s ours) am d6ce6791: Merge "Cherrypick d1ed33c4 from hc-mr1. do not merge." into gingerbread 
* commit '3eb9f8326e6d72be671bf0226965ca3231a25d7d':
  Cherrypick d1ed33c4 from hc-mr1. do not merge.
 2011-06-09 09:04:38 -07:00
Xavier Ducrohet
82dd50b3d6 am e1d14a29: (-s ours) am ab3f5779: (-s ours) am ee1b4976: Merge changes I035c48b9,Ib302af47,Iebda5ea6 into gingerbread 
* commit 'e1d14a29ff9aa17923dc4e9406408cbc07a97c31':
  Cherrypick 5b61ea6b from hc-mr1
  LayoutLib: enable the LAYOUT_ONLY capability.
  Merge dba35f1b from honeycomb-mr1. do not merge.
 2011-06-09 09:04:26 -07:00
Romain Guy
e3f2baa793 am 34e9f249: am fbef58fa: am 258f32e2: Merge "Disable plugins if setPluginsEnabled(false) called." 
* commit '34e9f249a9b36ebe64476b997bca0edf990fbc0d':
  Disable plugins if setPluginsEnabled(false) called.
 2011-06-09 09:03:55 -07:00
Martijn Coenen
b9a541465d Merge "Added support for rediscovering a Tag (API)." 2011-06-09 08:01:25 -07:00
Andy McFadden
10a8840ac1 Merge "Add a URI for recurring event exceptions" 2011-06-09 07:37:07 -07:00
Narayan Kamath
5ae6175aab Merge "Make changes to the TTS api suggested by the API review." 2011-06-09 04:09:22 -07:00
Steve Block
dfad404de4 Merge "Fix some poorly worded API documentation for WebView.loadDataWithBaseURL()" 2011-06-09 03:48:41 -07:00
Chung-yih Wang
e4b581afe7 Merge "Add KeepAlive Interval Measurement." 2011-06-09 03:24:55 -07:00
Jake Hamby
1b32c3b473 resolved conflicts for merge of 7ca13deb to master 
Change-Id: If34814d6c70cf63eca9bd816845389f6785518ae
 2011-06-08 23:20:09 -07:00
Christopher Tate
a87feb9339 Merge "Fix handling of directory entries" 2011-06-08 20:13:57 -07:00
Christopher Tate
61334a3f83 Fix handling of directory entries 
Don't emit tar blocks for directories with an invalid nonzero size.  Also, if
such an entry is encountered during restore, don't actually attempt to treat
it as valid and thus skip over the next actual tar entry.

This patch also adds tracking of the data actually consumed during restore,
and reports a total at the end of stream.

Change-Id: I625173f76df3c007e899209101ff2b587841f184
 2011-06-08 20:11:49 -07:00
Daisuke Miyakawa
84ff6400ce Merge "Introduces new Contacts API for ranking promotion." 2011-06-08 19:55:47 -07:00
Svetoslav Ganov
b68767833e Merge "AccessibilityNodeInfo and AccessibilityEvent to initialized properly." 2011-06-08 19:44:20 -07:00
John Reck
93b5cfad3a Merge "Fix initial zoom with loadViewState" 2011-06-08 18:19:12 -07:00
Mathias Agopian
ece602de8d am c8c39b6c: (-s ours) am a6a4a9ed: am f6c82067: fix a surface leak introduced by a failed merge (DO NOT MERGE) 
* commit 'c8c39b6c5b14bbe17fbd0ffe4f3524f68a0caa10':
  fix a surface leak introduced by a failed merge (DO NOT MERGE)
 2011-06-08 17:32:30 -07:00
Irfan Sheriff
ad381c3834 am 92593dc4: am 84db79bb: Merge "Clear IP configuration on lost network" into honeycomb-LTE 
* commit '92593dc49b348c4951037a1ae2fa17bb6644ffb9':
  Clear IP configuration on lost network
 2011-06-08 17:31:58 -07:00
Andreas Huber
aead99ac3d am 752a5b3d: (-s ours) am 8e973729: (-s ours) am 8050a02b: DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls. 
* commit '752a5b3df55da655792d382025171d94073e05f9':
  DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abort pending recv/send calls.
 2011-06-08 17:03:17 -07:00
Martijn Coenen
fe0143ce63 am 4c5f2a9d: am ed1c8d7d: am 0aa1017f: Prevent allocation overflows by corrupt NDEF records. 
* commit '4c5f2a9dd26674be797e1cb7c995247601096a04':
  Prevent allocation overflows by corrupt NDEF records.
 2011-06-08 17:03:05 -07:00
Romain Guy
71f9080c11 Merge "Remove obsolete code." 2011-06-08 16:10:33 -07:00
Andreas Huber
7927f90b23 Merge "This device-specific workaround is no longer necessary." 2011-06-08 15:49:34 -07:00
John Wang
f4e97bbd86 am 1f866589: am 71030e53: Merge "Add SIM PUK unlockscreen." into honeycomb-LTE 
* commit '1f8665895f71904b9d757854277cb637841356c3':
  Add SIM PUK unlockscreen.
 2011-06-08 14:46:04 -07:00
Chia-chi Yeh
f08f5e33c8 Merge "The UI part of the user space VPN support." 2011-06-08 14:17:44 -07:00
Nick Pelly
271272ada9 Merge "Move NDEF URI helper method into android.nfc.NfcRecord" 2011-06-08 13:44:28 -07:00
Chet Haase
dfcb117f1d Merge "Add 'Property' object" 2011-06-08 12:51:06 -07:00
Martijn Coenen
b40e2b149a Merge "Implement Felica timeout handling (API)." 2011-06-08 11:04:36 -07:00
Robert Greenwalt
6ff5e1dc70 Merge "resolved conflicts for merge of e139167c to master" 2011-06-08 10:29:13 -07:00
Robert Greenwalt
77a7e79738 resolved conflicts for merge of e139167c to master 
Change-Id: Ic4d8aae7dd457457d9cc8ba081b273e425729f86
 2011-06-08 10:01:06 -07:00
Mike Lockwood
c9fb9f7fd7 Merge "MTP: Remove obsolete setPtpMode support" 2011-06-08 09:43:02 -07:00
Mike Lockwood
77998bc005 Merge "UsbManager: Clean up extras for ACTION_USB_STATE broadcast" 2011-06-08 09:42:54 -07:00
Eino-Ville Talvala
37b4e42896 Merge "Updates to Camera API documentation." 2011-06-08 09:18:37 -07:00
Steve Block
8e46ddadef Merge "Merge WebKit at r82507: Update useragent string" 2011-06-08 08:26:13 -07:00
satok
9a8e93a831 Merge "Fix the display name of InputMethodSubtype" 2011-06-08 04:09:21 -07:00
Narayan Kamath
b09ed564b7 Merge "Fix the threading behaviour of TTS audio requests." 2011-06-08 02:11:26 -07:00
Svetoslav Ganov
1810eb7e86 Merge "Crash in the TouchExplorer" 2011-06-07 19:29:20 -07:00
Jesse Wilson
737e8087dc Merge "Use external/mockwebserver in frameworks/base" 2011-06-07 18:49:32 -07:00
Chia-chi Yeh
591141089b Merge "Do not register the callbacks in the constructor." 2011-06-07 18:18:56 -07:00
Adam Powell
45942d332e resolved conflicts for merge of a7d01a75 to master 
Change-Id: Ib6a7bbca7711cb5e35085868c4b9b5cbb9b526a4
 2011-06-07 18:16:00 -07:00
Wink Saville
83d846cc99 am 7f13d0ed: am c368831d: Merge "Preferred network discrepancy after rild is restarted." into honeycomb-LTE 
* commit '7f13d0ed408c3ddce5b061c4370d99ba15d027b7':
  Preferred network discrepancy after rild is restarted.
 2011-06-07 17:54:25 -07:00
Robert Greenwalt
ff984f927a am 31ced5c1: am 350b7829: Merge "Fix NPE in the statusbar." into honeycomb-LTE 
* commit '31ced5c140cae9b3ad90066a540346acd821a3c9':
  Fix NPE in the statusbar.
 2011-06-07 17:54:17 -07:00
Jaikumar Ganesh
309ee97168 am 6aa152a1: (-s ours) am c8410017: (-s ours) am 1b755dea: Merge "Remove discoverable timeout handler. DO NOT MERGE" into gingerbread 
* commit '6aa152a1df3f77b5838a62194fc196e04d8a5c6a':
  Remove discoverable timeout handler. DO NOT MERGE
 2011-06-07 17:53:41 -07:00
Jeff Brown
3b462032b0 am e046555b: am fd324486: am 5cb05eea: Merge "Fix build." into honeycomb-mr2 
* commit 'e046555b4d92179327d12d888be967fff5c027ca':
  Fix build.
 2011-06-07 17:52:53 -07:00
Jeff Brown
5d99f17e82 am 61220e88: am bbbab26e: am 2c180499: Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2 
* commit '61220e880ac4d9d76b7fd50744439e68e929c697':
  Revert velocity damping. Bug: 4364920
 2011-06-07 17:52:30 -07:00
Jeff Brown
76ad002c32 am 55cc25c1: am 797dc698: am b92dcf9c: Merge "Simplify spot tracking logic. Bug: 4124987" into honeycomb-mr2 
* commit '55cc25c12c45e8ffb65d2275cc0b6941b68db9df':
  Simplify spot tracking logic. Bug: 4124987
 2011-06-07 17:52:22 -07:00
Jeff Brown
31033629f9 resolved conflicts for merge of 8b2c0014 to master 
Change-Id: I33a5a2949dc6c2d09e8196ba8c7128caa7ac2361
 2011-06-07 17:48:39 -07:00
Irfan Sheriff
325c998a90 am 5e4d0206: am b400184a: Merge "Handle AsyncChannel disconnect in WifiService" into honeycomb-LTE 
* commit '5e4d0206486378ffc7d2992750e439d54df15147':
  Handle AsyncChannel disconnect in WifiService
 2011-06-07 17:19:02 -07:00
Jeff Brown
afabfe49ec am c3709f25: am 277bfd7c: am c1830a77: Merge "Improve browser scrolling when using the mouse wheel." into honeycomb-mr2 
* commit 'c3709f2509bfc15d13a590b8342503f858ee67e2':
  Improve browser scrolling when using the mouse wheel.
 2011-06-07 17:18:48 -07:00
Dianne Hackborn
c0a288c1d6 am 4bd50588: am fc3fa5dc: am 1b405592: Merge "Fix issue #4539687: At least one compatibility-mode app (Androminion)..." into honeycomb-mr2 
* commit '4bd505883df3d8ca7583d854f1c71302c615519d':
  Fix issue #4539687: At least one compatibility-mode app (Androminion)...
 2011-06-07 17:18:16 -07:00
Xavier Ducrohet
fea4102ba8 am abc83871: am f6e47999: am 2a6dc7f1: Merge "Import the Layoutlib from hc-mr1." into honeycomb-mr2 
* commit 'abc838716816107754ab0479242d03807ce79fc2':
  Import the Layoutlib from hc-mr1.
 2011-06-07 17:17:11 -07:00