Steve McKay
c89cc4419e
Merge "Add test size annotations to docsui tests."
2015-11-16 19:47:53 +00:00
Jeffrey Vander Stoep
25bfb2b3d8
Merge "pm: selinux support for AutoPlay apps"
2015-11-16 19:38:33 +00:00
Erik Wolsheimer
fa17e61291
Log errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9 am: b45defae8e am: 529893f84c am: 7698dd970f
...
am: ae4ab3501a
* commit 'ae4ab3501a0400940ace2d0bfdf0d7021c740603':
Log errno when dup fd cannot be allocated BUG: 25165471
2015-11-16 19:26:12 +00:00
Chris Craik
98787e6c9b
Finish shadow support in new reorderer/renderer
...
Now passes alphas and light radius, and correctly transforms light
center for layers.
Also fixes begin-frame/layer clears to be damage rect aware.
Change-Id: I3b1415cd7bf1518c510145ebebdb745f494a2542
2015-11-16 11:21:18 -08:00
Erik Wolsheimer
ae4ab3501a
Log errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9 am: b45defae8e am: 529893f84c
...
am: 7698dd970f
* commit '7698dd970fbfb81fcdc700827c1620440c6e81a1':
Log errno when dup fd cannot be allocated BUG: 25165471
2015-11-16 19:20:35 +00:00
Erik Wolsheimer
7698dd970f
Log errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9 am: b45defae8e
...
am: 529893f84c
* commit '529893f84cc62893ad6111816954b0bc7c829cee':
Log errno when dup fd cannot be allocated BUG: 25165471
2015-11-16 19:12:17 +00:00
Erik Wolsheimer
2fba776ee0
Log errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9
...
am: b45defae8e
* commit 'b45defae8e61a4fa3aba9dd08480861d10f5982a':
Log errno when dup fd cannot be allocated BUG: 25165471
2015-11-16 19:03:53 +00:00
Erik Wolsheimer
529893f84c
Log errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9
...
am: b45defae8e
* commit 'b45defae8e61a4fa3aba9dd08480861d10f5982a':
Log errno when dup fd cannot be allocated BUG: 25165471
2015-11-16 19:03:52 +00:00
Erik Wolsheimer
b45defae8e
Log errno when dup fd cannot be allocated BUG: 25165471
...
am: 211abad3b9
* commit '211abad3b92b70dd094949c79f67e686c940fa0c':
Log errno when dup fd cannot be allocated BUG: 25165471
2015-11-16 18:55:29 +00:00
Selim Cinek
54d8539d09
Merge "Fixed a crash with the heads up manager"
2015-11-16 18:52:32 +00:00
Selim Cinek
81831c9cd3
Merge "Fixed error in GroupManager"
2015-11-16 18:46:33 +00:00
Selim Cinek
f5fae39a55
Merge "Fixed a bug where a notification could get removed"
2015-11-16 18:44:56 +00:00
Todd Kennedy
3b91bd2173
resolved conflicts for 7de7e0b0 to stage-aosp-master
...
(cherry picked from commit 9f8602644418ecfb1a5c9555792ceed285fa72bd)
Change-Id: I4e45e5bbaebb98b0e740167eaf7517f99d917f30
2015-11-16 10:43:53 -08:00
Badhri Jagan Sridharan
4f72447fbf
BatteryService: Add Max charging voltage
...
Bug: 25229483
Change-Id: Ibeba97eb145c3d59a763bd8632ab7fcc43118e4b
(cherry picked from commit f92fcfe36ad841cba4774e7f2129e8dab7ac784a)
2015-11-16 10:43:52 -08:00
Martijn Coenen
75603fb707
Stop setting swappiness.
...
We're re-enabling memory cgroups on Ariel
to use user-space lmkd. As a side-effect, this
code will start setting swappiness again. Since the
benefit of swappiness is unknown at this point
(see b/18248535 for details), disable it until
we have good data it helps.
Change-Id: I8e8b892ba0db27469f2d47615f71ce1d2712acbf
2015-11-16 10:43:52 -08:00
Selim Cinek
d18a45743f
Merge "Allow clicking fullscreen intent notifications now"
2015-11-16 18:43:33 +00:00
John Reck
1540153198
Extensions must load in ctor
...
Because Caches is terrible
Change-Id: I91e2442d97664759ee2c7602eb7172f009b20d53
2015-11-16 10:42:36 -08:00
Erik Wolsheimer
211abad3b9
Log errno when dup fd cannot be allocated
...
BUG: 25165471
Change-Id: I7342e2b4c566325fc2e15643a7c7b6ba989ee8c7
2015-11-16 10:29:20 -08:00
Tony Mantler
80ac37d033
Merge "Move some methods to DeviceInfoUtils in SettingsLib"
2015-11-16 18:12:51 +00:00
Alex Klyubin
8e028e6507
Insert Android Keystore JCA Provider at the correct position.
...
Security.insertProviderAt uses 1-based positions whereas the
AndroidKeyStoreProvider.install code was incorrectly passing in
0-based positions, thus installing the AndroidKeyStoreBCWorkaround
provider one level higher than intended. This change fixes the issue
in AndroidKeyStoreProvider.
Bug: 25399691
Change-Id: I4a66bf37c0d151edb9a2349db9d91939064c0574
2015-11-16 10:11:50 -08:00
Geoff Mendal
e490a14629
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 812794f0f5 -s ours
...
am: f39bb92f5a -s ours
* commit 'f39bb92f5a90b9d3e2e958535c16eee5a7aacd97':
Import translations. DO NOT MERGE
2015-11-16 17:50:57 +00:00
Alan Viverette
5482308a0a
Merge "Clean up usage of temporary TypedValue in Resources"
2015-11-16 17:46:58 +00:00
Tony Mantler
e92cf6d739
Move some methods to DeviceInfoUtils in SettingsLib
...
Change-Id: I646c89c2803e4386a4b24f10ec186871768e7239
2015-11-16 09:44:52 -08:00
Geoff Mendal
f39bb92f5a
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
...
am: 812794f0f5 -s ours
* commit '812794f0f5dfba607bcdd648611317df10ca0d49':
Import translations. DO NOT MERGE
2015-11-16 17:44:03 +00:00
Geoff Mendal
812794f0f5
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
2015-11-16 17:39:29 +00:00
Geoff Mendal
19c3f7fa2f
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: f34cefdc2d -s ours am: ee144ce3ba -s ours
...
am: 62f520fc88 -s ours
* commit '62f520fc8872fed4b5289afdd9ab94141711e73a':
Import translations. DO NOT MERGE
2015-11-16 17:37:07 +00:00
Geoff Mendal
fd1c8b3cda
Import translations. DO NOT MERGE
...
Change-Id: Ie5a78ca8aadcfd06937b3c917e9d7c99cdc1da0c
Auto-generated-cl: translation import
2015-11-16 18:31:23 +01:00
Geoff Mendal
62f520fc88
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am: f34cefdc2d -s ours
...
am: ee144ce3ba -s ours
* commit 'ee144ce3baec585e19da454de95d05ed0f1a0bcf':
Import translations. DO NOT MERGE
2015-11-16 17:29:04 +00:00
Geoff Mendal
ee144ce3ba
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
...
am: f34cefdc2d -s ours
* commit 'f34cefdc2d7d2e1b702a5af8f31bdebba455f81d':
Import translations. DO NOT MERGE
2015-11-16 17:22:23 +00:00
Geoff Mendal
f34cefdc2d
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
2015-11-16 17:17:31 +00:00
Geoff Mendal
f9489a4fb7
Import translations. DO NOT MERGE
...
Change-Id: I1d71c3b6382fb097a4c33f0210138537b48215f0
Auto-generated-cl: translation import
2015-11-16 18:16:28 +01:00
Geoff Mendal
8116caa954
Merge "Import translations. DO NOT MERGE"
2015-11-16 17:04:31 +00:00
Geoff Mendal
1c1aed1c12
Import translations. DO NOT MERGE
...
Change-Id: Ieb29e82bd8fe81930b730e3334f59d496dfd785c
Auto-generated-cl: translation import
2015-11-16 18:01:32 +01:00
Filip Gruszczynski
362c722245
Merge "Split ActivityStack.ensureActivitiesVisibleLocked."
2015-11-16 16:58:13 +00:00
Bryce Lee
0db53d90a0
Add Bluetooth headset API to allow disabling audio route.
...
This functionality is required by devices which have multiple profiles
using the SCO channel. For example, a device that is both a HFP AG and HF.
In this case, we must explicitly notify the profiles when they can acquire
the channel as they are not aware of each other. A similar change was
previously added to the Bluetooth Headset Client profile.
Bug: 25485578
Change-Id: Ia60cfdd33c2c3c3f185464b24056f8ccb976056d
2015-11-16 08:55:52 -08:00
Mark Salyzyn
45f88d02de
Merge "Revert "jni: is loggable speedup, not within signal"" am: 3c54ed00f3
...
am: c53dad8d16
* commit 'c53dad8d16c552d06ac4acb8ddbd937bda2d26d7':
Revert "jni: is loggable speedup, not within signal"
2015-11-16 16:42:51 +00:00
Mark Salyzyn
c53dad8d16
Merge "Revert "jni: is loggable speedup, not within signal""
...
am: 3c54ed00f3
* commit '3c54ed00f390e0ce9c555eb517594628b362705f':
Revert "jni: is loggable speedup, not within signal"
2015-11-16 16:35:58 +00:00
Mark Salyzyn
3c54ed00f3
Merge "Revert "jni: is loggable speedup, not within signal""
2015-11-16 16:30:57 +00:00
Mark Salyzyn
9f5de191e8
Merge "Revert "jni: is loggable speedup, not within signal""
2015-11-16 16:30:42 +00:00
Mark Salyzyn
b761d04824
Revert "jni: is loggable speedup, not within signal"
...
(cherry pick of commit 421d434818aae0977b5b044dd88555a2261efac1)
This reverts commit c954fde0b6e31ec99509faf0bbc33c4c9e4d012a.
Bug: 25693940
Change-Id: I568051aad39e215d677318cd5758962e562187ef
2015-11-16 08:29:03 -08:00
Mark Salyzyn
421d434818
Revert "jni: is loggable speedup, not within signal"
...
This reverts commit c954fde0b6e31ec99509faf0bbc33c4c9e4d012a.
Bug: 25693940
Change-Id: I568051aad39e215d677318cd5758962e562187ef
2015-11-16 16:26:44 +00:00
Alan Viverette
49f3bc3dbf
Merge "Obtain cached drawables using the correct Resources object"
2015-11-16 15:22:19 +00:00
Alan Viverette
4d07bc99f0
Clean up usage of temporary TypedValue in Resources
...
Reduces the amount of time that a lock is held and reduces the scope of
the lock to only manage the temporary TypedValue. Also ensures that the
typed value is consistently returned to the (single item) pool.
Additionally, performs some refactoring:
- removes unused variables and constants
- moves the NotFoundException cause into the constructor for consistency
with other Exceptions
- inlines sPreloadedDensity which was not used anywhere
- fixes line wrapping and indentation in nearby code
Aside from improvements to locking, there are no functional changes in
this CL.
Change-Id: I8c3059261e3cc2288a086e6637ab946e0b7d3741
Clean up usage of temporary TypedValue in Resources
Reduces the amount of time that a lock is held and reduces the scope of
the lock to only manage the temporary TypedValue. Also ensures that the
typed value is consistently returned to the (single item) pool.
Additionally, performs some refactoring:
- removes unused variables and constants
- moves the NotFoundException cause into the constructor for consistency
with other Exceptions
- inlines sPreloadedDensity which was not used anywhere
- fixes line wrapping and indentation in nearby code
Aside from improvements to locking, there are no functional changes in
this CL.
Change-Id: I8c3059261e3cc2288a086e6637ab946e0b7d3741
2015-11-16 10:19:12 -05:00
Alan Viverette
477f3d092d
Obtain cached drawables using the correct Resources object
...
Previously we were discarding the Resources when forwarding from the
two-arg factory method to the one-arg method. This CL also updates the
documentation for ConstantState to be slightly more comprehensive.
Bug: 25688078
Change-Id: I4fbbf43f95fe792fa6f0bf9db8fd9a7cbfa51d1d
2015-11-16 10:12:44 -05:00
Geoff Mendal
3adea47fd9
Import translations. DO NOT MERGE am: 83d65fea01 -s ours am: a6c50551cd -s ours am: 4510d17575 -s ours am: fb17593356 -s ours
...
am: b781c9593f -s ours
* commit 'b781c9593f1ccf0dba818a52285c531669d06bf8':
Import translations. DO NOT MERGE
2015-11-16 14:42:00 +00:00
Geoff Mendal
b781c9593f
Import translations. DO NOT MERGE am: 83d65fea01 -s ours am: a6c50551cd -s ours am: 4510d17575 -s ours
...
am: fb17593356 -s ours
* commit 'fb175933566d5869e4d069334abec82f67665083':
Import translations. DO NOT MERGE
2015-11-16 14:26:51 +00:00
Robin Lee
edbdb31274
Merge "Take out nested synchronisation from LockdownVpn"
2015-11-16 14:22:54 +00:00
Geoff Mendal
fb17593356
Import translations. DO NOT MERGE am: 83d65fea01 -s ours am: a6c50551cd -s ours
...
am: 4510d17575 -s ours
* commit '4510d175753dc4439411b19963cb4bd8bde2c2f4':
Import translations. DO NOT MERGE
2015-11-16 14:10:31 +00:00
Geoff Mendal
c94a189e5f
Import translations. DO NOT MERGE am: 83d65fea01 -s ours
...
am: a6c50551cd -s ours
* commit 'a6c50551cdcbb70d5d65dbfe68c23e74eea245d9':
Import translations. DO NOT MERGE
2015-11-16 13:54:52 +00:00
Geoff Mendal
4510d17575
Import translations. DO NOT MERGE am: 83d65fea01 -s ours
...
am: a6c50551cd -s ours
* commit 'a6c50551cdcbb70d5d65dbfe68c23e74eea245d9':
Import translations. DO NOT MERGE
2015-11-16 13:54:50 +00:00