OSDN Git Service
Michael Kwan [Tue, 17 Nov 2015 23:57:12 +0000 (23:57 +0000)]
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. am:
8d6630b87c -s ours am:
f23229f45f -s ours am:
b0aae584ea -s ours
am:
2c8f3734af -s ours
* commit '
2c8f3734afd5f104166bfb045794970414eb5052':
Rom Lemarchand [Tue, 17 Nov 2015 23:38:50 +0000 (15:38 -0800)]
resolve merge conflicts of
5032e49f9e to mnc-dr2-dev-plus-aosp.
Change-Id: If4a565a262befdc3d6e206c892e2be9711d52c0f
Eino-Ville Talvala [Tue, 17 Nov 2015 23:05:48 +0000 (23:05 +0000)]
Erik Wolsheimer [Tue, 17 Nov 2015 23:04:24 +0000 (23:04 +0000)]
Geoff Mendal [Tue, 17 Nov 2015 23:02:57 +0000 (23:02 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am:
812794f0f5 -s ours
* commit '
812794f0f5dfba607bcdd648611317df10ca0d49':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 17 Nov 2015 23:01:15 +0000 (23:01 +0000)]
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
Geoff Mendal [Tue, 17 Nov 2015 22:59:32 +0000 (22:59 +0000)]
Import translations. DO NOT MERGE am:
83d65fea01 -s ours am:
a6c50551cd -s ours am:
4510d17575 -s ours
am:
fb17593356 -s ours
* commit '
fb175933566d5869e4d069334abec82f67665083':
Stephen Hines [Tue, 17 Nov 2015 22:37:34 +0000 (22:37 +0000)]
Merge "Remove unsupported RS graphics API tests." am:
7ea808b177
am:
5a0a713147
* commit '
5a0a713147a76195ae21d53d065633f117271793':
Remove unsupported RS graphics API tests.
Stephen Hines [Tue, 17 Nov 2015 22:28:45 +0000 (22:28 +0000)]
Merge "Remove unsupported RS graphics API tests."
am:
7ea808b177
* commit '
7ea808b17736f690eb8d23729f33e9a612b0492c':
Remove unsupported RS graphics API tests.
Stephen Hines [Tue, 17 Nov 2015 22:16:35 +0000 (22:16 +0000)]
Merge "Remove unsupported RS graphics API tests."
Michael Wright [Tue, 17 Nov 2015 21:37:25 +0000 (21:37 +0000)]
DO NOT MERGE. Prevent recents from coming up when in SUW am:
84669ca8de am:
614ea46405 am:
bd23716585 -s ours am:
18a2ac0506 am:
08ed2bc083 am:
41ef58be3e
am:
8aa7e6a21a
* commit '
8aa7e6a21a3428741159de2e28d87acb8b420e96':
DO NOT MERGE. Prevent recents from coming up when in SUW
Michael Wright [Tue, 17 Nov 2015 21:18:16 +0000 (21:18 +0000)]
DO NOT MERGE. Prevent recents from coming up when in SUW am:
84669ca8de am:
614ea46405 am:
bd23716585 -s ours am:
18a2ac0506 am:
08ed2bc083
am:
41ef58be3e
* commit '
41ef58be3e5a968c58ed138861ab6a0f7ff013a6':
DO NOT MERGE. Prevent recents from coming up when in SUW
Chad Brubaker [Tue, 17 Nov 2015 21:18:12 +0000 (21:18 +0000)]
Merge "Add NetworkSecurityConfigProvider.install" am:
08181cf647
am:
97f92ce41e
* commit '
97f92ce41e66b54e56733f18bdaae056f08c0ae7':
Add NetworkSecurityConfigProvider.install
Michael Wright [Tue, 17 Nov 2015 20:59:42 +0000 (20:59 +0000)]
DO NOT MERGE. Prevent recents from coming up when in SUW am:
84669ca8de am:
614ea46405 am:
bd23716585 -s ours am:
18a2ac0506
am:
08ed2bc083
* commit '
08ed2bc083fe142ea6f89f97172543327f423e61':
DO NOT MERGE. Prevent recents from coming up when in SUW
Chad Brubaker [Tue, 17 Nov 2015 20:59:04 +0000 (20:59 +0000)]
Merge "Add NetworkSecurityConfigProvider.install"
am:
08181cf647
* commit '
08181cf647b1a1e440528f3f58ef6bf4e98a4832':
Add NetworkSecurityConfigProvider.install
Deepanshu Gupta [Tue, 17 Nov 2015 20:50:07 +0000 (20:50 +0000)]
Revert "LayoutLib: Fix true transparency in status bar."
am:
4ea74d2960
* commit '
4ea74d2960688db6aa13452765dd5f2d07a40189':
Revert "LayoutLib: Fix true transparency in status bar."
Chad Brubaker [Tue, 17 Nov 2015 20:46:49 +0000 (20:46 +0000)]
Merge "Add NetworkSecurityConfigProvider.install"
Michael Wright [Tue, 17 Nov 2015 20:41:39 +0000 (20:41 +0000)]
DO NOT MERGE. Prevent recents from coming up when in SUW am:
84669ca8de am:
614ea46405 am:
bd23716585 -s ours
am:
18a2ac0506
* commit '
18a2ac0506ec834c2522de94040dab9e77304e7b':
DO NOT MERGE. Prevent recents from coming up when in SUW
Deepanshu Gupta [Tue, 17 Nov 2015 20:32:31 +0000 (20:32 +0000)]
Merge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev
am:
42a893b50b
* commit '
42a893b50b2763d7a2a3da4006c9433afaf86cfd':
AppCompatActionBar: use findClass to test presence
Deepanshu Gupta [Tue, 17 Nov 2015 19:42:42 +0000 (11:42 -0800)]
Revert "LayoutLib: Fix true transparency in status bar."
This reverts commit
4eb298a941c3f465944b63f1a06518e911681c89.
Even though this is techinically closer to what the framework does, the
fix is not complete. As a result, it looks worse when using AppCompat
themes. Revert the change for the release.
Change-Id: I67c1002ea17dee7234d78e2d13aab876467bd70f
Michael Wright [Tue, 17 Nov 2015 20:24:16 +0000 (20:24 +0000)]
DO NOT MERGE. Prevent recents from coming up when in SUW am:
84669ca8de am:
614ea46405
am:
bd23716585 -s ours
* commit '
bd23716585bd21b4dc4bf87bd56ce588c8d457df':
DO NOT MERGE. Prevent recents from coming up when in SUW
Svetoslav Ganov [Tue, 17 Nov 2015 20:24:06 +0000 (20:24 +0000)]
Merge "Handle renamed packages during default grants" am:
140b101fcd
am:
60cb22008c
* commit '
60cb22008c602c5345504eacb4eb68ea0ac69cf0':
Handle renamed packages during default grants
Deepanshu Gupta [Tue, 17 Nov 2015 20:22:43 +0000 (20:22 +0000)]
Merge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev
Michael Wright [Tue, 17 Nov 2015 20:06:27 +0000 (20:06 +0000)]
DO NOT MERGE. Prevent recents from coming up when in SUW am:
84669ca8de
am:
614ea46405
* commit '
614ea464051835e1c2267ef2bc343f98b62b177a':
DO NOT MERGE. Prevent recents from coming up when in SUW
Colin Cross [Tue, 17 Nov 2015 20:06:25 +0000 (20:06 +0000)]
Merge "Vibra: Add loading of the vibrator hardware module." am:
5603eca33c
am:
358ad4980f
* commit '
358ad4980fd6ea0ed22e81b3816572ec9ba39f53':
Vibra: Add loading of the vibrator hardware module.
Svetoslav Ganov [Tue, 17 Nov 2015 20:06:21 +0000 (20:06 +0000)]
Merge "Handle renamed packages during default grants"
am:
140b101fcd
* commit '
140b101fcdbdf413b914b5625b19577784ad9d88':
Handle renamed packages during default grants
Svetoslav Ganov [Tue, 17 Nov 2015 19:55:37 +0000 (19:55 +0000)]
Merge "Handle renamed packages during default grants"
Deepanshu Gupta [Tue, 17 Nov 2015 19:54:06 +0000 (19:54 +0000)]
LayoutLib: IntelliJ changed project files.
am:
22931224d9
* commit '
22931224d9a9845d316a9ea30e56557bec0b2e45':
LayoutLib: IntelliJ changed project files.
Svet Ganov [Tue, 17 Nov 2015 19:53:18 +0000 (11:53 -0800)]
Handle renamed packages during default grants
If an L device has a privileged app on the system image which was
updated and an M OTA renames the app package (supported only for
privileged apps) we end up with a disabled system package setting
with no package information. Since we are not doing a null check
of the package we get from the disabled package settings during
default grants we crash leaving the system in a bad state.
bug:
25687380
Change-Id: I4f2ebcaf471e4bd1696298eab4716b50c52ca5c4
Michael Wright [Tue, 17 Nov 2015 19:52:13 +0000 (19:52 +0000)]
DO NOT MERGE. Prevent recents from coming up when in SUW
am:
84669ca8de
* commit '
84669ca8de55d38073a0dcb01074233b0a417541':
DO NOT MERGE. Prevent recents from coming up when in SUW
Colin Cross [Tue, 17 Nov 2015 19:51:57 +0000 (19:51 +0000)]
Merge "Vibra: Add loading of the vibrator hardware module."
am:
5603eca33c
* commit '
5603eca33c8e322997029d3101fd2442df3c274e':
Vibra: Add loading of the vibrator hardware module.
Michael Wright [Tue, 17 Nov 2015 19:51:53 +0000 (19:51 +0000)]
Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am:
4aa1e48a71 am:
313c7b2ee0 am:
c73255d8ab
am:
053f241cc7
* commit '
053f241cc7cc23f41fde42c6a0c9ecf2f8cd2830':
DO NOT MERGE. Prevent recents from coming up when in SUW
Deepanshu Gupta [Tue, 17 Nov 2015 19:37:35 +0000 (11:37 -0800)]
LayoutLib: IntelliJ changed project files.
Change-Id: I1f99ab678067c26ba2e9938c9dce40c99a6725c3
Deepanshu Gupta [Tue, 17 Nov 2015 19:34:32 +0000 (11:34 -0800)]
AppCompatActionBar: use findClass to test presence
To test the presence of WindowDecorActionBar class, use findClass()
instead of loadClass() which logs warnings.
Change-Id: Ice8a5a6badd764c7f75b5a64a07c48f0a7cfef98
Colin Cross [Tue, 17 Nov 2015 19:31:19 +0000 (19:31 +0000)]
Merge "Vibra: Add loading of the vibrator hardware module."
Chad Brubaker [Tue, 17 Nov 2015 19:05:17 +0000 (19:05 +0000)]
Merge "Dedupe trust anchors" am:
690b5f6c0a
am:
e2caaea951
* commit '
e2caaea951e62a21bb1d30450e8085f3286ea538':
Dedupe trust anchors
Chad Brubaker [Tue, 17 Nov 2015 18:57:06 +0000 (18:57 +0000)]
Merge "Dedupe trust anchors"
am:
690b5f6c0a
* commit '
690b5f6c0a0820411d72235b11f75e1c87b24031':
Dedupe trust anchors
Michael Wright [Tue, 17 Nov 2015 18:57:03 +0000 (18:57 +0000)]
Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am:
4aa1e48a71 am:
313c7b2ee0
am:
c73255d8ab
* commit '
c73255d8abb343dc88ea56f7f8f5d2fd3dcfeb63':
DO NOT MERGE. Prevent recents from coming up when in SUW
Chad Brubaker [Tue, 17 Nov 2015 18:51:38 +0000 (18:51 +0000)]
Merge "Dedupe trust anchors"
Michael Wright [Tue, 17 Nov 2015 18:49:32 +0000 (18:49 +0000)]
Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am:
4aa1e48a71
am:
313c7b2ee0
* commit '
313c7b2ee07ea74ac184294e4a6133a813bfcabf':
DO NOT MERGE. Prevent recents from coming up when in SUW
Michael Wright [Tue, 17 Nov 2015 18:40:21 +0000 (18:40 +0000)]
Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev
am:
4aa1e48a71
* commit '
4aa1e48a71df78fed20ac4105a2bd97ff04addf7':
DO NOT MERGE. Prevent recents from coming up when in SUW
Michael Wright [Tue, 17 Nov 2015 18:33:38 +0000 (18:33 +0000)]
Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev
Bryce Lee [Tue, 17 Nov 2015 16:22:02 +0000 (16:22 +0000)]
Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev am:
cb8749c903
am:
0fa22022a3
* commit '
0fa22022a378db8de881af397b73d28b0939e5ff':
Add Bluetooth headset API to allow disabling audio route.
Bryce Lee [Tue, 17 Nov 2015 16:14:55 +0000 (16:14 +0000)]
Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev
am:
cb8749c903
* commit '
cb8749c903d29fd04944550b5f34cc6120b69232':
Add Bluetooth headset API to allow disabling audio route.
Bryce Lee [Tue, 17 Nov 2015 16:08:44 +0000 (16:08 +0000)]
Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev
Joe LaPenna [Tue, 17 Nov 2015 02:55:48 +0000 (02:55 +0000)]
Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev am:
d083b37917 -s ours
am:
7f0a1556ec -s ours
* commit '
7f0a1556ecebe9cd861296897000e4b61f541158':
Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"
Joe LaPenna [Tue, 17 Nov 2015 02:47:59 +0000 (02:47 +0000)]
Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev
am:
d083b37917 -s ours
* commit '
d083b379174b6cdfdd40204f4d4f4207fa2f332e':
Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"
Joe LaPenna [Tue, 17 Nov 2015 02:42:22 +0000 (02:42 +0000)]
Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev
Joe LaPenna [Tue, 17 Nov 2015 02:42:10 +0000 (02:42 +0000)]
Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"
This reverts commit
88c7c3e08051f4a2be8ee5194214678a07ff7f01.
Change-Id: I2c6d7d1d076bee0dc905d0986ced55e49481af26
BUG:
23753686
Eino-Ville Talvala [Tue, 17 Nov 2015 02:10:52 +0000 (02:10 +0000)]
Merge "Don\'t use timestamps with all zero" am:
9574e58027
am:
be1a3f8b66
* commit '
be1a3f8b66d69427ae801b4a56f872da3328ec51':
Don't use timestamps with all zero
Eino-Ville Talvala [Tue, 17 Nov 2015 02:00:53 +0000 (02:00 +0000)]
Merge "Don\'t use timestamps with all zero"
am:
9574e58027
* commit '
9574e58027f8edeb539ecedf2988c1a302887807':
Don't use timestamps with all zero
Eino-Ville Talvala [Tue, 17 Nov 2015 01:55:38 +0000 (01:55 +0000)]
Merge "Don't use timestamps with all zero"
Sanket Padawe [Tue, 17 Nov 2015 01:43:08 +0000 (01:43 +0000)]
Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev am:
abea6dc466 am:
ccfcb636ae am:
63e6aa8571
am:
32a190bd78
* commit '
32a190bd787cbecfc4c87cda50ab6973b9e1c3cb':
Don't allow contact sharing by default for device not recognized as carkit.
Sanket Padawe [Tue, 17 Nov 2015 01:33:24 +0000 (01:33 +0000)]
Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev am:
abea6dc466 am:
ccfcb636ae
am:
63e6aa8571
* commit '
63e6aa8571386dcf33ff0cf3949bdaf6c8e350db':
Don't allow contact sharing by default for device not recognized as carkit.
Sanket Padawe [Tue, 17 Nov 2015 01:23:47 +0000 (01:23 +0000)]
Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev am:
abea6dc466
am:
ccfcb636ae
* commit '
ccfcb636ae0c99b974f3cbe3177322c41e33bb15':
Don't allow contact sharing by default for device not recognized as carkit.
Deepanshu Gupta [Tue, 17 Nov 2015 01:17:27 +0000 (01:17 +0000)]
Merge "WindowDecorActionBar name change fix." into mnc-ub-dev
am:
62302bd72a
* commit '
62302bd72aaa6b0f934257447e8dcd636799180e':
WindowDecorActionBar name change fix.
Sanket Padawe [Tue, 17 Nov 2015 01:12:48 +0000 (01:12 +0000)]
Merge "Don\'t allow contact sharing by default for device not recognized as carkit." into mnc-dev
am:
abea6dc466
* commit '
abea6dc466cbd01be261192f8dbc083b58661bad':
Don't allow contact sharing by default for device not recognized as carkit.
Deepanshu Gupta [Tue, 17 Nov 2015 01:11:10 +0000 (01:11 +0000)]
Merge "WindowDecorActionBar name change fix." into mnc-ub-dev
Sanket Padawe [Tue, 17 Nov 2015 01:07:28 +0000 (01:07 +0000)]
Merge "Don't allow contact sharing by default for device not recognized as carkit." into mnc-dev
Michael Kwan [Tue, 17 Nov 2015 00:06:28 +0000 (00:06 +0000)]
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. am:
8d6630b87c -s ours am:
f23229f45f -s ours
am:
b0aae584ea -s ours
* commit '
b0aae584ea2a5649ac113ba05c88cbbe6616709e':
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
Michael Kwan [Mon, 16 Nov 2015 23:57:50 +0000 (23:57 +0000)]
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. am:
8d6630b87c -s ours
am:
f23229f45f -s ours
* commit '
f23229f45f010d42df5d27a4ca653ee6da8c5c1a':
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
Michael Kwan [Mon, 16 Nov 2015 23:57:47 +0000 (23:57 +0000)]
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices. am:
8d6630b87c -s ours
am:
f23229f45f -s ours
* commit '
f23229f45f010d42df5d27a4ca653ee6da8c5c1a':
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
Michael Kwan [Mon, 16 Nov 2015 23:48:39 +0000 (23:48 +0000)]
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
am:
8d6630b87c -s ours
* commit '
8d6630b87c93f569bbf5fc5b426fe2a1c2ff2ceb':
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
Deepanshu Gupta [Mon, 16 Nov 2015 23:46:12 +0000 (15:46 -0800)]
WindowDecorActionBar name change fix.
In change id I7582e242c7564c32feeb044fc9eff6bfb5c56536,
WindowDecorActionBar's package name was changed. This breaks layoutlib.
Fix the issue by checking both package names when loading the class.
Change-Id: I5723a97f0f164d61c56061fef6cff18e3cdafaee
Michael Kwan [Mon, 16 Nov 2015 20:59:37 +0000 (12:59 -0800)]
DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
Android currently forces USB into MTP mode if there was no modes
specified. This causes issues on Clockwork devices as they do not
support MTP.
The hack stops this behaviour, and also sets MTP mode back to none.
Bug:
25547826
Bug:
25582050
Bug:
25244201
Change-Id: I772e35d0a5db51b17e9d71c59e6a157dabb1d296
Rom Lemarchand [Mon, 16 Nov 2015 21:33:48 +0000 (21:33 +0000)]
Merge changes I4e45e5bb,Ibeba97eb,I8e8b892b into mnc-dr2-dev
* changes:
resolved conflicts for
7de7e0b0 to stage-aosp-master
BatteryService: Add Max charging voltage
Stop setting swappiness.
Chad Brubaker [Thu, 12 Nov 2015 18:55:28 +0000 (10:55 -0800)]
Add NetworkSecurityConfigProvider.install
This method is not currently called.
Change-Id: I73fd166b03009526868e0d9b5b209a9adaa4232f
Eino-Ville Talvala [Mon, 16 Nov 2015 20:44:44 +0000 (20:44 +0000)]
Camera: Minor documentation update am:
0b6e1bfae8 am:
0691d16759 am:
062c629e5c am:
784f0f15a9
am:
c24b39e0c0
* commit '
c24b39e0c0f760ac6a53d4fbbf1ed1885fd64529':
Camera: Minor documentation update
Eino-Ville Talvala [Mon, 16 Nov 2015 20:35:51 +0000 (20:35 +0000)]
Camera: Minor documentation update am:
0b6e1bfae8 am:
0691d16759 am:
062c629e5c
am:
784f0f15a9
* commit '
784f0f15a9a2026ee1acd57f9fca4e3dff28c090':
Camera: Minor documentation update
Eino-Ville Talvala [Mon, 16 Nov 2015 20:35:48 +0000 (20:35 +0000)]
Camera: Minor documentation update am:
0b6e1bfae8 am:
0691d16759 am:
062c629e5c
am:
784f0f15a9
* commit '
784f0f15a9a2026ee1acd57f9fca4e3dff28c090':
Camera: Minor documentation update
Alex Klyubin [Mon, 16 Nov 2015 20:31:36 +0000 (20:31 +0000)]
Merge "Insert Android Keystore JCA Provider at the correct position." am:
887d348d7e
am:
5995579f5f
* commit '
5995579f5ff1511f4a089dd0537cd634fb615465':
Insert Android Keystore JCA Provider at the correct position.
Eino-Ville Talvala [Mon, 16 Nov 2015 20:27:03 +0000 (20:27 +0000)]
Camera: Minor documentation update am:
0b6e1bfae8 am:
0691d16759
am:
062c629e5c
* commit '
062c629e5c6270da232bbd2800966ab5dc6c615f':
Camera: Minor documentation update
Alex Klyubin [Mon, 16 Nov 2015 20:22:51 +0000 (20:22 +0000)]
Merge "Insert Android Keystore JCA Provider at the correct position."
am:
887d348d7e
* commit '
887d348d7ed5e1c2a1687eb774db46d571a8f43d':
Insert Android Keystore JCA Provider at the correct position.
Eino-Ville Talvala [Mon, 16 Nov 2015 20:16:45 +0000 (20:16 +0000)]
Camera: Minor documentation update am:
0b6e1bfae8
am:
0691d16759
* commit '
0691d16759bf58a93209d4ab156e96f96fed7092':
Camera: Minor documentation update
Alex Klyubin [Mon, 16 Nov 2015 20:14:43 +0000 (20:14 +0000)]
Merge "Insert Android Keystore JCA Provider at the correct position."
Eino-Ville Talvala [Mon, 16 Nov 2015 20:07:02 +0000 (20:07 +0000)]
Camera: Minor documentation update
am:
0b6e1bfae8
* commit '
0b6e1bfae848b7b177bba9c8119ad44cdc05684a':
Camera: Minor documentation update
Erik Wolsheimer [Mon, 16 Nov 2015 19:12:17 +0000 (19:12 +0000)]
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
Erik Wolsheimer [Mon, 16 Nov 2015 19:03:53 +0000 (19:03 +0000)]
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
Erik Wolsheimer [Mon, 16 Nov 2015 19:03:52 +0000 (19:03 +0000)]
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
Erik Wolsheimer [Mon, 16 Nov 2015 18:55:29 +0000 (18:55 +0000)]
Log errno when dup fd cannot be allocated BUG:
25165471
am:
211abad3b9
* commit '
211abad3b92b70dd094949c79f67e686c940fa0c':
Log errno when dup fd cannot be allocated BUG:
25165471
Todd Kennedy [Fri, 25 Sep 2015 22:06:49 +0000 (15:06 -0700)]
resolved conflicts for
7de7e0b0 to stage-aosp-master
(cherry picked from commit
9f8602644418ecfb1a5c9555792ceed285fa72bd)
Change-Id: I4e45e5bbaebb98b0e740167eaf7517f99d917f30
Badhri Jagan Sridharan [Tue, 27 Oct 2015 20:59:34 +0000 (13:59 -0700)]
BatteryService: Add Max charging voltage
Bug:
25229483
Change-Id: Ibeba97eb145c3d59a763bd8632ab7fcc43118e4b
(cherry picked from commit
f92fcfe36ad841cba4774e7f2129e8dab7ac784a)
Martijn Coenen [Mon, 2 Nov 2015 16:07:56 +0000 (17:07 +0100)]
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
Erik Wolsheimer [Fri, 13 Nov 2015 19:54:47 +0000 (11:54 -0800)]
Log errno when dup fd cannot be allocated
BUG:
25165471
Change-Id: I7342e2b4c566325fc2e15643a7c7b6ba989ee8c7
Alex Klyubin [Sat, 14 Nov 2015 01:36:45 +0000 (17:36 -0800)]
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
Geoff Mendal [Mon, 16 Nov 2015 17:39:29 +0000 (17:39 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Mon, 16 Nov 2015 17:31:23 +0000 (18:31 +0100)]
Import translations. DO NOT MERGE
Change-Id: Ie5a78ca8aadcfd06937b3c917e9d7c99cdc1da0c
Auto-generated-cl: translation import
Geoff Mendal [Mon, 16 Nov 2015 17:22:23 +0000 (17:22 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am:
f34cefdc2d -s ours
* commit '
f34cefdc2d7d2e1b702a5af8f31bdebba455f81d':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Nov 2015 17:17:31 +0000 (17:17 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Mon, 16 Nov 2015 17:16:28 +0000 (18:16 +0100)]
Import translations. DO NOT MERGE
Change-Id: I1d71c3b6382fb097a4c33f0210138537b48215f0
Auto-generated-cl: translation import
Bryce Lee [Mon, 16 Nov 2015 16:55:52 +0000 (08:55 -0800)]
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
Mark Salyzyn [Mon, 16 Nov 2015 16:42:51 +0000 (16:42 +0000)]
Merge "Revert "jni: is loggable speedup, not within signal"" am:
3c54ed00f3
am:
c53dad8d16
* commit '
c53dad8d16c552d06ac4acb8ddbd937bda2d26d7':
Revert "jni: is loggable speedup, not within signal"
Mark Salyzyn [Mon, 16 Nov 2015 16:35:58 +0000 (16:35 +0000)]
Merge "Revert "jni: is loggable speedup, not within signal""
am:
3c54ed00f3
* commit '
3c54ed00f390e0ce9c555eb517594628b362705f':
Revert "jni: is loggable speedup, not within signal"
Mark Salyzyn [Mon, 16 Nov 2015 16:30:57 +0000 (16:30 +0000)]
Merge "Revert "jni: is loggable speedup, not within signal""
Mark Salyzyn [Mon, 16 Nov 2015 16:24:52 +0000 (16:24 +0000)]
Revert "jni: is loggable speedup, not within signal"
This reverts commit
c954fde0b6e31ec99509faf0bbc33c4c9e4d012a.
Bug:
25693940
Change-Id: I568051aad39e215d677318cd5758962e562187ef
Geoff Mendal [Mon, 16 Nov 2015 14:10:31 +0000 (14:10 +0000)]
Import translations. DO NOT MERGE am:
83d65fea01 -s ours am:
a6c50551cd -s ours
am:
4510d17575 -s ours
* commit '
4510d175753dc4439411b19963cb4bd8bde2c2f4':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Nov 2015 13:54:52 +0000 (13:54 +0000)]
Import translations. DO NOT MERGE am:
83d65fea01 -s ours
am:
a6c50551cd -s ours
* commit '
a6c50551cdcbb70d5d65dbfe68c23e74eea245d9':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Nov 2015 13:54:50 +0000 (13:54 +0000)]
Import translations. DO NOT MERGE am:
83d65fea01 -s ours
am:
a6c50551cd -s ours
* commit '
a6c50551cdcbb70d5d65dbfe68c23e74eea245d9':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Nov 2015 13:38:58 +0000 (13:38 +0000)]
Import translations. DO NOT MERGE
am:
83d65fea01 -s ours
* commit '
83d65fea01c4233c80161acdd69b64fa559c3749':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 16 Nov 2015 13:18:40 +0000 (14:18 +0100)]
Import translations. DO NOT MERGE
Change-Id: Ia050e5148fdf971a3beb18147fd6350fc0984e04
Auto-generated-cl: translation import
OSDN Git Service
