OSDN Git Service
Android Build Merger (Role) [Tue, 23 Aug 2016 23:10:08 +0000 (23:10 +0000)]
Merge "Merge "Added error handling to settings suggestions list" into nyc-mr1-dev am:
621dcdf9cd am:
1941584197" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 23 Aug 2016 23:09:56 +0000 (23:09 +0000)]
Merge "Added error handling to settings suggestions list am:
2197e8d6f5 am:
a6e6feffe6" into nyc-mr1-dev-plus-aosp
Salvador Martinez [Tue, 23 Aug 2016 23:09:17 +0000 (23:09 +0000)]
Merge "Added error handling to settings suggestions list" into nyc-mr1-dev am:
621dcdf9cd
am:
1941584197
Change-Id: I34949cf675241a73d15b64718c7356c0bf3a2d7d
Salvador Martinez [Tue, 23 Aug 2016 23:09:14 +0000 (23:09 +0000)]
Added error handling to settings suggestions list am:
2197e8d6f5
am:
a6e6feffe6
Change-Id: Ia038629a47a212b2c4f5beb2eb367ffbfbbf6895
John Reck [Tue, 23 Aug 2016 23:08:32 +0000 (23:08 +0000)]
resolve merge conflicts of
24e38ab to stage-aosp-master am:
621fb590e3
am:
f929ef6cbd
Change-Id: Ie7d5ff6858f95cf7725fa12df8d33420bc3954b2
Salvador Martinez [Tue, 23 Aug 2016 23:02:03 +0000 (23:02 +0000)]
Merge "Added error handling to settings suggestions list" into nyc-mr1-dev
am:
621dcdf9cd
Change-Id: Icdb19bcdbf888341e59afe3992d5a04030ed0ac7
Salvador Martinez [Tue, 23 Aug 2016 23:01:32 +0000 (23:01 +0000)]
Added error handling to settings suggestions list
am:
2197e8d6f5
Change-Id: I93d2f5363f702dbec76f34f5e121d3d3c9e01ac5
John Reck [Tue, 23 Aug 2016 22:56:52 +0000 (22:56 +0000)]
resolve merge conflicts of
24e38ab to stage-aosp-master
am:
621fb590e3
Change-Id: Ia1b617a13012a8d475feb91bfbabb6ace264a29e
TreeHugger Robot [Tue, 23 Aug 2016 22:52:31 +0000 (22:52 +0000)]
Merge "Added error handling to settings suggestions list" into nyc-mr1-dev
Jorim Jaggi [Tue, 23 Aug 2016 22:40:26 +0000 (22:40 +0000)]
Merge "Update light mode when battery saver changes" into nyc-mr1-dev am:
891411aaa5
am:
594a4918f8
Change-Id: I7067b815ecbd8b90316f4db01e2db0a49d49614c
Jorim Jaggi [Tue, 23 Aug 2016 22:40:22 +0000 (22:40 +0000)]
Update light mode when battery saver changes am:
244a43ee6f
am:
c9be359ad4
Change-Id: I7e5af1beb8151bd5c60132d70a7ce2420712b004
Jorim Jaggi [Tue, 23 Aug 2016 22:29:16 +0000 (22:29 +0000)]
Merge "Update light mode when battery saver changes" into nyc-mr1-dev
am:
891411aaa5
Change-Id: I90f2dc2ab69c60f31c3b88a128fa7542de9d9780
Jorim Jaggi [Tue, 23 Aug 2016 22:29:14 +0000 (22:29 +0000)]
Update light mode when battery saver changes
am:
244a43ee6f
Change-Id: Ifb0238a6690d06ec4abd7aa600763cfb6f607dc5
TreeHugger Robot [Tue, 23 Aug 2016 22:20:38 +0000 (22:20 +0000)]
Merge "Update light mode when battery saver changes" into nyc-mr1-dev
John Reck [Tue, 23 Aug 2016 22:10:47 +0000 (15:10 -0700)]
resolve merge conflicts of
24e38ab to stage-aosp-master
Change-Id: I02db3eb317ccb182b563ec9350a116bd5de063b6
Amith Yamasani [Tue, 23 Aug 2016 21:28:25 +0000 (21:28 +0000)]
Merge "Don't complain about sender of MASTER_CLEAR" into nyc-mr1-dev am:
50ff32c17f
am:
4b62110262
Change-Id: I277aabd654295050509266abc7461a4a2802b5b9
Amith Yamasani [Tue, 23 Aug 2016 21:28:22 +0000 (21:28 +0000)]
Don't complain about sender of MASTER_CLEAR am:
d8a55f6dd8
am:
8b2adb1ee1
Change-Id: I40413fab0229bd4f0a2331ba8c467503632f88fb
Amith Yamasani [Tue, 23 Aug 2016 21:22:50 +0000 (21:22 +0000)]
Merge "Don't complain about sender of MASTER_CLEAR" into nyc-mr1-dev
am:
50ff32c17f
Change-Id: I37f7e13d7974b32cb5487c78f492a6518ef9d4dc
Amith Yamasani [Tue, 23 Aug 2016 21:22:48 +0000 (21:22 +0000)]
Don't complain about sender of MASTER_CLEAR
am:
d8a55f6dd8
Change-Id: I4b66478a5c275bec2e47262c7cf8396c0f8d061e
Amith Yamasani [Tue, 23 Aug 2016 21:19:03 +0000 (21:19 +0000)]
Merge "Don't complain about sender of MASTER_CLEAR" into nyc-mr1-dev
Makoto Onuki [Tue, 23 Aug 2016 21:05:33 +0000 (21:05 +0000)]
Merge "Do not scan system apps unless after OTA" into nyc-mr1-dev am:
85c10342c1
am:
52e87790d2
Change-Id: Idfa9d861b28436e8be60e80da50be3c2f18acca7
Makoto Onuki [Tue, 23 Aug 2016 21:05:29 +0000 (21:05 +0000)]
Do not scan system apps unless after OTA am:
3366328245
am:
140f6f5b8c
Change-Id: I0d37f55bb17feba629de041256ecaded338e5ca4
Makoto Onuki [Tue, 23 Aug 2016 20:59:10 +0000 (20:59 +0000)]
Merge "Do not scan system apps unless after OTA" into nyc-mr1-dev
am:
85c10342c1
Change-Id: Ic40a7b4c794029861ae1a1608c3022b9577e02c5
Makoto Onuki [Tue, 23 Aug 2016 20:59:07 +0000 (20:59 +0000)]
Do not scan system apps unless after OTA
am:
3366328245
Change-Id: I6e901e26f61cd4bad8ba2a1b927f34d141b0423d
Makoto Onuki [Tue, 23 Aug 2016 20:52:41 +0000 (20:52 +0000)]
Merge "Do not scan system apps unless after OTA" into nyc-mr1-dev
Adam Seaton [Tue, 23 Aug 2016 20:36:05 +0000 (20:36 +0000)]
Merge "DO NOT MERGE ANYWHERE (nyc-dr1-dev) Add connection events for indicated when a connection is remotely held." into nyc-dr1-dev am:
09c77dd2b1 -s ours am:
2c7e4d2345 -s ours
am:
9ea799541e -s ours
Change-Id: I2717fe7b2361af6083eeacf5c1cf24198185e510
Tyler Gunn [Tue, 23 Aug 2016 20:36:02 +0000 (20:36 +0000)]
DO NOT MERGE ANYWHERE (nyc-dr1-dev) Add connection events for indicated when a connection is remotely held. am:
d697c5dc9b -s ours am:
9ea9bc0213 -s ours
am:
ef59ba5472 -s ours
Change-Id: I1ada485c5a9a2a00075382a1e9e03e835a6ab74c
Adrian Roos [Tue, 23 Aug 2016 20:35:58 +0000 (20:35 +0000)]
Merge "Ambient: Pulse for every noisy notification exactly once" into nyc-dr1-dev am:
e1f32de996 am:
a9b9b42e85
am:
bd38788af6
Change-Id: Ie5a5e942f7f10e38807e8fd78db4f1205b2cedd0
Adrian Roos [Tue, 23 Aug 2016 20:35:54 +0000 (20:35 +0000)]
Ambient: Pulse for every noisy notification exactly once am:
97de2b2666 am:
7de22aa782
am:
7e30202cb9
Change-Id: Ief68005c4d27214adc8134d727d699aa071191ce
Jorim Jaggi [Tue, 23 Aug 2016 20:28:04 +0000 (13:28 -0700)]
Update light mode when battery saver changes
Change-Id: I56b309222782d823d80a66c87d30eefed2ce5dc7
Fixes:
30150232
Adam Seaton [Tue, 23 Aug 2016 20:23:38 +0000 (20:23 +0000)]
Merge "DO NOT MERGE ANYWHERE (nyc-dr1-dev) Add connection events for indicated when a connection is remotely held." into nyc-dr1-dev am:
09c77dd2b1 -s ours
am:
2c7e4d2345 -s ours
Change-Id: Ife8b19d67eebd5834c3c6348d34dfd5262fe104c
Tyler Gunn [Tue, 23 Aug 2016 20:23:37 +0000 (20:23 +0000)]
DO NOT MERGE ANYWHERE (nyc-dr1-dev) Add connection events for indicated when a connection is remotely held. am:
d697c5dc9b -s ours
am:
9ea9bc0213 -s ours
Change-Id: I9dd9d03cccd3bd1f60d3af2517ec4f5f343d144d
Adrian Roos [Tue, 23 Aug 2016 20:23:35 +0000 (20:23 +0000)]
Merge "Ambient: Pulse for every noisy notification exactly once" into nyc-dr1-dev am:
e1f32de996
am:
a9b9b42e85
Change-Id: Ia17771722f5f8c516029d47b54c0a41b3fa11f46
Adrian Roos [Tue, 23 Aug 2016 20:23:34 +0000 (20:23 +0000)]
Ambient: Pulse for every noisy notification exactly once am:
97de2b2666
am:
7de22aa782
Change-Id: Iac8dd0a375a319683767ae81752cf8f7c01b856a
Adam Seaton [Tue, 23 Aug 2016 20:16:34 +0000 (20:16 +0000)]
Merge "DO NOT MERGE ANYWHERE (nyc-dr1-dev) Add connection events for indicated when a connection is remotely held." into nyc-dr1-dev
am:
09c77dd2b1 -s ours
Change-Id: I97b120256a68cc2038b72fc13d14ca01729f3199
Tyler Gunn [Tue, 23 Aug 2016 20:16:29 +0000 (20:16 +0000)]
DO NOT MERGE ANYWHERE (nyc-dr1-dev) Add connection events for indicated when a connection is remotely held.
am:
d697c5dc9b -s ours
Change-Id: Id959d48b4c4fa5af883c42cc6fbe052cca10f367
Adrian Roos [Tue, 23 Aug 2016 20:16:23 +0000 (20:16 +0000)]
Merge "Ambient: Pulse for every noisy notification exactly once" into nyc-dr1-dev
am:
e1f32de996
Change-Id: If4171cbb2247cb8bc8f0e4e92f94724bf9ba238e
Adrian Roos [Tue, 23 Aug 2016 20:16:17 +0000 (20:16 +0000)]
Ambient: Pulse for every noisy notification exactly once
am:
97de2b2666
Change-Id: I4ae78e6f4ec4d3652f7f6eefc0cd72d3e881ea89
Adam Seaton [Tue, 23 Aug 2016 20:07:26 +0000 (20:07 +0000)]
Merge "DO NOT MERGE ANYWHERE (nyc-dr1-dev) Add connection events for indicated when a connection is remotely held." into nyc-dr1-dev
TreeHugger Robot [Tue, 23 Aug 2016 20:07:10 +0000 (20:07 +0000)]
Merge "Ambient: Pulse for every noisy notification exactly once" into nyc-dr1-dev
Sudheer Shanka [Tue, 23 Aug 2016 20:04:40 +0000 (20:04 +0000)]
Merge "Add installer app check in PM.deletePackage." into nyc-mr1-dev am:
0b3cf692f6
am:
5a59c37ff6
Change-Id: Ib4c2721979c37546523adceb729ae3de713bcb77
Sudheer Shanka [Tue, 23 Aug 2016 20:04:34 +0000 (20:04 +0000)]
Add installer app check in PM.deletePackage. am:
72de4ddb46
am:
d7b7a88f64
Change-Id: Ide4ab1f5918c0561775af522e0ef3fda4848beef
Robert Carr [Tue, 23 Aug 2016 20:04:26 +0000 (20:04 +0000)]
Only allow focused window to select seamless rotation. am:
066d94f6df am:
4cd7a8c63e
am:
e24aafc704
Change-Id: Ic14331f294d5f044393fb8f8d05639fc6c4aca2c
Sudheer Shanka [Tue, 23 Aug 2016 19:55:57 +0000 (19:55 +0000)]
Merge "Add installer app check in PM.deletePackage." into nyc-mr1-dev
am:
0b3cf692f6
Change-Id: I7011ea44c43862c4f78333509ec4d9418e4f0e77
Sudheer Shanka [Tue, 23 Aug 2016 19:55:53 +0000 (19:55 +0000)]
Add installer app check in PM.deletePackage.
am:
72de4ddb46
Change-Id: I89a3068721f9682692fb455baae376db2690204c
Robert Carr [Tue, 23 Aug 2016 19:55:47 +0000 (19:55 +0000)]
Only allow focused window to select seamless rotation. am:
066d94f6df
am:
4cd7a8c63e
Change-Id: Iaa832da75fc66c6c9824d4b9d66be94fbbeb96cf
Sudheer Shanka [Tue, 23 Aug 2016 19:39:58 +0000 (19:39 +0000)]
Merge "Add installer app check in PM.deletePackage." into nyc-mr1-dev
Selim Cinek [Tue, 23 Aug 2016 19:32:47 +0000 (19:32 +0000)]
Merge "Made background updater more robust to state changes" into nyc-mr1-dev am:
c6c45d225c
am:
c1d0f2a316
Change-Id: I16ec12bbf666ed14a50ccde2ce6bb3455f2b50c8
Selim Cinek [Tue, 23 Aug 2016 19:32:36 +0000 (19:32 +0000)]
Made background updater more robust to state changes am:
9bfba9c157
am:
37b0ccf303
Change-Id: I7af4a6ae45cebd6379e271c4310c37fc7e1ff30e
Selim Cinek [Tue, 23 Aug 2016 19:32:23 +0000 (19:32 +0000)]
Merge "Avoid weird expand animation when a notification is updated" into nyc-mr1-dev am:
c55457b146
am:
1dfb9c3563
Change-Id: I53b36ea3a3e92bb40d58509ea6b4853471b0dda7
Selim Cinek [Tue, 23 Aug 2016 19:32:13 +0000 (19:32 +0000)]
Avoid weird expand animation when a notification is updated am:
bb42b7dd48
am:
b438c11564
Change-Id: Ia1f7fa26bed36cba33309da40fce2e294c5799a8
Robert Carr [Tue, 23 Aug 2016 19:31:27 +0000 (19:31 +0000)]
Only allow focused window to select seamless rotation.
am:
066d94f6df
Change-Id: I22360bd2d0182276c68ed3e300073edf390ffcfa
Amith Yamasani [Tue, 23 Aug 2016 19:26:25 +0000 (12:26 -0700)]
Don't complain about sender of MASTER_CLEAR
Make an exception for MASTER_CLEAR broadcast when checking for
non-protected broadcasts being sent by system uid; Settings app in
this case.
Change-Id: I296404faf2be03601f8f937b96d3e2f70c0e816d
Fixes:
30891377
Tyler Gunn [Wed, 17 Aug 2016 20:48:27 +0000 (13:48 -0700)]
DO NOT MERGE ANYWHERE (nyc-dr1-dev) Add connection events for indicated when a connection is remotely held.
Note: This is different than the existing EVENT_ON_HOLD_TONE_START
and EVENT_ON_HOLD_TONE_END events, which trigger playing a hold tone for
remotely held calls. Those events also take into account whether the call
is foreground/background; it is left as a future exercise to clean that
up.
Bug:
30349182
Change-Id: I919365d243ae3b9fe56454c7a2b9d5805b2c03a2
(cherry picked from commit
b5ed860de71fe165af63b4255da25d0295abaa69)
Selim Cinek [Tue, 23 Aug 2016 19:09:37 +0000 (19:09 +0000)]
Merge "Made background updater more robust to state changes" into nyc-mr1-dev
am:
c6c45d225c
Change-Id: I2bccc8eb4829e6bc4f3f3d4e246eeb0027378987
Selim Cinek [Tue, 23 Aug 2016 19:09:35 +0000 (19:09 +0000)]
Made background updater more robust to state changes
am:
9bfba9c157
Change-Id: I32e762641b7efd9ce10f0b7d6b21b986c58c617e
Selim Cinek [Tue, 23 Aug 2016 19:09:31 +0000 (19:09 +0000)]
Merge "Avoid weird expand animation when a notification is updated" into nyc-mr1-dev
am:
c55457b146
Change-Id: I3f14c90f69d9e32c659afb2d9465de6c4752d990
Selim Cinek [Tue, 23 Aug 2016 19:09:28 +0000 (19:09 +0000)]
Avoid weird expand animation when a notification is updated
am:
bb42b7dd48
Change-Id: I68f50687c08ff6f9100d4bfcc2ac35ec52b98e09
TreeHugger Robot [Tue, 23 Aug 2016 18:55:45 +0000 (18:55 +0000)]
Merge "Made background updater more robust to state changes" into nyc-mr1-dev
TreeHugger Robot [Tue, 23 Aug 2016 18:53:20 +0000 (18:53 +0000)]
Merge "Avoid weird expand animation when a notification is updated" into nyc-mr1-dev
Andrew Rossignol [Tue, 23 Aug 2016 18:52:16 +0000 (18:52 +0000)]
Merge changes Ib9d0f4fc,I47195f91,Ib26ef543 into cw-f-dev
am:
79665f9679
Change-Id: I94e83e95f0e2e8e62fbc8f50f2475ea74489da70
Andrew Rossignol [Tue, 23 Aug 2016 18:52:07 +0000 (18:52 +0000)]
Remove unused webkit assets.
am:
e707fa7a2f
Change-Id: Ie8b74c27d417bf32c5b3874835b1e93f31c7abd2
Andrew Rossignol [Tue, 23 Aug 2016 18:51:29 +0000 (18:51 +0000)]
Remove bootanimation sounds.
am:
dc984e4f9a
Change-Id: Ic8375e0e2a4007f783b8df67e9adf6aa5efaab83
Andrew Rossignol [Tue, 23 Aug 2016 18:50:53 +0000 (18:50 +0000)]
Reduce the size of boot animaion assets.
am:
8386dc435c
Change-Id: Ie54da9a26b4c5e3f325a6e2cb6e5443bcd4c4a93
Andrew Rossignol [Tue, 23 Aug 2016 18:40:54 +0000 (18:40 +0000)]
Merge changes Ib9d0f4fc,I47195f91,Ib26ef543 into cw-f-dev
* changes:
Remove unused webkit assets.
Remove bootanimation sounds.
Reduce the size of boot animaion assets.
Todd Kennedy [Tue, 23 Aug 2016 18:23:27 +0000 (18:23 +0000)]
Merge "No need to check package name am:
ef8d8ea24a am:
e0736b4fb0" into cw-f-dev
am:
e95b696ade
Change-Id: I5ca804673f85caf8c8fa1a2a9b8fdb3110ddb47f
Todd Kennedy [Tue, 23 Aug 2016 18:23:16 +0000 (18:23 +0000)]
No need to check package name am:
ef8d8ea24a am:
e0736b4fb0
am:
321857f241
Change-Id: Ia7da54e4f55e5cd8bf775086016f799054a8d7bc
Ned Burns [Tue, 23 Aug 2016 18:16:59 +0000 (18:16 +0000)]
Merge "DO NOT MERGE Cherry-Pick: Add ViewConfiguration.getScaledScrollFactor()" into cw-f-dev
am:
b8e74df82d
Change-Id: I42f0c9cf045be4de14909c1c5dd4a31c6128ff5c
Ned Burns [Tue, 23 Aug 2016 18:16:55 +0000 (18:16 +0000)]
DO NOT MERGE Cherry-Pick: Add ViewConfiguration.getScaledScrollFactor()
am:
a5b41c88ec
Change-Id: I89907ec2fa66229a77f959d8b3459211a4cd0da0
Julius D'souza [Tue, 23 Aug 2016 18:16:49 +0000 (18:16 +0000)]
DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support am:
3275a3a5a5 -s ours am:
d5bf4039a9 -s ours am:
b2507eb7b7 -s ours am:
027f685296 -s ours am:
8b271611f0 -s ours
am:
6ce786751b -s ours
Change-Id: I81b11f4733fc25d58673d0120941b7e1de4d783f
Sailesh Nepal [Tue, 23 Aug 2016 18:16:40 +0000 (18:16 +0000)]
Merge "Add carrier regex config values for VisualVoicemailSmsFilter" into nyc-dr1-dev am:
74de00a62c am:
fa4f3b25e4
am:
de1d2e4a8c
Change-Id: I8b6b55a7191b72319f14a3939a9176bce71a2c6a
Ta-wei Yen [Tue, 23 Aug 2016 18:15:50 +0000 (18:15 +0000)]
Add carrier regex config values for VisualVoicemailSmsFilter am:
9a107a2df0 am:
16394b84d9
am:
4429fec126
Change-Id: I15f614f4425d86b0c9b16a8e5343247e4664a07e
Adrian Roos [Tue, 23 Aug 2016 18:15:36 +0000 (18:15 +0000)]
Merge "AppErrors: Don't suppress dialogs when ANR_SHOW_BACKGROUND is set" into nyc-mr1-dev am:
374f9a690b
am:
fec35c34f8
Change-Id: I346a50ed409eb3ecd9fbf6ab2d21203c29a13247
Adrian Roos [Tue, 23 Aug 2016 18:03:34 +0000 (18:03 +0000)]
AppErrors: Don't suppress dialogs when ANR_SHOW_BACKGROUND is set am:
6a7e08920c
am:
5a461b65d0
Change-Id: I2915c6ee2408dbe5942e77d26acdf47e478ee8c0
Adrian Roos [Tue, 23 Aug 2016 18:03:26 +0000 (18:03 +0000)]
Merge "Ambient: Pulse for every noisy notification exactly once" into nyc-mr1-dev am:
bd43552975
am:
24eaf0c700
Change-Id: Ibd1501f76ed8a23ff19cc8bfd335e4728bf52641
Adrian Roos [Tue, 23 Aug 2016 18:03:20 +0000 (18:03 +0000)]
Ambient: Pulse for every noisy notification exactly once am:
d13602f1e7
am:
e43dd10cbe
Change-Id: I73e008eca284a9938469adf47fc740d8fa0117df
Scott Main [Tue, 23 Aug 2016 18:03:13 +0000 (18:03 +0000)]
Merge "add workaround for annotations dependency conflict with espresso" into nyc-dev am:
77917a835f am:
f8a0cb2964 am:
0ea21992e7
am:
97a3ed97c5
Change-Id: I91fb3c4a04e3c1b8f71aec3f8db6e28467ad0810
smain@google.com [Tue, 23 Aug 2016 18:03:06 +0000 (18:03 +0000)]
add workaround for annotations dependency conflict with espresso am:
eee3518d11 am:
349edcf169 am:
da2802d1f9
am:
3e133f7e78
Change-Id: Ib9bef3c18fe142816ebbe6f5c4768c88c6063133
Android Build Merger (Role) [Tue, 23 Aug 2016 17:55:23 +0000 (17:55 +0000)]
Merge "No need to check package name am:
ef8d8ea24a am:
e0736b4fb0" into cw-f-dev
Robin Lee [Tue, 23 Aug 2016 17:55:12 +0000 (17:55 +0000)]
Merge "Documentation warning against short-lived Contexts" into nyc-mr1-dev am:
a1e4149cfd
am:
39993c3b9d
Change-Id: I3b7c8397489b596f2a9e6697fa1552b837424607
Robin Lee [Tue, 23 Aug 2016 17:55:06 +0000 (17:55 +0000)]
Documentation warning against short-lived Contexts am:
da23618043
am:
c378aabdda
Change-Id: I897063794eb0790e5bbe3c67c12eda9c6e24eee6
Rubin Xu [Tue, 23 Aug 2016 17:55:00 +0000 (17:55 +0000)]
Merge "Handle null packageName in PendingIntentRecord" into nyc-mr1-dev am:
6acd5e7361
am:
2f6eecbed0
Change-Id: Id4a238d7e050235b9bf7602501c3cfe7c6f95f49
Rubin Xu [Tue, 23 Aug 2016 17:54:54 +0000 (17:54 +0000)]
Handle null packageName in PendingIntentRecord am:
5bf8a33aaf
am:
34474e5275
Change-Id: I0907599cfa9ff430cbc712c90f160ca395240c3c
Todd Kennedy [Tue, 23 Aug 2016 17:54:51 +0000 (17:54 +0000)]
No need to check package name am:
ef8d8ea24a
am:
e0736b4fb0
Change-Id: I65af34f8d56ed62c84cd97d63aaa882c08e9898a
Rubin Xu [Tue, 23 Aug 2016 17:54:41 +0000 (17:54 +0000)]
Merge "Not longer need MANAGE_DEVICE_ADMINS permission." into nyc-mr1-dev am:
a96e906e80
am:
bcd1637096
Change-Id: I36cd761b696035181fb12d285762f74fbaaec4b4
Ned Burns [Tue, 23 Aug 2016 17:52:56 +0000 (17:52 +0000)]
Merge "DO NOT MERGE Cherry-Pick: Add ViewConfiguration.getScaledScrollFactor()" into cw-f-dev
Julius D'souza [Tue, 23 Aug 2016 17:39:14 +0000 (17:39 +0000)]
DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support am:
3275a3a5a5 -s ours am:
d5bf4039a9 -s ours am:
b2507eb7b7 -s ours am:
027f685296 -s ours
am:
8b271611f0 -s ours
Change-Id: I81859f24055ef8b69464f16cdd5b2a53a429a4cc
Sailesh Nepal [Tue, 23 Aug 2016 17:39:06 +0000 (17:39 +0000)]
Merge "Add carrier regex config values for VisualVoicemailSmsFilter" into nyc-dr1-dev am:
74de00a62c
am:
fa4f3b25e4
Change-Id: I59db620dbd2b696b017c8f51bd4115f23d8ab4af
Todd Kennedy [Tue, 23 Aug 2016 17:39:01 +0000 (17:39 +0000)]
No need to check package name
am:
ef8d8ea24a
Change-Id: Idd8b189070e3e5920cd1b9d12a8ba282de44d11a
Ta-wei Yen [Tue, 23 Aug 2016 17:38:22 +0000 (17:38 +0000)]
Add carrier regex config values for VisualVoicemailSmsFilter am:
9a107a2df0
am:
16394b84d9
Change-Id: I8820201e0c741a8b2b1cd3b60abada1941f4230d
Julius D'souza [Tue, 23 Aug 2016 17:37:38 +0000 (17:37 +0000)]
DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support am:
3275a3a5a5 -s ours am:
d5bf4039a9 -s ours am:
b2507eb7b7 -s ours
am:
7914092ded -s ours
Change-Id: Ia010417704e597c52d25fcb873fae5fcc3bfdd03
Robert Carr [Mon, 22 Aug 2016 20:32:34 +0000 (13:32 -0700)]
Only allow focused window to select seamless rotation.
We require apps to opt in to seamless rotation. If a dialog or some such
has popped up above them, the dialog may not be prepared to rotate
seamlessly and we should just fall back to the old behavior for now.
Bug:
30968345
Change-Id: Ib9a7352ed84d41076bdd162bf38d151b053a307e
(cherry picked from commit
828ec3dc518bfeff9cb9205e40652419e9c59443)
Rubin Xu [Tue, 23 Aug 2016 17:30:09 +0000 (17:30 +0000)]
Not longer need MANAGE_DEVICE_ADMINS permission. am:
1573d8be78
am:
e815c696c0
Change-Id: I685ae584cab4db2735457f63bcbf783fd405f04f
Robin Lee [Tue, 23 Aug 2016 17:29:30 +0000 (17:29 +0000)]
Merge "Force application context for KeyChain bindings" into nyc-mr1-dev am:
cabc4f5945
am:
7a64f6cbfd
Change-Id: Ifedbd9edda8450c26332f57095db56bc88808533
Robin Lee [Tue, 23 Aug 2016 17:28:54 +0000 (17:28 +0000)]
Force application context for KeyChain bindings am:
f04a663d6a
am:
4f7d56a706
Change-Id: I5d7cc8196c0bd8f5b0fe7ae8a7ec51da9197fd02
Adrian Roos [Tue, 23 Aug 2016 17:28:04 +0000 (17:28 +0000)]
Merge "HIC: Improve AccelerationClassifier" into nyc-dr1-dev am:
06165f534f am:
ee99f0ae46
am:
901ec3d053
Change-Id: I88fac62e9b36155c56595926a53b47daaf88db1a
Adrian Roos [Tue, 23 Aug 2016 17:27:54 +0000 (17:27 +0000)]
HIC: Improve AccelerationClassifier am:
4dc14b231e am:
4a0f6aeb08
am:
87aa34746c
Change-Id: Id7028c2061a37990371f46ae8ef9c5dd5358c81f
Lorenzo Colitti [Tue, 23 Aug 2016 17:21:39 +0000 (17:21 +0000)]
Refactor NetworkNotificationManager. am:
0b59906768 am:
a6dcb89e6d
am:
4e0916b416
Change-Id: I548b311ab8dc1d7e08f17a6b31573262c8a4518e
Julius D'souza [Tue, 23 Aug 2016 17:21:20 +0000 (17:21 +0000)]
DO NOT MERGE ANYWHERE: Add dynamic illuminance hysteresis support am:
3275a3a5a5 -s ours am:
d5bf4039a9 -s ours
am:
b2507eb7b7 -s ours
Change-Id: I4f63ebc686691b810538508e0959659bf2f8ae46
Lorenzo Colitti [Tue, 23 Aug 2016 17:20:59 +0000 (17:20 +0000)]
Move notification code out of ConnectivityService. am:
f3ae2eeae4 am:
622b5fbbf5
am:
28707247f4
Change-Id: I6e3290891f322c1caca3ff70a3aa39dd140d6256
OSDN Git Service
