230020 Commits

Author SHA1 Message Date
John Reck
465eefb9f3 Merge "fix race condition between HWUI cache and renderThread" am: 2c2b5e8514
am: 4354ae9883

* commit '4354ae9883ae1282ac457539f46d529bdfa89fec':
  fix race condition between HWUI cache and renderThread
2016-01-19 18:42:21 +00:00
John Reck
4354ae9883 Merge "fix race condition between HWUI cache and renderThread"
am: 2c2b5e8514

* commit '2c2b5e8514247d8524778d209f26b7dbde19d142':
  fix race condition between HWUI cache and renderThread
2016-01-19 18:38:11 +00:00
John Reck
2c2b5e8514 Merge "fix race condition between HWUI cache and renderThread" 2016-01-19 18:29:30 +00:00
Jason Monk
9e5341f4fe Tuner control over volume policy.
Change-Id: Ic96ad05a9aab6fc2a1669cfe5f1ba1f3779e1b5e
2016-01-19 18:22:33 +00:00
Jason Monk
6e580aef16 Merge "Add zen panel to volume dialog again in tuner" 2016-01-19 18:22:13 +00:00
John Reck
411e2ee4d9 Merge "Revert "Switch to new rendering pipeline"" 2016-01-19 17:48:22 +00:00
Clara Bayarri
f3c5834c42 Merge "Work Challenge unlock to home instead of locked app" 2016-01-19 17:47:40 +00:00
Clara Bayarri
f0649ceb80 Work Challenge unlock to home instead of locked app
When a Work Challenge is in place and we are unlocking the device
to a foreground work app that should be locked, take the user to the
home screen instead to avoid them seeing two lock screens in a row.

Bug: 26579952
Change-Id: I6220aac730fbb1da3c3042d0f232cb9cbb18ec4b
2016-01-19 17:47:03 +00:00
John Reck
1b94f9b77c Revert "Switch to new rendering pipeline"
This reverts commit 3daf4d3272f2cc6ce3b5a572b9d4dcce1654086d.

Temporarily disable due to high rate of crashes from endLayer check

Bug: 26609444
Change-Id: I7583a77bf5cc1e722fa4042db0542f80cd978760
2016-01-19 09:44:39 -08:00
Chet Haase
2b87fe0e09 Merge "Add AutoCancelTest back to framework tests" 2016-01-19 17:33:14 +00:00
Jonathan Basseri
663d09ab42 Merge "Un-hide carrier config keys." 2016-01-19 17:09:50 +00:00
Akshay Kannan
e1bb8f5b51 Merge "Flip EMERGENCY_ASSISTANCE_ENABLED to true Bug: 23591361" 2016-01-19 17:08:50 +00:00
Chet Haase
7d97a72da2 Add AutoCancelTest back to framework tests
This test used to fail consistently, but currently passes.
Adding it back to see whether whatever was causing it to fail has
since been fixed. If not, need to get failure logs to see what the problem
is during the automatic runs.

Issue #23807249 Fix AutoCancelTest or delete it

Change-Id: Ied0e0d3a700d9ba36d4d5ef8ca95b8072e639851
2016-01-19 08:54:37 -08:00
Robin Lee
a75d7008d1 Merge "[VPN] start lockdown before user is unlocked" 2016-01-19 16:51:56 +00:00
Robin Lee
9a5f48535d [VPN] start lockdown before user is unlocked
Removed the dependency on KeyStore encryption by removing that flag for
VPN profiles which don't use secure credentials when saving in Settings.

Old encrypted profiles will simply fail to load untile USER_PRESENT is
sent, as before.

Bug: 26108660
Change-Id: I2677d741d54252f15cb772c94ce1b39041f1e19c
2016-01-19 16:40:20 +00:00
Diego Perez
82b425f853 Fix bug in PropertyValuesHolder_Delegate method index am: ada8c117b1
am: 0eac32be0b

* commit '0eac32be0b7804184ad5e61af87f79d45b82c6b2':
  Fix bug in PropertyValuesHolder_Delegate method index
2016-01-19 15:53:12 +00:00
Diego Perez
0eac32be0b Fix bug in PropertyValuesHolder_Delegate method index
am: ada8c117b1

* commit 'ada8c117b197dd61bd472399147dd18ff337a204':
  Fix bug in PropertyValuesHolder_Delegate method index
2016-01-19 15:49:16 +00:00
John Reck
7d569db936 Merge "Hard-abort tests if LOG_ALWAYS_FATAL" 2016-01-19 15:38:16 +00:00
Martijn Coenen
6f9595382c Merge "NFC: Allow apps to specify they're done with tag." 2016-01-19 15:32:36 +00:00
Jason Monk
e138f55512 Add zen panel to volume dialog again in tuner
Change-Id: Ie74a6bd8ecd7f2d8b16e96cc0087e63796d5f9a2
2016-01-19 15:30:07 +00:00
Rubin Xu
058576f13e Merge "Reload active profiles when constructing WorkModeTile" 2016-01-19 14:24:45 +00:00
Shreyas Basarge
3dbb412c94 Merge "Fix for possible NPE in JobScheduler" 2016-01-19 11:46:37 +00:00
Diego Perez
ada8c117b1 Fix bug in PropertyValuesHolder_Delegate method index
The method index in PropertyValuesHolder was using only the method name
+ the number of parameters in the call to index the different properties
methods. This worked ok most of the time because, for a given method
name (let's say setTrimStartOffset), the class is usually the same.
However, if the same method name is used in multiple classes, this will
cause collisions and will most likely crash.

Change-Id: Ie6fa8872c5c5e69e690f4f1bb79191a31bef2a28
2016-01-19 10:42:19 +00:00
Diego Perez
365bd8f9b1 New path interpolation to paint vector drawables am: b9c48d8f49
am: 6952063e71

* commit '6952063e7166599f5300427019ca845bbaafa660':
  New path interpolation to paint vector drawables
2016-01-19 10:39:46 +00:00
Diego Perez
6952063e71 New path interpolation to paint vector drawables
am: b9c48d8f49

* commit 'b9c48d8f49d35e2682c7205a9d8d5fcc25d7c736':
  New path interpolation to paint vector drawables
2016-01-19 10:35:49 +00:00
Diego Perez
b9c48d8f49 New path interpolation to paint vector drawables
Before this CL, PathMeasure_Delegate would use Path_Delegate.approximate
to get a path segment to draw. Path_Delegate.approximate uses a
flattening iterator to do the path approximation.
Unfortunately, because we do not control the stroke mode while painting,
in some cases the approximation would draw unwanted artifacts caused by
the rough approximation and the use of wrong miter values.
This CL does a much better calculation of the path and interpolates the
segments of the curves instead of replacing them with line segments.

This also fixes an issue with the calculation of empty paths.

Bug: http://b.android.com/187256

Change-Id: I450f7aa4c3d9efcbf902a40c3b4d6d388546893f
2016-01-19 10:14:46 +00:00
Thomas Buhot
c0a0e1a66d fix race condition between HWUI cache and renderThread
getMaximumBitmapWidth() and getMaximumBitmapHeight() of DisplayListCanvas
need HWUI cache instance. Since the initialization of the cache is
asynchronous it may crash if not yet ready. Add a staticFence() call
to guarantee the cache has been created prior issuing the call.

Change-Id: I5ed9e5cc084444c8d1872a77fef50e294ae14e93
Signed-off-by: Thomas Buhot <thomas.buhot@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
2016-01-19 15:00:42 +08:00
Filip Gruszczynski
a0b16caf88 Merge "Fix several small logging issues." 2016-01-19 04:18:59 +00:00
Daichi Hirono
4ba6303a80 Merge "Start to use app fuse in MtpDocumentsProvider." 2016-01-19 03:24:00 +00:00
Filip Gruszczynski
d3d9ddfa72 Merge "Temporary logging to debug ActivityStarter crash." 2016-01-19 02:31:18 +00:00
Filip Gruszczynski
6cf93664f6 Merge "Fix NPE when checking if recents should be launched in docked mode." 2016-01-19 02:29:17 +00:00
Daichi Hirono
f52ef008c7 Start to use app fuse in MtpDocumentsProvider.
BUG=25756419

Change-Id: I050e7cf7523926710291875737602e95c47be088
2016-01-19 11:20:59 +09:00
Jaesung Chung
90131a9189 Merge "Extend MediaScanner and MtpDatabase to support RAW image files" 2016-01-19 01:17:18 +00:00
Daichi Hirono
35fb36b222 Merge "Clean MtpManagerTest code." 2016-01-19 00:48:28 +00:00
Jaesung Chung
5a8b9627c7 Extend MediaScanner and MtpDatabase to support RAW image files
Bug: 25871812
Change-Id: Iee92632585dc9020238a9b562defd06d6d2a91dc
2016-01-19 09:43:35 +09:00
Jaesung Chung
1c78b60a49 Merge "ExifInterface: add support for reading metadata from RAW images" 2016-01-19 00:37:13 +00:00
Martijn Coenen
3748600bad NFC: Allow apps to specify they're done with tag.
When an application is no longer interested in
communicating with a tag, but the tag is kept in
range of the device for a long amount of time, we
will burn a lot of power keeping the connection
to it alive.

Instead, allow the app to signal it's "done" with
the tag, which allows us to put the controller
in a low-power mode. This will save power in scenarios
such as an NFC tag embedded in a car dock or
wireless charging dock.

Bug: 26426491
Change-Id: I7a0149ede46e0c7610b06ed1776344b772677350
2016-01-18 14:53:28 -08:00
Neil Fuller
4370fba554 Merge "Fix for Settings timezone names when boot time is wrong" 2016-01-18 19:01:41 +00:00
Sudheer Shanka
e50cad066e Merge "Add an util method and update setMenuItemAsDisabledByAdmin." 2016-01-18 18:28:55 +00:00
Filip Gruszczynski
198dcbf523 Fix several small logging issues.
This includes:
1) invert HIDE_STACK_CRAWLS to SHOW_STACK_CRAWLS so it's immediately
clear from the config file that something is enabled (if anything is
true).
2) Merge stack collection code into a method, so we can remove the
repeated code.
3) Remove copying of some constants in AppTransition and just import
them directly.

Change-Id: I3190ee0a5963720ac6285b4f48b2705e84f04ab5
2016-01-18 10:20:25 -08:00
Sudheer Shanka
a8f8fb4f8a Merge "Add extra utility method to RestrictedLockUtils." 2016-01-18 18:00:44 +00:00
Geoff Mendal
c6eb188430 Merge "Import translations. DO NOT MERGE" 2016-01-18 17:48:13 +00:00
Geoff Mendal
3f0dacfda2 Import translations. DO NOT MERGE
Change-Id: Ie34a0366716390f8027fafe3818510be86f8f2fe
Auto-generated-cl: translation import
2016-01-18 18:43:11 +01:00
Sudheer Shanka
ba4a49800e Merge "Remove spacing when removing padlock and add more util methods." 2016-01-18 17:24:19 +00:00
Sudheer Shanka
20e22960cb Remove spacing when removing padlock and add more util methods.
When adding the padlock, a space is appended to the string which needs
to removed along with the padlock. And added more utility methods in
RestrictedLockUtils.

Change-Id: I33f976db23bfdd39d76c4201be0727bfafb00fd4
2016-01-18 17:16:45 +00:00
Alan Treadway
8b15c9c565 Merge "Fix documentation for hidden intent." 2016-01-18 16:51:12 +00:00
Alan Treadway
1a538d0d3c Fix documentation for hidden intent.
Change-Id: If3325f75cff759260e42e5b3782c267cb7c1f001
2016-01-18 16:42:30 +00:00
Sudheer Shanka
476da95b28 Merge "Check for null values when copying enforcedAdmin in QSTile.State." 2016-01-18 16:11:42 +00:00
Sudheer Shanka
1c09db211c Check for null values when copying enforcedAdmin in QSTile.State.
Bug: 26612685
Change-Id: I8228d1dffc3623d3589b51c6c33f07cc53605ef2
2016-01-18 16:05:10 +00:00
Geoff Mendal
2435f34242 Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 7819c3b859 -s ours
am: 26ada7e789  -s ours

* commit '26ada7e78993241d702a908eae93d174cbb3c8b3':
  Import translations. DO NOT MERGE
2016-01-18 15:31:19 +00:00