OSDN Git Service
Alex Deymo [Wed, 18 Nov 2015 16:39:09 +0000 (16:39 +0000)]
Merge "Remove the aidl tool" into mnc-dr2-dev
Diego Perez [Tue, 17 Nov 2015 22:52:52 +0000 (22:52 +0000)]
Merge "Fix delegation of methods within inner static classes" into mnc-ub-dev am:
603544d4c4
am:
14a826380d
* commit '
14a826380d12f4a5c48c1f9fb97b3b24ebddf0c7':
Fix delegation of methods within inner static classes
Joe LaPenna [Tue, 17 Nov 2015 22:51:09 +0000 (22:51 +0000)]
Revert "Don\'t dispatch when non-interactive and the display is off." am:
f2b9b2d85a am:
f7aceb60e3
am:
2900dc2349
* commit '
2900dc23496094dd3a3f44eaac688a304b49ba56':
Revert "Don't dispatch when non-interactive and the display is off."
Diego Perez [Tue, 17 Nov 2015 22:43:15 +0000 (22:43 +0000)]
Merge "Fix delegation of methods within inner static classes" into mnc-ub-dev
am:
603544d4c4
* commit '
603544d4c42cd8e0cc46da04f28a8fead64665e3':
Fix delegation of methods within inner static classes
Joe LaPenna [Tue, 17 Nov 2015 22:41:46 +0000 (22:41 +0000)]
Revert "Don\'t dispatch when non-interactive and the display is off." am:
f2b9b2d85a
am:
f7aceb60e3
* commit '
f7aceb60e3e0d6ec611b3fa2dd64e6e4e1196f4c':
Revert "Don't dispatch when non-interactive and the display is off."
Diego Perez [Tue, 17 Nov 2015 22:34:08 +0000 (22:34 +0000)]
Merge "Fix delegation of methods within inner static classes" into mnc-ub-dev
Joe LaPenna [Tue, 17 Nov 2015 22:32:57 +0000 (22:32 +0000)]
Revert "Don\'t dispatch when non-interactive and the display is off."
am:
f2b9b2d85a
* commit '
f2b9b2d85ae1b48896ad6b685de4cda8fab1c8fb':
Revert "Don't dispatch when non-interactive and the display is off."
Joe LaPenna [Tue, 17 Nov 2015 22:22:37 +0000 (22:22 +0000)]
Revert "Don't dispatch when non-interactive and the display is off."
This reverts commit
2ccf0c8e636fd3be75c3a07f4cf60d72a4cfaa28.
BUG:
22422588
BUG:
25067918
Change-Id: I916c8bb19cd6a73c0be4bd3a0e3112938651e775
Michael Wright [Tue, 17 Nov 2015 22:23:50 +0000 (22:23 +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
am:
78f974a0b2
* commit '
78f974a0b2c647223ad25089cda05ef04c12f2e2':
DO NOT MERGE. Prevent recents from coming up when in SUW
Michael Wright [Tue, 17 Nov 2015 21:37:27 +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
Deepanshu Gupta [Tue, 17 Nov 2015 21:09:10 +0000 (21:09 +0000)]
Revert "LayoutLib: Fix true transparency in status bar." am:
4ea74d2960
am:
d67897e4fb
* commit '
d67897e4fb18b75c4707c7052b21a1bfc6579894':
Revert "LayoutLib: Fix true transparency in status bar."
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
Deepanshu Gupta [Tue, 17 Nov 2015 20:50:23 +0000 (20:50 +0000)]
Merge "AppCompatActionBar: use findClass to test presence" into mnc-ub-dev am:
42a893b50b
am:
ef4050128a
* commit '
ef4050128a8c1557697395d37903c179e1ac977a':
AppCompatActionBar: use findClass to test presence
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."
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:28 +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
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
Deepanshu Gupta [Tue, 17 Nov 2015 20:06:20 +0000 (20:06 +0000)]
LayoutLib: IntelliJ changed project files. am:
22931224d9
am:
66840955d8
* commit '
66840955d817b2ca42a4a573dd9186b5ad5b25aa':
LayoutLib: IntelliJ changed project files.
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
Deepanshu Gupta [Tue, 17 Nov 2015 19:51:52 +0000 (19:51 +0000)]
LayoutLib: IntelliJ changed project files.
am:
22931224d9
* commit '
22931224d9a9845d316a9ea30e56557bec0b2e45':
LayoutLib: IntelliJ changed project files.
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
Michael Wright [Tue, 17 Nov 2015 19:14:01 +0000 (19:14 +0000)]
Merge "DO NOT MERGE. Prevent recents from coming up when in SUW" into mnc-dev am:
4aa1e48a71 am:
313c7b2ee0 am:
c73255d8ab am:
053f241cc7
am:
e2af036719
* commit '
e2af0367193332e340a759eae7dc37c5342fbc01':
DO NOT MERGE. Prevent recents from coming up when in SUW
Michael Wright [Tue, 17 Nov 2015 19:05:20 +0000 (19:05 +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
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
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:28:47 +0000 (16:28 +0000)]
Merge "Add Bluetooth headset API to allow disabling audio route." into cw-e-dev am:
cb8749c903 am:
0fa22022a3
am:
e2861471b9
* commit '
e2861471b906d94b1211beeee824ae43b7e931c3':
Add Bluetooth headset API to allow disabling audio route.
Bryce Lee [Tue, 17 Nov 2015 16:21:59 +0000 (16:21 +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
Christopher Wiley [Fri, 11 Sep 2015 21:24:24 +0000 (14:24 -0700)]
Remove the aidl tool
This has been moved into its own repository at
//system/tools/aidl
Test: Built aosp_arm-eng from scratch.
Bug:
23691099
(cherry-pick of commit
73ea1230fc2a4007973efe3730d482d7bc6cf87a)
Change-Id: I993f2f08ed476e1cce6f39b58fed8eca2f2ce979
Joe LaPenna [Tue, 17 Nov 2015 03:03:13 +0000 (03:03 +0000)]
Merge "Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"" into cw-e-dev am:
d083b37917 -s ours am:
7f0a1556ec -s ours
am:
dbe1804f58 -s ours
* commit '
dbe1804f580dcde68ac272b865808a8263219efb':
Revert "Enable debugging for DeviceIdle DO NOT MERGE ANYWHERE"
Joe LaPenna [Tue, 17 Nov 2015 02:55:44 +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
Sanket Padawe [Tue, 17 Nov 2015 01:58:39 +0000 (01:58 +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
am:
7bb34d7517
* commit '
7bb34d7517cfef519a01e365c0da665852ac6b0b':
Don't allow contact sharing by default for device not recognized as carkit.
Sanket Padawe [Tue, 17 Nov 2015 01:43:07 +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.
Deepanshu Gupta [Tue, 17 Nov 2015 01:28:58 +0000 (01:28 +0000)]
Merge "WindowDecorActionBar name change fix." into mnc-ub-dev am:
62302bd72a
am:
80bd5e6fd7
* commit '
80bd5e6fd77eb93c5e7f29cce279f8194be4478b':
WindowDecorActionBar name change fix.
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:25 +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: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.
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:48 +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:27:03 +0000 (20:27 +0000)]
Camera: Minor documentation update am:
0b6e1bfae8 am:
0691d16759
am:
062c629e5c
* commit '
062c629e5c6270da232bbd2800966ab5dc6c615f':
Camera: Minor documentation update
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
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: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
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
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: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
Eino-Ville Talvala [Mon, 9 Nov 2015 02:27:20 +0000 (18:27 -0800)]
Camera: Minor documentation update
- Further clarify hardware.camera feature being only for the back camera
Bug:
24540625
Change-Id: I7a698740475aa4932648c8f62aab81d5f9341030
Michael Wright [Fri, 13 Nov 2015 21:53:14 +0000 (21:53 +0000)]
DO NOT MERGE. Prevent recents from coming up when in SUW
Bug:
25229538
Change-Id: Ib19f368e9ef383ba5e60ea0b88193178d5769469
Michael Wright [Fri, 13 Nov 2015 21:52:18 +0000 (21:52 +0000)]
DO NOT MERGE. Prevent recents from coming up when in SUW
Bug:
25229538
Change-Id: If4f276d3f7c04fd89011068d90a3c3c60593bc05
Winson Chung [Fri, 13 Nov 2015 18:44:29 +0000 (18:44 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am:
bb4da4efc3 am:
b133b984a0 am:
32265b9ea0 -s ours am:
d45a18c8ec am:
ef15ca85d7
am:
28fc76ecef
* commit '
28fc76ecef04061bfdbad2f5dc52bc1d5daf0e0d':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Winson Chung [Fri, 13 Nov 2015 18:37:15 +0000 (18:37 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am:
bb4da4efc3 am:
b133b984a0 am:
32265b9ea0 -s ours am:
d45a18c8ec
am:
ef15ca85d7
* commit '
ef15ca85d7f847884e391e3283daabb019e44e10':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Winson Chung [Fri, 13 Nov 2015 18:29:33 +0000 (18:29 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am:
bb4da4efc3 am:
b133b984a0 am:
32265b9ea0 -s ours
am:
d45a18c8ec
* commit '
d45a18c8eca074f8c83a64ed465021a61becb49a':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Winson Chung [Fri, 13 Nov 2015 18:21:55 +0000 (18:21 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am:
bb4da4efc3 am:
b133b984a0
am:
32265b9ea0 -s ours
* commit '
32265b9ea000b04ac62f3c114edb063246260401':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Winson Chung [Fri, 13 Nov 2015 18:21:53 +0000 (18:21 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev am:
dce0f8040d am:
3e9f2b7894
am:
1b29fd87a2
* commit '
1b29fd87a26d6230c55c701d1411b34342614af0':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Winson Chung [Fri, 13 Nov 2015 18:15:30 +0000 (18:15 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev am:
bb4da4efc3
am:
b133b984a0
* commit '
b133b984a0644a78270d51007123e75ded24eb14':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Winson Chung [Fri, 13 Nov 2015 18:15:29 +0000 (18:15 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev am:
dce0f8040d
am:
3e9f2b7894
* commit '
3e9f2b789414f34b5530107c362295c5a637bac1':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Winson Chung [Fri, 13 Nov 2015 18:08:38 +0000 (18:08 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev
am:
bb4da4efc3
* commit '
bb4da4efc320caee77f11bb316145b8e5f264e07':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Winson Chung [Fri, 13 Nov 2015 18:08:35 +0000 (18:08 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev
am:
dce0f8040d
* commit '
dce0f8040dcce494166832eb6c1e8a2d9638ddd4':
DO NOT MERGE Ensure that the device is provisioned before showing Recents.
Winson Chung [Fri, 13 Nov 2015 18:02:47 +0000 (18:02 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into mnc-dev
Winson Chung [Fri, 13 Nov 2015 18:02:38 +0000 (18:02 +0000)]
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev
Filip Gruszczynski [Fri, 13 Nov 2015 17:20:05 +0000 (17:20 +0000)]
Merge "Initialize DisplayContent base info when object is constructed" into cw-e-dev
am:
fe482e0bca
* commit '
fe482e0bcabb98d983ecb4080b35490b9814c809':
Initialize DisplayContent base info when object is constructed
Filip Gruszczynski [Fri, 13 Nov 2015 17:15:14 +0000 (17:15 +0000)]
Merge "Initialize DisplayContent base info when object is constructed" into cw-e-dev
Diego Perez [Fri, 13 Nov 2015 13:58:14 +0000 (13:58 +0000)]
Fix delegation of methods within inner static classes
Currently, delegation of inner static classes methods is broken since
the rewritten method tries to pass an instance to the outer class. This
updates the method generation to only pass the reference if the inner
class is not static.
Change-Id: I8493929cafdbd80968989b422af0f956fa65681a
Wale Ogunwale [Wed, 30 Sep 2015 17:09:39 +0000 (10:09 -0700)]
Initialize DisplayContent base info when object is constructed
It is possible for an external process (e.g. sys-ui) to call into
WM to get the bounds of a stack in between the construction of the
DisplayContent object and SystemServer telling WM that the display
is ready. Incorrect bounds would be returned to the caller in this
case since the baseDisplayWidth/Height is only set when the displayReady
call is made.
We now initialize the base display information when the DisplayContent
object is created so any call to get the logical display rect of the
display will always return the right bounds. This should be okay as the
display manager is initialized way before window manager.
Bug:
22961090
Change-Id: Iebd688ad8f4c08556846fcebb543e58bd2c01414
Shreyas Basarge [Fri, 13 Nov 2015 02:48:52 +0000 (02:48 +0000)]
Sync extras bundle comparison can throw NPE am:
2f137b7705 am:
294611faa8 am:
cc7c1d3812 am:
f5f03a19af am:
44368e6dd4 am:
bf29f10c1e am:
359ee7f47d am:
64bdb9f06b am:
c9eb8b4367 am:
c4a9c319e5
am:
d80d24f5b1
* commit '
d80d24f5b13c16ce19369b1debb9137516f59e3f':
Sync extras bundle comparison can throw NPE
Shreyas Basarge [Fri, 13 Nov 2015 02:41:55 +0000 (02:41 +0000)]
Sync extras bundle comparison can throw NPE am:
2f137b7705 am:
294611faa8 am:
cc7c1d3812 am:
f5f03a19af am:
44368e6dd4 am:
bf29f10c1e am:
359ee7f47d am:
64bdb9f06b am:
c9eb8b4367
am:
c4a9c319e5
* commit '
c4a9c319e594fcc4b6772b6f61d0788e108fcb2c':
Sync extras bundle comparison can throw NPE
Shreyas Basarge [Fri, 13 Nov 2015 02:35:51 +0000 (02:35 +0000)]
Sync extras bundle comparison can throw NPE am:
2f137b7705 am:
294611faa8 am:
cc7c1d3812 am:
f5f03a19af am:
44368e6dd4 am:
bf29f10c1e am:
359ee7f47d am:
64bdb9f06b
am:
c9eb8b4367
* commit '
c9eb8b436715ba9b59382759cf0dcf991ed33594':
Sync extras bundle comparison can throw NPE
OSDN Git Service
