OSDN Git Service
Jan Nordqvist [Tue, 22 Sep 2015 22:54:32 +0000 (15:54 -0700)]
DO NOT MERGE Hotspot 2.0 relase 2 first cut.
CP mods to take a URL as a parameter, and new ScanInfo object.
Cherry-picked from
52eb29f0822f129f2b14bacec23dd492f2260ac0
Change-Id: Idbb2d4751c575ba07a56942771e2b2955b624635
Vinit Deshpande [Thu, 12 Nov 2015 22:45:15 +0000 (14:45 -0800)]
DO NOT MERGE Re-enable wifi firmware debugging
This will be enabled till we are ready to ship
devices again.
Change-Id: I0440ebd9482412d538b1cdb7c768c8e238bea269
Cherry-picked from
794395465b6a785d313ea1018ed37bf3bb8c3978
Jim Kaye [Tue, 24 Nov 2015 19:42:15 +0000 (19:42 +0000)]
Merge "Extend the \'qwerty\' key layout" am:
9a83f115ad
am:
e579edc76b
* commit '
e579edc76b6f3f8c977d96db6af01d73e6c93804':
Extend the 'qwerty' key layout
Jim Kaye [Tue, 24 Nov 2015 19:33:57 +0000 (19:33 +0000)]
Merge "Extend the \'qwerty\' key layout"
am:
9a83f115ad
* commit '
9a83f115ade900a816f0fa2beae2cdd6f54bfc54':
Extend the 'qwerty' key layout
Jim Kaye [Tue, 24 Nov 2015 19:27:46 +0000 (19:27 +0000)]
Merge "Extend the 'qwerty' key layout"
Sergio Giro [Tue, 24 Nov 2015 15:51:14 +0000 (15:51 +0000)]
Merge "ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl" am:
d5a5d547d0
am:
d9942006e4
* commit '
d9942006e4a45884fffda8e5888d9657f40b48d2':
ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl
Sergio Giro [Tue, 24 Nov 2015 15:43:06 +0000 (15:43 +0000)]
Merge "ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl"
am:
d5a5d547d0
* commit '
d5a5d547d05eee9d626db1d7977c11acbf83b0c7':
ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl
Sergio Giro [Tue, 24 Nov 2015 11:14:24 +0000 (11:14 +0000)]
Merge "ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl"
Jim Kaye [Mon, 23 Nov 2015 20:22:59 +0000 (12:22 -0800)]
Extend the 'qwerty' key layout
Add the App Switch (Recents) key.
Add media control keys.
These are needed to support Emulator UI
buttons for these functions.
Change-Id: I3e9479bb49e21400f7bfd1435c50886038bbe0ff
Sergio Giro [Mon, 23 Nov 2015 15:14:52 +0000 (15:14 +0000)]
ssl: make DistinguishedNameParser a package-private class in org.apache.http.conn.ssl
Needed by AbstractVerifier in framework/base
DistinguishedNameParser taken from libcore, commit
b5259fcf87994ee18658f07887156aef3cab3b56
Change-Id: I924dc7cd21262e5e91857edf178e46c9916f3f6b
Chris Tate [Fri, 20 Nov 2015 18:10:22 +0000 (18:10 +0000)]
Merge "Don\'t back up / restore EAP network definitions" am:
14a0981fde
am:
b5a38f6da5
* commit '
b5a38f6da5f59020e2c32e00d7228ed71c18f70d':
Don't back up / restore EAP network definitions
Chris Tate [Fri, 20 Nov 2015 18:05:04 +0000 (18:05 +0000)]
Merge "Don\'t back up / restore EAP network definitions"
am:
14a0981fde
* commit '
14a0981fdef45967b19c3db4fb2f298c8b5a1f7c':
Don't back up / restore EAP network definitions
Chris Tate [Fri, 20 Nov 2015 18:01:10 +0000 (18:01 +0000)]
Merge "Don't back up / restore EAP network definitions"
Geoff Mendal [Fri, 20 Nov 2015 01:30:38 +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:00:28 +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:56 +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:20:14 +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.
Nicolas Geoffray [Thu, 19 Nov 2015 16:05:04 +0000 (16:05 +0000)]
Merge "Update framework code after new ART options." am:
d7d2817ade
am:
9da4055766
* commit '
9da4055766fc7acf81dcd238204589ea1f484d50':
Update framework code after new ART options.
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.
Nicolas Geoffray [Thu, 19 Nov 2015 15:54:21 +0000 (15:54 +0000)]
Merge "Update framework code after new ART options."
am:
d7d2817ade
* commit '
d7d2817ade8459a8f6872ff814d3208613502858':
Update framework code after new ART options.
Nicolas Geoffray [Thu, 19 Nov 2015 15:48:01 +0000 (15:48 +0000)]
Merge "Update framework code after new ART options."
Nicolas Geoffray [Thu, 19 Nov 2015 13:48:35 +0000 (13:48 +0000)]
Update framework code after new ART options.
Change-Id: I852a5975701653fe7e0cdd02e3c0b30a2b0b0b59
Christopher Tate [Wed, 18 Nov 2015 02:01:52 +0000 (18:01 -0800)]
Don't back up / restore EAP network definitions
Bug
25725016
Change-Id: Idfef9dd53f2403bbe4c950493a0ab8fa66a3b7d4
Andreas Gampe [Wed, 18 Nov 2015 18:11:11 +0000 (18:11 +0000)]
Merge "Frameworks/base: Make RuntimeAbort more expressive" am:
b61d3dd8a7
am:
a7e9f174c1
* commit '
a7e9f174c1f9ae35be6259de02f46aa8fa4d0a3c':
Frameworks/base: Make RuntimeAbort more expressive
Andreas Gampe [Wed, 18 Nov 2015 17:47:52 +0000 (17:47 +0000)]
Merge "Frameworks/base: Make RuntimeAbort more expressive"
am:
b61d3dd8a7
* commit '
b61d3dd8a773be393c738675cff28fc799497535':
Frameworks/base: Make RuntimeAbort more expressive
Andreas Gampe [Wed, 18 Nov 2015 17:16:59 +0000 (17:16 +0000)]
Merge "Frameworks/base: Make RuntimeAbort more expressive"
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)
Nicolas Geoffray [Wed, 18 Nov 2015 11:05:23 +0000 (11:05 +0000)]
Merge "Remove DEBUG_JIT from Zygote flags." am:
cf49583bd0
am:
5485d81578
* commit '
5485d815788e4037829d70d041fe4fc1a35416f3':
Remove DEBUG_JIT from Zygote flags.
Nicolas Geoffray [Wed, 18 Nov 2015 10:54:19 +0000 (10:54 +0000)]
Merge "Remove DEBUG_JIT from Zygote flags."
am:
cf49583bd0
* commit '
cf49583bd02d01b5d7aa57912d5469b466722c65':
Remove DEBUG_JIT from Zygote flags.
Nicolas Geoffray [Wed, 18 Nov 2015 10:47:50 +0000 (10:47 +0000)]
Merge "Remove DEBUG_JIT from Zygote flags."
Nicolas Geoffray [Thu, 5 Nov 2015 11:29:42 +0000 (11:29 +0000)]
Remove DEBUG_JIT from Zygote flags.
The flag is being obsolete by the move to JIT.
(cherry picked from commit
9abbf45c8dcdb2e5b13b615e5138ad996fe8afa3)
Change-Id: I3ce4577e81f91e9dd55d44116e0f9e2014bd00b8
Andreas Gampe [Wed, 18 Nov 2015 00:38:59 +0000 (16:38 -0800)]
Frameworks/base: Make RuntimeAbort more expressive
Pass a message to FatalError, which will be more prominent in
aborts than "RuntimeAbort."
Change-Id: Icb3b8f50ca0cc15fd1346c530cd8e6452e951879
Diego Perez [Tue, 17 Nov 2015 22:43:16 +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:49 +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."
Stephen Hines [Tue, 17 Nov 2015 22:37:35 +0000 (22:37 +0000)]
Merge "Remove unsupported RS graphics API tests." am:
7ea808b177
am:
5a0a713147
* commit '
5a0a713147a76195ae21d53d065633f117271793':
Remove unsupported RS graphics API tests.
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."
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.
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
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.
OSDN Git Service
