ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
35,459 Commits 2 Branches 0 Tags 54 MiB
205c0b3f21
Commit Graph

35459 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marco Nelissen
a5dbcdf0fc am 90dc22fa: am a02d9bf9: Make sure we don\'t read from invalid fds 
* commit '90dc22fa09c4cddb94926b8a8f08fd3d0a404f7f':
  Make sure we don't read from invalid fds
 2011-06-09 11:41:57 -07:00
Adam Powell
3ca0c4e20e am 4e1504a6: am 7ed8ff18: am 68b81434: Merge "Fix bug 4533120 - rough handling of invalid event streams in ScaleGestureDetector" into honeycomb-mr2 
* commit '4e1504a66b37b424c8839e64f97ac823e5358bd5':
  Fix bug 4533120 - rough handling of invalid event streams in ScaleGestureDetector
 2011-06-09 11:29:28 -07:00
Jake Hamby
30a1efdf60 am 22165bb5: am ae62b7b0: resolved conflicts for merge of 66040bbb to gingerbread-plus-aosp 
* commit '22165bb54af1cd3cb636c1d65da7c643d854c385':
  Fixes for SMS Cell Broadcast support.
 2011-06-09 11:29:13 -07:00
John Wang
01e9086e30 am 229d3a0c: am fc94d45f: Merge "Make getDeviceId return null for Non-phone device." into honeycomb-LTE 
* commit '229d3a0cbce70db82003705abf6844deec136d20':
  Make getDeviceId return null for Non-phone device.
 2011-06-09 11:25:50 -07:00
Dianne Hackborn
d1e0bf27b7 am 816e5b72: am ee3de4a9: am a3ce0f1e: Merge "Remove compat mode dialog." into honeycomb-mr2 
* commit '816e5b72190787f2b6136925c172a00ebcbe4077':
  Remove compat mode dialog.
 2011-06-09 11:24:32 -07:00
Dianne Hackborn
9c9cea7bf0 am 891266e3: (-s ours) am b5b98f87: am dfe824ef: Merge "DO NOT MERGE. Experimental compatibility mode UI." into honeycomb-mr2 
* commit '891266e36e230fa0a4f4466672834a8e3e97598e':
  DO NOT MERGE. Experimental compatibility mode UI.
 2011-06-09 11:23:10 -07:00
Adam Powell
52e2db4061 Merge "Bug 4563099 - Action bar tabs - place second row tabs on top in the absence of home/up" 2011-06-09 11:14:41 -07:00
Conley Owens
c66e2523b9 Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style" 2011-06-09 11:12:04 -07:00
John Reck
9542a6382b Merge "Don't cut velocity" 2011-06-09 11:07:54 -07:00
Marco Nelissen
ff86daf56a am a02d9bf9: Make sure we don\'t read from invalid fds 
* commit 'a02d9bf9c3ff22cd449da21ff7c23170488ebd8e':
  Make sure we don't read from invalid fds
 2011-06-09 10:36:24 -07:00
Gilles Debunne
17f04d4305 Merge "Add SwitchPreference" 2011-06-09 10:25:25 -07:00
Jeff Sharkey
71636e8f65 Merge "Persist network stats using AtomicFile." 2011-06-09 10:22:27 -07:00
Justin Ho
ad65602b71 am 1d3173c3: Merge "Updating default wallpaper of large devices to match xlarge" into honeycomb-mr2 
* commit '1d3173c3dc93bb4f2efc5b059fec8e7577b3258a':
  Updating default wallpaper of large devices to match xlarge
 2011-06-09 10:22:17 -07:00
Xavier Ducrohet
2efdc93e35 am 8ee28811: Merge changes Idbb70f53,I10426a3f into honeycomb-mr2 
* commit '8ee28811ad208d224ac8d317e4644aabc9ffb886':
  Merge 06942bc4 from hc-mr1.
  Merge 988eeeb5 from hc-mr1.
 2011-06-09 10:19:14 -07:00
Justin Ho
c762e30727 Merge "Updating default wallpaper of large devices to match xlarge" into honeycomb-mr2 2011-06-09 10:18:13 -07:00
Steve Block
35b641d61c Merge "Fixes WebView.loadData() to avoid constructing invalid URLs." 2011-06-09 10:16:29 -07:00
Narayan Kamath
4a615d67ea Merge "Implement QUEUE_FLUSH and QUEUE_DESTROY addition modes." 2011-06-09 10:13:47 -07:00
Xavier Ducrohet
4734541892 Merge changes Idbb70f53,I10426a3f into honeycomb-mr2 
* changes:
  Merge 06942bc4 from hc-mr1.
  Merge 988eeeb5 from hc-mr1.
 2011-06-09 10:12:40 -07:00
Chet Haase
1bad9fc3ee Merge "Change exception thrown when set() called on readonly Property." 2011-06-09 10:12:04 -07:00
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
Dianne Hackborn
f2d3a5e5e5 am 3aabdeac: am 5ba2e872: Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2 
* commit '3aabdeaceff8405406d90c329a6691552559556d':
  Fix for not reporting correct "sw" in compat mode.
 2011-06-08 22:38:03 -07:00
Dianne Hackborn
dbd950b87a am 5ba2e872: Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2 
* commit '5ba2e872fa684c0f1b992a95df00854b58f2cd8c':
  Fix for not reporting correct "sw" in compat mode.
 2011-06-08 22:35:25 -07:00
Dianne Hackborn
deb21d3eda Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2 2011-06-08 22:33:34 -07:00
Dianne Hackborn
f179fe3910 am 2d618e41: am e22fe933: Fix issue #4582417: Need to add new PackageManager... 
* commit '2d618e415fa0ed8a1e7ac8d0ffe98cebdf6c208b':
  Fix issue #4582417: Need to add new PackageManager...
 2011-06-08 21:41:55 -07:00
Dianne Hackborn
c7269cbfa6 am e22fe933: Fix issue #4582417: Need to add new PackageManager... 
* commit 'e22fe9331ad8a9f81470751fdeca7633f654cffa':
  Fix issue #4582417: Need to add new PackageManager...
 2011-06-08 21:38:33 -07:00
John Wang
7771427ff5 am 08a8f3f9: Merge "Set emergency call text visibility." into honeycomb-LTE 
* commit '08a8f3f9dc035bc462061ae87090a8da59c6713a':
  Set emergency call text visibility.
 2011-06-08 20:41:41 -07:00
John Wang
e179704ece Merge "Set emergency call text visibility." into honeycomb-LTE 2011-06-08 20:38:59 -07:00
Mathias Agopian
e1935e89aa am 17574b9a: (-s ours) am 19974ecc: Fix a leak in RefBase (DO NOT MERGE) 
* commit '17574b9a0a7cc1cf215935fce2474ca30d387046':
  Fix a leak in RefBase (DO NOT MERGE)
 2011-06-08 20:19:28 -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
Dianne Hackborn
b0cc4a8083 am a1396dfe: am 02140891: Merge "Work on issue #4518815: Compatibility mode introduces compatibility regression..." into honeycomb-mr2 
* commit 'a1396dfe7ad6ec6953f544be42d69d7804ab0fd4':
  Work on issue #4518815: Compatibility mode introduces compatibility regression...
 2011-06-08 20:06:40 -07:00
Dianne Hackborn
2b6f1b12f7 am 02140891: Merge "Work on issue #4518815: Compatibility mode introduces compatibility regression..." into honeycomb-mr2 
* commit '021408910af170268cb486910d4dd5a7d838c2bb':
  Work on issue #4518815: Compatibility mode introduces compatibility regression...
 2011-06-08 20:02:43 -07:00
Dianne Hackborn
ab6bf752b3 Merge "Work on issue #4518815: Compatibility mode introduces compatibility regression..." into honeycomb-mr2 2011-06-08 20:00:50 -07:00
Mathias Agopian
ef1e16fc0b am 19974ecc: Fix a leak in RefBase (DO NOT MERGE) 
* commit '19974eccdbd3e4dbd7e3b2cc401db7806d4a17bc':
  Fix a leak in RefBase (DO NOT MERGE)
 2011-06-08 19:56:06 -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 Wang
a89933c191 am 735463d1: Merge "Fix layout issue on Xoom when device thinks there\'s a SIM." into honeycomb-LTE 
* commit '735463d1d9a1e490fa6b30d4273d24fc2f12bcd9':
  Fix layout issue on Xoom when device thinks there's a SIM.
 2011-06-08 19:41:39 -07:00
John Wang
7f0d352506 Merge "Fix layout issue on Xoom when device thinks there's a SIM." into honeycomb-LTE 2011-06-08 19:37:56 -07:00
Mathias Agopian
c2db91c3bf am b40e85f9: am 645434fb: Merge "Fix a leak in RefBase" into honeycomb-mr2 
* commit 'b40e85f90146a654bfe5657187be491147814ea0':
  Fix a leak in RefBase
 2011-06-08 19:34:30 -07:00
Mathias Agopian
58d6631e4d am 645434fb: Merge "Fix a leak in RefBase" into honeycomb-mr2 
* commit '645434fb4eff408698423d70904fb8fc709a5225':
  Fix a leak in RefBase
 2011-06-08 19:30:47 -07:00