Commit Graph

50687 Commits

Author SHA1 Message Date
Hans Boehm
52bfb70cf8 am c11eca81: Merge "Remove incorrect android_atomic_...64 use."
* commit 'c11eca81e66892eb62a03b4553055197d122fe5b':
  Remove incorrect android_atomic_...64 use.
2014-08-06 21:21:05 +00:00
Michael Wright
9f6c3a8e01 am 278b525d: Add system accelerators for BACK and HOME.
* commit '278b525d25b852554015ec4f92862f9297b502fd':
  Add system accelerators for BACK and HOME.
2014-08-06 19:50:05 +00:00
Michael Wright
278b525d25 Add system accelerators for BACK and HOME.
Meta+Backspace -> BACK
Meta+Enter -> HOME

Bug: 14066931
Change-Id: Iff1d027300fa9911626785944a6d8efe4f62235e
2014-08-06 19:01:19 +00:00
Jesse Hall
83142a12fb am e2e17e5b: Merge "GlES2: Add NULL check"
* commit 'e2e17e5b238ccd214c72ec1a1864cf391425f09f':
  GlES2: Add NULL check
2014-08-06 17:22:52 +00:00
Aravind Akella
776a278905 am 8f3b7ce8: Merge "Sensor related changes for NDK." into lmp-dev
* commit '8f3b7ce889d7a371c2da18fe53d3b94e1430a90d':
  Sensor related changes for NDK.
2014-08-06 02:27:47 +00:00
Hans Boehm
c11eca81e6 Merge "Remove incorrect android_atomic_...64 use." 2014-08-06 02:12:31 +00:00
Jean-Michel Trivi
4b311c519f am e91cd213: AAC codec profile updates
* commit 'e91cd213d439c076051b1fb02c8bc40c11791dbb':
  AAC codec profile updates
2014-08-05 22:53:02 +00:00
Jean-Michel Trivi
e91cd213d4 AAC codec profile updates
Add new fields to OMX_AUDIO_PARAM_AACPROFILETYPE for
- SBR configuration
- decoder max number of channels
- decoder DRC parameters

Bug 16740915

Change-Id: Ib01822bc402fe9064c6c1c68b72c570cf72b7ecb
2014-08-05 22:34:37 +00:00
Brian Carlstrom
021843c78d am 8ce28672: Merge "Make system use patchoat to relocate during runtime."
* commit '8ce28672106956eeff6d0ed2d1d826ec192e58ee':
  Make system use patchoat to relocate during runtime.
2014-08-05 21:00:09 +00:00
Aravind Akella
8f3b7ce889 Merge "Sensor related changes for NDK." into lmp-dev 2014-08-05 17:41:31 +00:00
Aravind Akella
b37ba399c1 Sensor related changes for NDK.
i) ASensorManager_getDefaultSensor returns a wake-up/non wake-up sensor
      depending on the type.
   ii) Add ASensor_isWakeUpSensor and ASensorManager_getDefaultSensorEx
       methods.
Bug : 16399898
Change-Id: I1a86fb8d9de23039fdf41679d1487e1cd761a9d0
2014-08-05 17:17:51 -07:00
Jesse Hall
e2e17e5b23 Merge "GlES2: Add NULL check" 2014-08-05 17:41:26 +00:00
Anshuman Dani
0627071cc9 GlES2: Add NULL check
Check for NULL before calling thread specific glGetString.

CRs-fixed: 569609

Change-Id: Ifee8257152ba7ca7a05df5d7b113171b71d16c82
2014-08-06 21:53:35 +05:30
Brian Carlstrom
8ce2867210 Merge "Make system use patchoat to relocate during runtime." 2014-08-05 00:35:38 +00:00
Alex Light
7365a10689 Make system use patchoat to relocate during runtime.
Make installd understand a patchoat directive and carry it out.

Bug: 15358152

Change-Id: Ibe92d8b55a24bbf718b0416a21b76e5df7a2de26
2014-08-05 10:22:10 -07:00
Jeff Tinker
6a331b9179 am 812e039a: Merge "Allow device to be unprovisioned" into lmp-dev
* commit '812e039aeb42c1a3c8bb8246c114f54115a335da':
  Allow device to be unprovisioned
2014-08-04 20:56:23 +00:00
Brian Carlstrom
755d35f5fa am 74b3ecf4: Merge "Disable compilation based on vold.decrypt. [frameworks/native]"
* commit '74b3ecf485254d8cb4ae2b1d4d5221454738a58d':
  Disable compilation based on vold.decrypt. [frameworks/native]
2014-08-04 18:37:31 +00:00
Brian Carlstrom
6461ddb4e1 am 9c49e21d: Merge "Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/native]"
* commit '9c49e21d80cb55b7d77fdf118f06b88100141678':
  Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/native]
2014-08-04 18:37:26 +00:00
Jeff Tinker
812e039aeb Merge "Allow device to be unprovisioned" into lmp-dev 2014-08-01 13:51:29 +00:00
Eric Penner
3367a960ab am a02e9484: Merge "SurfaceFlinger: Prevent deadlock by updating an atomic layer set." into lmp-dev
* commit 'a02e9484be6894f8a4db7049d432f534a4e0a676':
  SurfaceFlinger: Prevent deadlock by updating an atomic layer set.
2014-08-01 13:48:37 +00:00
Brian Carlstrom
74b3ecf485 Merge "Disable compilation based on vold.decrypt. [frameworks/native]" 2014-08-01 08:22:51 +00:00
Brian Carlstrom
538998f204 Disable compilation based on vold.decrypt. [frameworks/native]
Bug: 15165413
Change-Id: Ibc39ab82e02e42345c6e2667ac45884f2e0cf7a4
2014-08-04 11:25:45 -07:00
Brian Carlstrom
9c49e21d80 Merge "Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/native]" 2014-08-01 01:50:59 +00:00
Jeff Tinker
bc6b9e7f8a Allow device to be unprovisioned
bug: 12247651
Change-Id: Ib0ec34da708b11a95da66c353d864bb87a6616c9
2014-07-31 10:27:53 -07:00
Aravind Akella
856ee46efd am 68fd9e71: Merge "Sensor.cpp changes." into lmp-dev
* commit '68fd9e71263cb16bbc4de1b5d26fbe4831480c9d':
  Sensor.cpp changes.
2014-07-31 16:55:59 +00:00
Lorenzo Colitti
414038acf3 am d4c3d389: Improve network connectivity dumping.
* commit 'd4c3d38957870fa27423dbc55d99d68772fbd490':
  Improve network connectivity dumping.
2014-07-31 02:04:20 +00:00
Lorenzo Colitti
d4c3d38957 Improve network connectivity dumping.
1. Explicitly dump IP addresses.

   Currently, some IP addresses are dumped using netcfg, but that
   only dumps the first IPv4 address on each interface. Instead,
   call ip -4 addr and ip -6 addr explicitly to dump all IPv4 and
   IPv6 addresses on the system.

2. Disable dumping /proc/net/{ipv6,}route, because:

 - We already dump all IPv4 and IPv6 routes in the tables that
   we use.
 - /proc/net/route is confusing because it only includes routes
   in the main table, which are all but unused. It's also in
   unreadable host-byte-order hex.
 - /proc/net/ipv6_route is confusing because it includes routes
   from all tables but does not say what table they are in.

3. Instead of dumping the contents of /proc/net/arp , use
   "ip -4 neigh show" and "ip -6 neigh show" to dump the
   neighbour caches for both IPv4 and IPv6.

Bug: 16663736
Change-Id: Id3e509b877ab7b00eb2399b6a9868b12245da2f0
2014-07-31 01:56:12 +00:00
Michael Lentine
45500a2512 am 9ae79d86: Build fix for size_t on 64bit.
* commit '9ae79d869a37633fa956a4f16f3fa45b23c189f1':
  Build fix for size_t on 64bit.
2014-07-30 23:51:11 +00:00
Michael Lentine
9ae79d869a Build fix for size_t on 64bit.
Change-Id: Ic16895b30d78ba8a635b709adbae31a590501b20
2014-07-30 16:42:12 -07:00
Aravind Akella
68fd9e7126 Merge "Sensor.cpp changes." into lmp-dev 2014-07-30 23:34:26 +00:00
Aravind Akella
64ffcb0944 Sensor.cpp changes.
1) Rename TILT_DETECTOR
  2) Set mFlags correctly for wake-up sensors.
  2) Log errors for incorrect sensor flags.

Change-Id: Ia449217d3b8a53353ad6b5c33c544ce37eb1de4f
2014-07-31 09:40:03 -07:00
Michael Lentine
82afbd1eeb am 258ee43f: Build fix for printf with int64 and size_t
* commit '258ee43fbcbc752cb08c134a12c08d5d99c4a866':
  Build fix for printf with int64 and size_t
2014-07-30 23:33:45 +00:00
Michael Lentine
258ee43fbc Build fix for printf with int64 and size_t
Change-Id: I642584cce7dd43e6d491a49228b0bce047d53354
2014-07-30 16:24:48 -07:00
Michael Lentine
134c268764 am fd9d183c: Build fix to use the correct source.
* commit 'fd9d183cd8c859ab8480dea572430398438ba8b5':
  Build fix to use the correct source.
2014-07-30 22:49:02 +00:00
Michael Lentine
fd9d183cd8 Build fix to use the correct source.
Change-Id: If36710be600dd0e15c31682e0343f281baa55627
2014-07-30 15:39:17 -07:00
Michael Lentine
7a35ea2c8d am 7306c670: Add error for format and make sure setActiveConfig fails with an invalid mode.
* commit '7306c670eb3ddb471d983a7458eb9f522afd0763':
  Add error for format and make sure setActiveConfig fails with an invalid mode.
2014-07-30 22:25:08 +00:00
Michael Lentine
60ac446e9e am 47e45405: Allow for resizing of Virtual Displays.
* commit '47e45405d1533aa73307014f7bf371e118695cf3':
  Allow for resizing of Virtual Displays.
2014-07-30 22:25:07 +00:00
Brian Carlstrom
cf51ba1360 Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [frameworks/native]
This will allow us to conditionally change the compiler-filter based on other properties.

Bug: 15165413
Change-Id: Iff27dc2904f4f0d7c25a684cd6ba16a597f252fd
2014-07-30 14:36:35 -07:00
Michael Lentine
7306c670eb Add error for format and make sure setActiveConfig fails with an invalid mode.
Change-Id: Iacdb5cbad125787f96c64c88d432fc541c4cad1a
2014-07-30 14:36:25 -07:00
Michael Lentine
47e45405d1 Allow for resizing of Virtual Displays.
Modify SurfaceFlinger to use VirtualDisplaySurface in all cases when a virtual
display is used. Add functionality in VirtualDisplaySurface to resize the
buffers aquired in the QueueBufferOutput. Add transaction support in
SurfaceFlinger for resize. Add the modification of the size in DisplayDevice.

Change-Id: Iae7e3556dc06fd18d470adbbd76f7255f6e6dd6b
Tested: None
2014-07-30 14:36:25 -07:00
Michael Wright
57d730041d am 1f6078ae: Have VirtualDisplays send SF resize messages when resizing
* commit '1f6078aef71b1d3f080cd565adbec350c71088dd':
  Have VirtualDisplays send SF resize messages when resizing
2014-07-30 21:34:46 +00:00
Michael Wright
1f6078aef7 Have VirtualDisplays send SF resize messages when resizing
Change-Id: I76d15b22099a659450ec875836c9bf2b6584838f
2014-07-30 11:23:44 -07:00
Michael Lentine
9a7c0615e5 am 99c7dc59: Merge "Modified SurfaceFlinger to implment setActiveConfig and getActiveConfig." into lmp-dev
* commit '99c7dc596adeef45604a596075043e1f37daf7ca':
  Modified SurfaceFlinger to implment setActiveConfig and getActiveConfig.
2014-07-30 18:03:04 +00:00
Michael Lentine
63c80705e8 am cd36eb44: Merge "Modify EGL to disconnect the window when the surface gets destroyed." into lmp-dev
* commit 'cd36eb445bcc55c88e157584d9ac229280459463':
  Modify EGL to disconnect the window when the surface gets destroyed.
2014-07-30 17:30:48 +00:00
Michael Lentine
99c7dc596a Merge "Modified SurfaceFlinger to implment setActiveConfig and getActiveConfig." into lmp-dev 2014-07-30 16:17:51 +00:00
Eric Penner
a02e9484be Merge "SurfaceFlinger: Prevent deadlock by updating an atomic layer set." into lmp-dev 2014-07-29 21:36:00 +00:00
Eric Penner
51c59cd1e7 SurfaceFlinger: Prevent deadlock by updating an atomic layer set.
Bug: 12934849

Change-Id: I9dede7316f1e967de4140bd731ac810115ea302f
2014-07-30 19:05:38 -07:00
Aravind Akella
2981b36e51 am 330cf473: Merge "Remove WAKE_UP_* sensor constants." into lmp-dev
* commit '330cf47336bc52e02a11954281486b38b3e7e6ad':
  Remove WAKE_UP_* sensor constants.
2014-07-29 19:13:26 +00:00
Michael Lentine
6c9e34a98a Modified SurfaceFlinger to implment setActiveConfig and getActiveConfig.
This can be used to change the current display mode of the device.

Change-Id: Icdc3fb58389b861dc77b68102083da6f7a96eccb
Tested: None
(cherry picked from commit 2651fa9463)
2014-07-29 16:56:30 +00:00
Riley Andrews
2c16ba8cc1 am 03414a1c: Turn on support for async cursor update in surfaceflinger.
* commit '03414a1cfe6c1222fd7723949bd622f9cba145aa':
  Turn on support for async cursor update in surfaceflinger.
2014-07-28 23:58:30 +00:00