drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
139,188 Commits 1 Branch 0 Tags
Commit Graph

139188 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lorenzo Colitti
62388936c8 Assert that RT_SCOPE_* and IFA_F_* are not zero. 
If these constants are zero (or, rather, if they're not all
different), the test will fail with more cryptic error messages
whose cause is not obvious. Clearly check for that here.

Bug: 15602893
Change-Id: I7ca4a9c5e3d592fd93fbfa1b50666a1861a0031d
 2014-06-13 17:20:20 +09:00
Jinsuk Kim
63dd3bb360 Fixed a wrong path to HdmiPortInfo class 
This fixes a JNI error for HdmiCecController

Change-Id: I8ce987dfa3126ecffd455a964c01d27fb9aa01eb
 2014-06-13 14:46:17 +09:00
vandwalle
3801202284 Merge "auto-roam fixes, disable scanning based on traffic at interface" 2014-06-12 05:34:42 +00:00
vandwalle
72d87d99b0 auto-roam fixes, disable scanning based on traffic at interface 
Bug: 15575229
Bug: 15577651

Change-Id: Ia8914a90d803fd9e6ba9fa51efce50c7b7f1c692
 2014-06-13 03:32:28 +00:00
Adam Powell
90132dd7ca am c72a2a82: Merge "Explicitly track consumed state for WindowInsets" into lmp-preview-dev 
* commit 'c72a2a82160099e8f20c42eb0d36881c31537130':
  Explicitly track consumed state for WindowInsets
 2014-06-12 18:37:33 +00:00
Christopher Tate
93e9e7208e am ba6e8ae5: Merge "Relax duplicate-permission-definition constraints slightly" into lmp-preview-dev 
* commit 'ba6e8ae5d2a364799fd6bc84179e33b6731e574b':
  Relax duplicate-permission-definition constraints slightly
 2014-06-12 18:37:28 +00:00
Winson Chung
02a9c359a1 am e202fff5: Merge "Stop sending broadcasts to RecentsActivity before boot has completed. (Bug 15109101)" into lmp-preview-dev 
* commit 'e202fff5f77568294ba4b50c879ca587535db3be':
  Stop sending broadcasts to RecentsActivity before boot has completed. (Bug 15109101)
 2014-06-12 18:08:09 +00:00
Fabrice Di Meglio
0044b20eb7 am 52771816: Merge "Fix Material Preference Framework layout" into lmp-preview-dev 
* commit '527718164cbb28dff6be6073ba78515395bcf9e1':
  Fix Material Preference Framework layout
 2014-06-12 18:08:04 +00:00
Raph Levien
12871e99d0 am 0e8a57cc: Merge "Support fake italics" into lmp-preview-dev 
* commit '0e8a57cc1ff4d12791231177b679114b05279548':
  Support fake italics
 2014-06-12 17:56:00 +00:00
Raph Levien
63fa80eaab am 7a5662e8: (-s ours) Merge "Support for fake bold in Minikin builds" into lmp-preview-dev 
* commit '7a5662e807f0e99bd8499a52ffed9d114d299f80':
  Support for fake bold in Minikin builds
 2014-06-12 17:55:54 +00:00
Raph Levien
c9f705b8f9 am 7204116b: (-s ours) Merge "Fix getFontMetrics problems" into lmp-preview-dev 
* commit '7204116b97bd5e1f79113566577c89c4d0925255':
  Fix getFontMetrics problems
 2014-06-12 17:49:23 +00:00
John Reck
816f71b7e0 Merge "Move LayerType to RenderNode" 2014-06-12 05:34:42 +00:00
John Reck
25fbb3fa11 Move LayerType to RenderNode 
Change-Id: Icb79a5015cb0362b1f3a66d09007450730135a97
 2014-06-12 19:25:33 -07:00
John Reck
a447d29c65 Fix DA bugs 
* Now aware of transform of DrawDisplayListOp
 * Supports projection

 Bug: 15539677
 Bug: 15506680

Change-Id: Ic16f482cd48c3add12e49eca529281be12b93491
 2014-06-12 09:13:45 -07:00
Winson Chung
91b7d2b4fb Merge "Stop sending broadcasts to RecentsActivity before boot has completed. (Bug 15109101)" into lmp-preview-dev 2014-06-11 21:23:31 +00:00
Svetoslav
39f0882786 Merge "Fix NPE in PrintActivity." 2014-06-11 21:23:31 +00:00
Svetoslav
e3bbb3d6c0 Fix NPE in PrintActivity. 
It is possible that the orientation is chosen before the media size.
The code handling orientation change was wrognly expecting to have
a selected media size all the time resulting in a NPE.

bug:15512333

Change-Id: I9f2786af314641144a24c1d1363c8d2590b0df57
 2014-06-12 10:43:23 -07:00
Svetoslav
4604abc97d Moving and resizing windows not reported propely for accessibility. 
When the position and size of a window changes we have to report that
to the accessibility layer if the window introspection is enabled.

bug:15569915

Change-Id: I3f869e0a582592bfa5f3743d5c2133ee8cb39b34
 2014-06-12 08:26:21 -07:00
Nicolas Prevot
006812acd2 am 485303e2: Merge "Correcting a bug related to Uri permissions." into lmp-preview-dev 
* commit '485303e2e45ca91287400b0b26e1e737062c8839':
  Correcting a bug related to Uri permissions.
 2014-06-12 15:23:38 +00:00
John Reck
dea0f13683 am 82469fb2: (-s ours) Merge "DO NOT MERGE Disable AtlasInitializer" into lmp-preview-dev 
* commit '82469fb2aa173e307c0c92ccdf9db30316502813':
  DO NOT MERGE Disable AtlasInitializer
 2014-06-12 15:23:32 +00:00
Mark Salyzyn
fe2fd536de Merge "hwui: 64-bit compile issue" 2014-06-11 21:23:31 +00:00
Andy McFadden
564dae50b5 Merge "Delete a local ref in getSurface" 2014-06-12 03:30:50 +00:00
Andy McFadden
5ad3ab8a16 Delete a local ref in getSurface 
ANativeWindow_fromSurface() provides a native-only call path to
android_view_Surface_getSurface(), so we need to clean up the
local reference.

Bug 14087233

Change-Id: I92aa5aa492c47a0642fdcb28c717ad7f874e1ad9
 2014-06-11 15:22:32 -07:00
Winson Chung
8175a7c2e6 Stop sending broadcasts to RecentsActivity before boot has completed. (Bug 15109101) 
Change-Id: Ic04dc2ef73c75d63e107e7b50842dd618d3a173a
 2014-06-11 14:19:53 -07:00
Christopher Tate
f9fcfaae78 Merge "Relax duplicate-permission-definition constraints slightly" into lmp-preview-dev 2014-06-11 08:41:11 +00:00
Winson Chung
c0daabbec3 Merge "Fixing issues with dim not animating, adding dismiss button delay, tweaking empty recents text. (Bug 15431590, 15573497)" 2014-06-11 08:41:11 +00:00
Winson Chung
a26fb7822d Fixing issues with dim not animating, adding dismiss button delay, tweaking empty recents text. (Bug 15431590, 15573497) 
Change-Id: I9c11e04cd52f9e000d8ba3e443f2500c9aa7edbb
 2014-06-12 19:08:29 -07:00
Winson Chung
9214eff52a Fix regression in using visibility flags. 2014-06-12 13:59:25 -07:00
Winson Chung
d42a6cfe2b Exploring transitions to/from Recents. 
- refactored hwlayers and change view property animations to use a reference counted trigger
- cleaned up RecentsConfiguration, and move it into classes using it
- moved task bar animations back into TaskBarView
- refactoring enter/exit animations to use an animation context

Change-Id: Ia66b622b094f22145c2fab07c2a9bdfd62344be2
 2014-06-12 12:57:56 -07:00
Amith Yamasani
4118ac825a Merge "Show user switcher if guest is enabled" 2014-06-12 05:34:42 +00:00
Amith Yamasani
a596ff87cd Show user switcher if guest is enabled 
even if there's only one user.

Bug: 15549064
Change-Id: Ib9bc5e6cdc6f2655e44ec0a10a701dd39389e648
 2014-06-12 18:13:09 -07:00
Chad Jones
28b8434a00 Merge "resolved conflicts for merge of 4849aa86 to master" 2014-06-11 08:41:11 +00:00
Chad Jones
f391ebccea resolved conflicts for merge of 4849aa86 to master 
Change-Id: I7ec55bdb7a3a1618f33dfdb3b19b2bd201789677
 2014-06-12 17:45:05 -07:00
Craig Mautner
4849aa86b1 am be634951: Fix permission problem and NPE 
* commit 'be63495101dba3b0c3c496cdd810df9e30e926d4':
  Fix permission problem and NPE
 2014-06-12 23:36:54 +00:00
Tim Murray
604ea0e415 am b1c9430c: am 77d28ca2: Merge "Move FieldPacker over to use large objects on 64-bit." 
* commit 'b1c9430c8749b1feba59bb55a31cb1364270981b':
  Move FieldPacker over to use large objects on 64-bit.
 2014-06-12 23:08:39 +00:00
Tim Murray
b1c9430c87 am 77d28ca2: Merge "Move FieldPacker over to use large objects on 64-bit." 
* commit '77d28ca25378530f92d409fbd72a38a1e256b59f':
  Move FieldPacker over to use large objects on 64-bit.
 2014-06-12 23:05:16 +00:00
Nick Kralevich
50ece5ec53 am 9a0485aa: am 1ef888e5: Merge "Add service_contexts to policy update bundles." 
* commit '9a0485aa567c99157e45d08e9712a281f34ffc5f':
  Add service_contexts to policy update bundles.
 2014-06-12 21:10:30 +00:00
Nick Kralevich
9a0485aa56 am 1ef888e5: Merge "Add service_contexts to policy update bundles." 
* commit '1ef888e564926b78aeb02ef1085be2f72227b862':
  Add service_contexts to policy update bundles.
 2014-06-12 21:07:25 +00:00
Craig Mautner
be63495101 Fix permission problem and NPE 
Remove uid before calling into Window Manager. Restore afterwards.

Check for null stack value before dereferencing.

Fixes bug 15591112.

Change-Id: Ida3de556940440162c91b8c1614d0f21e364abd8
 2014-06-12 13:50:53 -07:00
Deepanshu Gupta
1434ea749f am 92b7c67e: Merge "LayoutLib fixes for API 20 [DO NOT MERGE]" into klp-modular-dev 
* commit '92b7c67e719fa125a5af368eb9e00f724c88601d':
  LayoutLib fixes for API 20 [DO NOT MERGE]
 2014-06-12 20:04:12 +00:00
Scott Main
91b078c8dc am 55c11af7: Merge "reorg the SDK setup docs to streamline setup for all variations. Move ADT plugin to the ADT help doc and combine the three setup guides into one page that is dynamic based on a URL parameter." into klp-modular-dev 
* commit '55c11af78a34f6746b9b5fcf8aa487eef797ea2e':
  reorg the SDK setup docs to streamline setup for all variations. Move ADT plugin to the ADT help doc and combine the three setup guides into one page that is dynamic based on a URL parameter.
 2014-06-12 19:04:34 +00:00
Andrew Solovay
d51a5b3891 am 25b8af9d: am 436f4e36: am ded9c171: Merge "docs: New "Verifying App Behavior on the Android Runtime (ART)" guide." into klp-docs 
* commit '25b8af9d3f91503146a4592d7fc19a53ca44bf4a':
  docs: New "Verifying App Behavior on the Android Runtime (ART)" guide.
 2014-06-12 17:27:48 +00:00
Andrew Solovay
25b8af9d3f am 436f4e36: am ded9c171: Merge "docs: New "Verifying App Behavior on the Android Runtime (ART)" guide." into klp-docs 
* commit '436f4e36d30bc6d1f2b353d8e5de9c37a594e874':
  docs: New "Verifying App Behavior on the Android Runtime (ART)" guide.
 2014-06-12 17:23:31 +00:00
Andrew Solovay
436f4e36d3 am ded9c171: Merge "docs: New "Verifying App Behavior on the Android Runtime (ART)" guide." into klp-docs 
* commit 'ded9c171ead51b358538a65d8b84946e05d8db2b':
  docs: New "Verifying App Behavior on the Android Runtime (ART)" guide.
 2014-06-12 17:19:33 +00:00
Santos Cordon
b1768e398f Merge "Update API for conference calling." 2014-06-12 05:34:42 +00:00
Santos Cordon
86377e5377 Update API for conference calling. 
Change-Id: Ic9b3d8fe98bb3f46e7f83d248785cb736186f445
 2014-06-12 17:37:07 -07:00
Eino-Ville Talvala
c5c363f0ff am 14b5f131: Merge "camera2 docs: Fix instructions for using SurfaceView." into lmp-preview-dev 
* commit '14b5f131c7118d58a6215e1f6d877d5cd31de54c':
  camera2 docs: Fix instructions for using SurfaceView.
 2014-06-13 00:35:59 +00:00
Eino-Ville Talvala
fb587f4f6b Merge "camera2 docs: Fix instructions for using SurfaceView." into lmp-preview-dev 2014-06-12 17:09:07 +00:00
Eino-Ville Talvala
5ae1ca5b69 camera2 docs: Fix instructions for using SurfaceView. 
Bug: 15597178
Change-Id: I802369e61725451ddd8df855c384608c80e12693
 2014-06-12 17:02:17 -07:00
Sol Boucher
b8cee5175d camera2: Remove stray </p> in CameraDevice#createCaptureSession 
This was causing strange indentation.
The change also clarifies how to get the supported output sizes in the
ImageReader flow: Although the doc (correctly) instructed the developer to use
StreamConfigurationMap#getOutputSizes(int) with an ImageReader, this instruction
appeared after the bulleted list of output types. Since all other items in that
list specify that getOutputSizes(Class<?>) should be used, the reader shouldn't
be expected to read beyond the list only in this specific case.

Bug: 15574400
Change-Id: Id952b46ae52322d75abbcaffea678d5ba50b22a5
 2014-06-12 17:39:11 +00:00