OSDN Git Service
Erik Wolsheimer [Mon, 30 Nov 2015 17:28:44 +0000 (17:28 +0000)]
fix data race condition BUG:
25819358 am:
2242b4d2bd
am:
1dbb0355dc
* commit '
1dbb0355dc89a9f878365ee793ec48f6cb0b1426':
fix data race condition BUG:
25819358
Erik Wolsheimer [Mon, 30 Nov 2015 17:22:56 +0000 (17:22 +0000)]
fix data race condition BUG:
25819358
am:
2242b4d2bd
* commit '
2242b4d2bda7f83cf7813103ff95d9b4e244126f':
fix data race condition BUG:
25819358
Erik Wolsheimer [Tue, 24 Nov 2015 21:22:04 +0000 (13:22 -0800)]
fix data race condition
BUG:
25819358
Change-Id: I9d9978c92d084e93ccb41ea1d0fe33ffe3e17e3d
Kevin Neas [Tue, 24 Nov 2015 02:46:24 +0000 (02:46 +0000)]
Merge "DO NOT MERGE. Cherrypick UiBench from Master" into cw-e-dev am:
4dbb586585
am:
b6ae32162e
* commit '
b6ae32162e77d9f11620b6806dec20a0987e2dab':
DO NOT MERGE. Cherrypick UiBench from Master
Kevin Neas [Tue, 24 Nov 2015 01:58:00 +0000 (01:58 +0000)]
Merge "DO NOT MERGE. Cherrypick UiBench from Master" into cw-e-dev
am:
4dbb586585
* commit '
4dbb58658552d1cdae46ef06d331b867f5610786':
DO NOT MERGE. Cherrypick UiBench from Master
Kevin Neas [Tue, 24 Nov 2015 00:50:18 +0000 (00:50 +0000)]
Merge "DO NOT MERGE. Cherrypick UiBench from Master" into cw-e-dev
Geoff Mendal [Mon, 23 Nov 2015 17:51:14 +0000 (17:51 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Mon, 23 Nov 2015 17:50:05 +0000 (18:50 +0100)]
Import translations. DO NOT MERGE
Change-Id: I6553e9e4da9e5e5c33aad42aa215d8d328f66509
Auto-generated-cl: translation import
Geoff Mendal [Mon, 23 Nov 2015 17:38:52 +0000 (17:38 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am:
ae7c51a9cc -s ours
* commit '
ae7c51a9ccf1bc1030b33a64b095a4fe3b06a3bd':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Nov 2015 17:32:02 +0000 (17:32 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Mon, 23 Nov 2015 17:30:39 +0000 (18:30 +0100)]
Import translations. DO NOT MERGE
Change-Id: I000a0799900cec827d9df803e0aa6e0fdb28b236
Auto-generated-cl: translation import
Geoff Mendal [Mon, 23 Nov 2015 13:43:48 +0000 (13:43 +0000)]
Import translations. DO NOT MERGE am:
b21b778567 -s ours
am:
b96f640a77 -s ours
* commit '
b96f640a77b0c09868e104028d3bb9db3687018b':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Nov 2015 13:36:02 +0000 (13:36 +0000)]
Import translations. DO NOT MERGE
am:
b21b778567 -s ours
* commit '
b21b7785678f08e939dbe2e7d7cb5eedae47e1c4':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 23 Nov 2015 13:26:59 +0000 (14:26 +0100)]
Import translations. DO NOT MERGE
Change-Id: Id46055ddba8834518c0faf5e0dd95d883dd79542
Auto-generated-cl: translation import
Adam Lesinski [Fri, 20 Nov 2015 20:20:14 +0000 (20:20 +0000)]
DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing am:
6902052c77 -s ours
am:
888916ff0f -s ours
* commit '
888916ff0ff51e35a77bd05ecbaeecb8d6e95585':
DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing
Adam Lesinski [Fri, 20 Nov 2015 20:14:08 +0000 (20:14 +0000)]
DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing
am:
6902052c77 -s ours
* commit '
6902052c77bbcb9078b4ced243874f67542f64f9':
DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing
Adam Lesinski [Fri, 13 Nov 2015 23:54:59 +0000 (15:54 -0800)]
DO NOT MERGE ANYWHERE: Fix batterystats battery level int packing
We introduced some new flag at the lowest significant bit of the
battery level int but failed to account for it when unpacking.
Bug:
25596467
Change-Id: I4320e6fcc208ec6de249b14fe3e399ab2f32d839
Geoff Mendal [Fri, 20 Nov 2015 01:40:42 +0000 (01:40 +0000)]
Import translations. DO NOT MERGE am:
bddde9b83d -s ours am:
d0709c3a32 -s ours am:
1bd58bfd5b -s ours
am:
fd773d1ba7 -s ours
* commit '
fd773d1ba76c29b8888c71906ef44ec09a551627':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 20 Nov 2015 01:30:35 +0000 (01:30 +0000)]
Import translations. DO NOT MERGE am:
bddde9b83d -s ours am:
d0709c3a32 -s ours
am:
1bd58bfd5b -s ours
* commit '
1bd58bfd5bab7f517de41ec17342d0710c64ad9a':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 20 Nov 2015 01:25:11 +0000 (01:25 +0000)]
Import translations. DO NOT MERGE am:
bddde9b83d -s ours
am:
d0709c3a32 -s ours
* commit '
d0709c3a329ce555d9d968bc1808fec5bcc1fb10':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 20 Nov 2015 01:15:04 +0000 (01:15 +0000)]
Import translations. DO NOT MERGE
am:
bddde9b83d -s ours
* commit '
bddde9b83db2bab9343cbe107d3672fea5314d4b':
Import translations. DO NOT MERGE
Geoff Mendal [Fri, 20 Nov 2015 01:06:56 +0000 (17:06 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: I0ab6836c1cf116a76b9ece6722e2f3dfe2d4bfe2
Deepanshu Gupta [Thu, 19 Nov 2015 21:10:57 +0000 (21:10 +0000)]
Merge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""" into mnc-ub-dev am:
35f7562495
am:
2d887558df
* commit '
2d887558dfa0b46fde5663fb494e2230febeaccc':
Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""
Deepanshu Gupta [Thu, 19 Nov 2015 21:09:24 +0000 (21:09 +0000)]
Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc-ub-dev am:
8c971ae5a0
am:
867c370465
* commit '
867c3704652d40118b47e9c97149e7fd9567a16b':
Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"
Deepanshu Gupta [Thu, 19 Nov 2015 21:00:17 +0000 (21:00 +0000)]
Merge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""" into mnc-ub-dev
am:
35f7562495
* commit '
35f75624958bc061764c7cc71843ca7ea60c0666':
Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""
Deepanshu Gupta [Thu, 19 Nov 2015 20:58:52 +0000 (20:58 +0000)]
Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc-ub-dev
am:
8c971ae5a0
* commit '
8c971ae5a0d294175481426d4543e23dc8d4a349':
Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"
Deepanshu Gupta [Thu, 19 Nov 2015 20:49:55 +0000 (20:49 +0000)]
Merge "Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""" into mnc-ub-dev
Deepanshu Gupta [Thu, 19 Nov 2015 20:49:35 +0000 (20:49 +0000)]
Revert "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator""
This reverts commit
65a834980cdbb9407a3f27e48cd0a8c472182cd6.
The original revert was only for cherry-pick to release
branch.
Change-Id: Ib78f9a06ce49681c767f65b262058f18a670e38e
Deepanshu Gupta [Thu, 19 Nov 2015 20:48:52 +0000 (20:48 +0000)]
Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc-ub-dev
Deepanshu Gupta [Thu, 19 Nov 2015 20:47:26 +0000 (20:47 +0000)]
Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"
This reverts commit
631c2ffd6ff1bfa7463d29a39a7ee74be019b3f9.
The revert is only for cherry-pick back to mnc-sdk-release.
Change-Id: I42cb392528b7890b58d689c732f90c3b9ba5f74c
Sreeram Ramachandran [Thu, 19 Nov 2015 17:30:05 +0000 (17:30 +0000)]
Don\'t use framework permission strings for netd permissions. am:
f1f45fe012 am:
0b542630dd am:
42faa221d7 am:
d3b6e2d790 am:
33c1718205 am:
b776891801 am:
974f805500 am:
6d983179a0 am:
5d41bd8d1a
am:
c1552f0caf
* commit '
c1552f0caf26bc79e5de6fdd15aa97900d6fd4aa':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Thu, 19 Nov 2015 17:20:09 +0000 (17:20 +0000)]
Don\'t use framework permission strings for netd permissions. am:
f1f45fe012 am:
0b542630dd am:
42faa221d7 am:
d3b6e2d790 am:
33c1718205 am:
b776891801 am:
974f805500 am:
6d983179a0
am:
5d41bd8d1a
* commit '
5d41bd8d1acd894cef1aff9018614194df6f95ab':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Thu, 19 Nov 2015 17:10:45 +0000 (17:10 +0000)]
Don\'t use framework permission strings for netd permissions. am:
f1f45fe012 am:
0b542630dd am:
42faa221d7 am:
d3b6e2d790 am:
33c1718205 am:
b776891801 am:
974f805500
am:
6d983179a0
* commit '
6d983179a047ff0e69fc06c06d3b9b06c32406ae':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Thu, 19 Nov 2015 16:59:45 +0000 (16:59 +0000)]
Don\'t use framework permission strings for netd permissions. am:
f1f45fe012 am:
0b542630dd am:
42faa221d7 am:
d3b6e2d790 am:
33c1718205 am:
b776891801
am:
974f805500
* commit '
974f8055005a3d75e45cab89badd9ef183a75107':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Thu, 19 Nov 2015 16:50:11 +0000 (16:50 +0000)]
Don\'t use framework permission strings for netd permissions. am:
f1f45fe012 am:
0b542630dd am:
42faa221d7 am:
d3b6e2d790 am:
33c1718205
am:
b776891801
* commit '
b7768918014d34c2e4d74abefeb03956aee421fc':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Thu, 19 Nov 2015 16:40:35 +0000 (16:40 +0000)]
Don\'t use framework permission strings for netd permissions. am:
f1f45fe012 am:
0b542630dd am:
42faa221d7 am:
d3b6e2d790
am:
33c1718205
* commit '
33c17182058ce0f9d0bae48467827ff52422cdd2':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Thu, 19 Nov 2015 16:30:59 +0000 (16:30 +0000)]
Don\'t use framework permission strings for netd permissions. am:
f1f45fe012 am:
0b542630dd am:
42faa221d7
am:
d3b6e2d790
* commit '
d3b6e2d790f95f2fb3d85f0993b90bb8708a6114':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Thu, 19 Nov 2015 16:20:26 +0000 (16:20 +0000)]
Don\'t use framework permission strings for netd permissions. am:
f1f45fe012 am:
0b542630dd
am:
42faa221d7
* commit '
42faa221d7e8bc6db32698b3528e9c5898dbb943':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Thu, 19 Nov 2015 16:10:19 +0000 (16:10 +0000)]
Don\'t use framework permission strings for netd permissions. am:
f1f45fe012
am:
0b542630dd
* commit '
0b542630dd8b4d43f2e4f70563d3e44bb680455f':
Don't use framework permission strings for netd permissions.
Sreeram Ramachandran [Thu, 19 Nov 2015 15:59:42 +0000 (15:59 +0000)]
Don\'t use framework permission strings for netd permissions.
am:
f1f45fe012
* commit '
f1f45fe012ddbd516e797099994c400a1cac8581':
Don't use framework permission strings for netd permissions.
Vineeta Srivastava [Thu, 19 Nov 2015 05:50:36 +0000 (05:50 +0000)]
Merge "Fix MVNO hotspot bug for Europe" into mnc-dr1.5-dev
am:
013c7daedd
* commit '
013c7daedd6be8a6a90b8c5e34de70be4144e746':
Fix MVNO hotspot bug for Europe
Vineeta Srivastava [Thu, 19 Nov 2015 00:22:59 +0000 (00:22 +0000)]
Merge "Fix MVNO hotspot bug for Europe" into mnc-dr1.5-dev
Guang Zhu [Wed, 18 Nov 2015 18:11:10 +0000 (18:11 +0000)]
add lost RAM info to compact meminfo dump
am:
877c6c7742
* commit '
877c6c7742d60fae387e51a4257dd90010064a8a':
add lost RAM info to compact meminfo dump
Sreeram Ramachandran [Tue, 4 Nov 2014 18:15:03 +0000 (10:15 -0800)]
Don't use framework permission strings for netd permissions.
These framework permission strings were being used as arbitrary labels
that mapped to netd permissions that have completely different meaning.
This leads to confusion, so use different strings.
This is being cherry picked from lmp-mr1-dev to lmp-dev to fix failures
when creating restricted networks due to prior back-port
a120442.
Bug:
21900139
Bug:
18194858
Change-Id: Ib3ec377ab26ce904d3d4678f04edec6cb1260517
(cherry picked from commit
0f8f120839120da543ee186cf25ce6e215423e99)
Alex Deymo [Wed, 18 Nov 2015 16:39:09 +0000 (16:39 +0000)]
Merge "Remove the aidl tool" into mnc-dr2-dev
Guang Zhu [Wed, 18 Nov 2015 01:59:49 +0000 (17:59 -0800)]
add lost RAM info to compact meminfo dump
Bug:
25756675
Change-Id: Ibfa37dac99268de8b482188eca9924c999e2b484
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
OSDN Git Service
