OSDN Git Service
Philip P. Moltmann [Tue, 11 Jul 2017 17:43:43 +0000 (10:43 -0700)]
Verify regex for SimpleRegexVerifier
Test: cts-tradefed run cts-dev -m CtsAutoFillServiceTestCases
--test=android.autofillservice.cts.SimpleRegexValidatorTest
Bug:
62534917
Change-Id: I63a887643bff0f8d584069ee47f091b0edb8684c
Android Build Merger (Role) [Wed, 12 Jul 2017 14:59:33 +0000 (14:59 +0000)]
Merge "Merge "Stop unnecessary tethering reconfigurations" into oc-dr1-dev am:
49a16f0998 am:
e49c3675fe"
Erik Kline [Wed, 12 Jul 2017 14:58:27 +0000 (14:58 +0000)]
Merge "Stop unnecessary tethering reconfigurations" into oc-dr1-dev am:
49a16f0998
am:
e49c3675fe
Change-Id: Id089375a5699ac1157fc5f445876fee558d7bc7e
TreeHugger Robot [Wed, 12 Jul 2017 14:57:48 +0000 (14:57 +0000)]
Merge "Fix Handler.Callback.handleMessage javadoc."
Erik Kline [Wed, 12 Jul 2017 14:51:35 +0000 (14:51 +0000)]
Merge "Stop unnecessary tethering reconfigurations" into oc-dr1-dev
am:
49a16f0998
Change-Id: I1fc87f9c2a31f7fd16889275e6ba197b2b48a264
TreeHugger Robot [Wed, 12 Jul 2017 14:43:53 +0000 (14:43 +0000)]
Merge "Stop unnecessary tethering reconfigurations" into oc-dr1-dev
Erik Kline [Wed, 12 Jul 2017 14:22:19 +0000 (14:22 +0000)]
Merge "Add OffloadHardwareInterface.getForwardedStats() wrapper" into oc-dr1-dev am:
9df88e1fe7
am:
154bcbe518
Change-Id: I41f837e16eff9a4cd763d65155bd9b5d5d980acd
Jorim Jaggi [Wed, 12 Jul 2017 14:15:32 +0000 (14:15 +0000)]
Merge "Don't animate bouncer changes when fading out Keyguard" into oc-dr1-dev am:
f33b1eda88
am:
fb8e9add4b
Change-Id: I01bf252c08decae7f82ce854332c3b4a342b5ee3
Erik Kline [Wed, 12 Jul 2017 14:15:29 +0000 (14:15 +0000)]
Merge "Add OffloadHardwareInterface.getForwardedStats() wrapper" into oc-dr1-dev
am:
9df88e1fe7
Change-Id: Id9766983a3bbd885ef0f0d3ba9e33de903939f2d
Jorim Jaggi [Wed, 12 Jul 2017 14:07:21 +0000 (14:07 +0000)]
Merge "Don't animate bouncer changes when fading out Keyguard" into oc-dr1-dev
am:
f33b1eda88
Change-Id: I2ea9ccbfe01cfa948fb6dc6012859fc43a5c284b
TreeHugger Robot [Wed, 12 Jul 2017 14:06:52 +0000 (14:06 +0000)]
Merge "Add OffloadHardwareInterface.getForwardedStats() wrapper" into oc-dr1-dev
Lorenzo Colitti [Wed, 12 Jul 2017 14:01:51 +0000 (14:01 +0000)]
resolve merge conflicts of
5e7b01c8236b to oc-dr1-dev-plus-aosp
am:
dbdf7c1484
Change-Id: I29bff92b43e0662f11823c795036e41e51477017
Jorim Jaggi [Wed, 12 Jul 2017 12:57:33 +0000 (12:57 +0000)]
Merge "Don't animate bouncer changes when fading out Keyguard" into oc-dr1-dev
Erik Kline [Wed, 12 Jul 2017 06:46:54 +0000 (15:46 +0900)]
Add OffloadHardwareInterface.getForwardedStats() wrapper
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
Bug:
29337859
Bug:
32163131
Change-Id: Id831bc99cadbd59d280b026866707dbbe3b0e542
Lorenzo Colitti [Wed, 12 Jul 2017 11:41:21 +0000 (20:41 +0900)]
resolve merge conflicts of
5e7b01c8236b to oc-dr1-dev-plus-aosp
Test: make -j64 framework services
Change-Id: I00460c8fe606fdce1f121685919d9a2e54febe5a
Narayan Kamath [Wed, 12 Jul 2017 10:51:22 +0000 (10:51 +0000)]
Merge "Binder: Don't attempt to catch OutOfMemoryError"
Pavel Grafov [Fri, 10 Mar 2017 19:39:14 +0000 (19:39 +0000)]
Fix Handler.Callback.handleMessage javadoc.
Currently arguments and return value annotations are applied to the
whole interface and aren't rendered at all:
https://developer.android.com/reference/android/os/Handler.Callback.html#handleMessage(android.os.Message)
Test: nothing to test.
Change-Id: I8cb44f7a6c339971b770e9bf769efee8294b4d28
Bug:
36127602
Philipp Weiß [Wed, 12 Jul 2017 09:05:08 +0000 (09:05 +0000)]
Merge "Skip empty bluetooth-page in QS when bluetooth is disallowed"
Lorenzo Colitti [Wed, 12 Jul 2017 07:57:49 +0000 (07:57 +0000)]
Merge "Use RFC 7217 stable privacy addresses" into oc-dr1-dev
Hugo Benichi [Wed, 12 Jul 2017 07:25:10 +0000 (07:25 +0000)]
Merge "CaptivePortalLogin ignores some ssl errors." into oc-dev-plus-aosp am:
3425a6e5c7 -s ours
am:
fc24e1c5af -s ours
Change-Id: Ib8317ac06817ad70f8883d97c98b94b4911b3577
Hugo Benichi [Wed, 12 Jul 2017 07:14:03 +0000 (07:14 +0000)]
Merge "CaptivePortalLogin ignores some ssl errors." into oc-dev-plus-aosp
am:
3425a6e5c7 -s ours
Change-Id: I1967f5540ff997645a8a2f69b4a7939a01fc69e0
Hugo Benichi [Wed, 12 Jul 2017 07:02:42 +0000 (07:02 +0000)]
Merge "CaptivePortalLogin ignores some ssl errors." into oc-dev-plus-aosp
Hugo Benichi [Wed, 12 Jul 2017 06:44:28 +0000 (06:44 +0000)]
Merge "Instrument captive portal login activity" into oc-dev-plus-aosp am:
50c561a3db -s ours
am:
d2e0cd827e -s ours
Change-Id: Id47ea62bad68a60e2689c2e66dfa7870760a9b1d
Erik Kline [Wed, 12 Jul 2017 06:42:38 +0000 (06:42 +0000)]
Merge "Restructure use of absent tether_offload_disabled setting" am:
5bb30496cf am:
c8b4ef85dc am:
d21ad47d43 -s ours
am:
82e4d525e5 -s ours
Change-Id: Ida615e607fc39cbd704fa1c808ea65871fadcd74
Hugo Benichi [Wed, 12 Jul 2017 06:34:05 +0000 (06:34 +0000)]
Merge "Instrument captive portal login activity" into oc-dev-plus-aosp
am:
50c561a3db -s ours
Change-Id: I068db2d0b7e08f373ce2e1d7ed2618245cec6562
Erik Kline [Wed, 12 Jul 2017 06:32:14 +0000 (06:32 +0000)]
Merge "Restructure use of absent tether_offload_disabled setting" am:
5bb30496cf am:
c8b4ef85dc
am:
d21ad47d43 -s ours
Change-Id: I0d755e5c6a8d89fe91706e1b06863d0fc660b245
TreeHugger Robot [Wed, 12 Jul 2017 06:29:01 +0000 (06:29 +0000)]
Merge "Instrument captive portal login activity" into oc-dev-plus-aosp
Erik Kline [Wed, 12 Jul 2017 06:25:04 +0000 (06:25 +0000)]
Merge "Restructure use of absent tether_offload_disabled setting" am:
5bb30496cf
am:
c8b4ef85dc
Change-Id: I2210e9d25a4e7c497b9383324e574c9f8aca0d6f
Hugo Benichi [Sat, 17 Jun 2017 04:36:35 +0000 (13:36 +0900)]
CaptivePortalLogin ignores some ssl errors.
This patch changes the ssl error handler of the captive portal login
activity to ignore errors for resources coming from a different hostname
that the top-level page currently loading.
This allows logging into misconfigured portals that incorrectly bans ssl
to some hostnames necessary for loading their portal login pages.
Bug:
62332137
Test: manually tested with captive portal entwork.
Merged-In: I05378ed74e678829e46fbeee18df916ec6ec2856
Merged-In: Iff025d68b824eac2c30b9656fd2494338eb07eb3
(cherry pick from commit
22542ed48090e2e6e9474b658fdd368041a4060b which
was skipped from merging into oc-dev-plus-aosp due to missing patch)
Change-Id: I4e1be381195a8d1e510fd62533039ab3cd441679
Hugo Benichi [Mon, 5 Jun 2017 05:52:24 +0000 (14:52 +0900)]
Instrument captive portal login activity
Also add CAPTIVE_PORTAL_LOGIN_ACTIVITY_SSL_ERROR constants to
metrics_constants.proto for counting ssl error pages shown by the
captive portal login activity.
Bug:
36203355
Bug:
34901696
Bug:
36532213
Test: manually tested with captive portal testing setup while watching
event logs: adb logcat -b events | grep captiveportallogin
06-08 16:25:20.279 21558 21558 I sysui_action: [1004,com.android.captiveportallogin]
06-08 17:01:04.052 21558 21558 I sysui_action: [1007,com.android.captiveportallogin]
Merged-In: Ia05853506d424ad4cb2c11770ae7718fbef3f01c
Merged-In: I55ea3c61842f16bf6a98e812fb6dc940f96f895c
Merged-In: I38b8e4dd3d62ad1261695780aeb2377f26a25997
Merged-In: I9184f6263a003c2be28f41a550c6164c8d6ee907
(cherry picked from commit
c61dc92fc0619d101c4b789f6305012701cc47a0)
Change-Id: I89ca3dfc74d09b7b2d303c0eb01b7b9883b01a42
Erik Kline [Wed, 12 Jul 2017 06:18:11 +0000 (06:18 +0000)]
Merge "Restructure use of absent tether_offload_disabled setting"
am:
5bb30496cf
Change-Id: I9d1ec7d1c060278018c80c9374d724ee0ddba3a4
Treehugger Robot [Wed, 12 Jul 2017 06:06:07 +0000 (06:06 +0000)]
Merge "Restructure use of absent tether_offload_disabled setting"
Andreas Gampe [Wed, 12 Jul 2017 05:08:02 +0000 (05:08 +0000)]
Merge "Connectivity: Fix format arguments" am:
ba8ab362ad am:
2a13286d8d am:
ce4c57fd0e
am:
3fb3b6051e
Change-Id: I8b0734e5d786999e1b520164b78ed72f453185e0
Andreas Gampe [Wed, 12 Jul 2017 05:00:56 +0000 (05:00 +0000)]
Merge "Connectivity: Fix format arguments" am:
ba8ab362ad am:
2a13286d8d
am:
ce4c57fd0e
Change-Id: Ia789f019394b7870994fcce8e64dee3b0501f7c1
Andreas Gampe [Wed, 12 Jul 2017 04:53:54 +0000 (04:53 +0000)]
Merge "Connectivity: Fix format arguments" am:
ba8ab362ad
am:
2a13286d8d
Change-Id: I7517abe404637f92d7e361033d2d609b981f05f4
Andreas Gampe [Wed, 12 Jul 2017 04:48:10 +0000 (04:48 +0000)]
Merge "Connectivity: Fix format arguments"
am:
ba8ab362ad
Change-Id: I844c7d1faea3dcc90cf9816cae984277d7525f15
Treehugger Robot [Wed, 12 Jul 2017 04:35:34 +0000 (04:35 +0000)]
Merge "Connectivity: Fix format arguments"
TreeHugger Robot [Wed, 12 Jul 2017 04:34:51 +0000 (04:34 +0000)]
Merge "Ensure stream type valid in AudioService.isStreamMute"
Erik Kline [Fri, 7 Jul 2017 08:38:30 +0000 (17:38 +0900)]
Restructure use of absent tether_offload_disabled setting
This restructures the fetching of the default disposition such
that we disable (and enable) the feature with only a single
character change.
Additionally: fix unittests with proper use of FakeSettingsProvider.
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passed with developer enabled and disabled
Bug:
29337859
Bug:
32163131
Bug:
63250751
(cherry picked from commit
c87cd411843484225897ebdf91cd05073c1c5f35)
Merged-In: Ib32489d07778465134bca52c589baddbd78ab129
Merged-In: I03d68b0da192fbd6172639343d4ab88c20127ad7
Merged-In: I10c0af2b2c4f6b6e613380e637cc3acb1f7a55a3
Change-Id: Ie16a022be8dacd76b0402bcb777680c36163a084
Di Lu [Wed, 12 Jul 2017 04:21:00 +0000 (04:21 +0000)]
Merge "Remove return value of ipSecAddSecurityAssociation" am:
cd5c1161ab am:
38e72983a5 am:
c554c2c1cb
am:
197aaf0a34
Change-Id: I77f2e8be5a3ce9fe1c8c49b2530a8955abf5b0cc
Hugo Benichi [Wed, 12 Jul 2017 04:13:53 +0000 (04:13 +0000)]
Merge "Add first OWNERS files for core networking" am:
4066930a36 am:
531cae76fd am:
59de81533d
am:
5185c1ce92
Change-Id: I3d0b7bcc72c21485671602d1e6f185fbc7702fe2
Di Lu [Wed, 12 Jul 2017 04:13:52 +0000 (04:13 +0000)]
Merge "Remove return value of ipSecAddSecurityAssociation" am:
cd5c1161ab am:
38e72983a5
am:
c554c2c1cb
Change-Id: I94e533d415e0afdbd4be72536ec667513a32f025
Di Lu [Wed, 12 Jul 2017 04:08:24 +0000 (04:08 +0000)]
Merge "Remove return value of ipSecAddSecurityAssociation" am:
cd5c1161ab
am:
38e72983a5
Change-Id: I08b1498e05321b8cda04f56d07a0a5f50260d7d2
Hugo Benichi [Wed, 12 Jul 2017 04:07:18 +0000 (04:07 +0000)]
Merge "Add first OWNERS files for core networking" am:
4066930a36 am:
531cae76fd
am:
59de81533d
Change-Id: Id149a16336fd5adfe8b247bb4b116db1ee357653
Di Lu [Wed, 12 Jul 2017 04:02:24 +0000 (04:02 +0000)]
Merge "Remove return value of ipSecAddSecurityAssociation"
am:
cd5c1161ab
Change-Id: I3cf6dbc44af4934c34b074dccdfff77dede6a693
Hugo Benichi [Wed, 12 Jul 2017 04:01:15 +0000 (04:01 +0000)]
Merge "Add first OWNERS files for core networking" am:
4066930a36
am:
531cae76fd
Change-Id: I099ee71d8b9ed767af2f4556e4798a1263dab9c0
Hugo Benichi [Wed, 12 Jul 2017 03:54:57 +0000 (03:54 +0000)]
Merge "Add first OWNERS files for core networking"
am:
4066930a36
Change-Id: Ib8e1b85be03ad5e75a89a7951a59b9bc2a04d112
Eric Laurent [Wed, 12 Jul 2017 03:54:44 +0000 (03:54 +0000)]
Merge "audioservice: fix media volume reset at boot" into oc-dr1-dev am:
09a93b9739
am:
5dbd36d6c2
Change-Id: Id3cffa56e203092a720f2ec34a6304880b83020a
Di Lu [Wed, 12 Jul 2017 03:53:57 +0000 (03:53 +0000)]
Merge "Remove return value of ipSecAddSecurityAssociation"
Eric Laurent [Wed, 12 Jul 2017 03:47:59 +0000 (03:47 +0000)]
Merge "audioservice: fix media volume reset at boot" into oc-dr1-dev
am:
09a93b9739
Change-Id: Id77262dcf3f4fe46c8a080c7b5147161809c6332
Treehugger Robot [Wed, 12 Jul 2017 03:41:57 +0000 (03:41 +0000)]
Merge "Add first OWNERS files for core networking"
TreeHugger Robot [Wed, 12 Jul 2017 03:38:14 +0000 (03:38 +0000)]
Merge "audioservice: fix media volume reset at boot" into oc-dr1-dev
Erik Kline [Wed, 12 Jul 2017 03:19:48 +0000 (03:19 +0000)]
Merge "Restructure use of absent tether_offload_disabled setting" into oc-dr1-dev am:
d8fdb26ebf
am:
9d9b5c22f1
Change-Id: I10c0af2b2c4f6b6e613380e637cc3acb1f7a55a3
George Burgess IV [Wed, 12 Jul 2017 03:14:47 +0000 (03:14 +0000)]
Merge "app_main: silence static analyzer warnings" am:
cf188f664a am:
8a4be2a6ae am:
5987ab35ca
am:
10307ebe1f
Change-Id: Ie8b629e97a95f6afd33dc52df71d2508467273e3
Erik Kline [Wed, 12 Jul 2017 03:11:15 +0000 (03:11 +0000)]
Merge "Restructure use of absent tether_offload_disabled setting" into oc-dr1-dev
am:
d8fdb26ebf
Change-Id: I03d68b0da192fbd6172639343d4ab88c20127ad7
Winson Chung [Wed, 12 Jul 2017 03:09:04 +0000 (03:09 +0000)]
Merge "Fix z-order issue with text cursors and PiP." into oc-dr1-dev am:
bd2682d056
am:
8701ee564d
Change-Id: Ifea5eec9aebf553b4b092835fd306176d532ecbe
George Burgess IV [Wed, 12 Jul 2017 03:07:46 +0000 (03:07 +0000)]
Merge "app_main: silence static analyzer warnings" am:
cf188f664a am:
8a4be2a6ae
am:
5987ab35ca
Change-Id: Idc8694cc79e336bb93b38d25fbd7b25ca7a31f0b
Jack He [Wed, 12 Jul 2017 03:07:30 +0000 (03:07 +0000)]
Merge "GATT: Expose opportunistic client API to Java" into oc-dr1-dev am:
b822ad3e06 -s ours
am:
21c14de87f -s ours
Change-Id: I791e16d803948348f13b937dfd1331b56c25a971
TreeHugger Robot [Wed, 12 Jul 2017 03:05:18 +0000 (03:05 +0000)]
Merge "Restructure use of absent tether_offload_disabled setting" into oc-dr1-dev
Winson Chung [Wed, 12 Jul 2017 03:02:44 +0000 (03:02 +0000)]
Merge "Fix z-order issue with text cursors and PiP." into oc-dr1-dev
am:
bd2682d056
Change-Id: I0dd3a57d7f2e87074f1bd5275c011116dcba1d9d
Jack He [Wed, 12 Jul 2017 03:02:10 +0000 (03:02 +0000)]
GATT: Expose opportunistic client API to Java am:
79bf7d755f -s ours
am:
850738d679 -s ours
Change-Id: I759ab98af3d1c2b8511e6d30b8e10b8d193c1cbd
Jack He [Wed, 12 Jul 2017 03:00:58 +0000 (03:00 +0000)]
Merge "GATT: Expose opportunistic client API to Java" into oc-dr1-dev
am:
b822ad3e06 -s ours
Change-Id: Ib97a6200288808c35d30d86d8043284cf9e1437f
George Burgess IV [Wed, 12 Jul 2017 03:00:43 +0000 (03:00 +0000)]
Merge "app_main: silence static analyzer warnings" am:
cf188f664a
am:
8a4be2a6ae
Change-Id: Ic7b6e1092261a0e76fc84b213166729ea3451166
George Burgess IV [Wed, 12 Jul 2017 02:54:24 +0000 (02:54 +0000)]
Merge "app_main: silence static analyzer warnings"
am:
cf188f664a
Change-Id: Ibad16ec8fabb4edaaa832bc43505f81fefb10ec7
Winson Chung [Wed, 12 Jul 2017 02:53:59 +0000 (02:53 +0000)]
Merge "Fix z-order issue with text cursors and PiP." into oc-dr1-dev
Jack He [Wed, 12 Jul 2017 02:53:22 +0000 (02:53 +0000)]
GATT: Expose opportunistic client API to Java
am:
79bf7d755f -s ours
Change-Id: I1a757066905894c1fb70f3010a723f37b43103d1
TreeHugger Robot [Wed, 12 Jul 2017 02:47:56 +0000 (02:47 +0000)]
Merge "GATT: Expose opportunistic client API to Java" into oc-dr1-dev
Treehugger Robot [Wed, 12 Jul 2017 02:43:14 +0000 (02:43 +0000)]
Merge "app_main: silence static analyzer warnings"
qingxi [Wed, 12 Jul 2017 02:37:20 +0000 (02:37 +0000)]
Merge "Move eSIM factory reset implementation to RecoverySystem" into oc-dr1-dev am:
a249de50d1
am:
a6536cc85e -s ours
Change-Id: I8d60f4a50c46df393774af38f7035ec027460099
qingxi [Wed, 12 Jul 2017 02:31:24 +0000 (02:31 +0000)]
Merge "Move eSIM factory reset implementation to RecoverySystem" into oc-dr1-dev
am:
a249de50d1
Change-Id: I784617e0c34275adc5d177e6728b4b2c86dc1f5d
Svet Ganov [Wed, 12 Jul 2017 02:23:43 +0000 (02:23 +0000)]
Merge "Avoid a race in autofill manager service." into oc-dr1-dev am:
d622be1754
am:
55fbe549d5
Change-Id: If651c4d88017c439432dd93b21944fc43a36dfe3
TreeHugger Robot [Wed, 12 Jul 2017 02:17:42 +0000 (02:17 +0000)]
Merge "Move eSIM factory reset implementation to RecoverySystem" into oc-dr1-dev
Svet Ganov [Wed, 12 Jul 2017 02:17:20 +0000 (02:17 +0000)]
Merge "Avoid a race in autofill manager service." into oc-dr1-dev
am:
d622be1754
Change-Id: I1e94b6e3601078b9f999f5f33a3d8425035de8c2
TreeHugger Robot [Wed, 12 Jul 2017 02:09:00 +0000 (02:09 +0000)]
Merge "Avoid a race in autofill manager service." into oc-dr1-dev
jiabin [Wed, 12 Jul 2017 02:03:18 +0000 (02:03 +0000)]
Merge "Use DisplayListener instead of WindowRotationListener in AudioService." into oc-dr1-dev am:
4c66a1dd0d
am:
199ebcc5d2
Change-Id: I781602abeaeebfd548877b97c58a1f8b06553907
jiabin [Wed, 12 Jul 2017 01:56:45 +0000 (01:56 +0000)]
Merge "Use DisplayListener instead of WindowRotationListener in AudioService." into oc-dr1-dev
am:
4c66a1dd0d
Change-Id: I75bf198fe6d32ef3dcb4080b17d9f8fe2ab0dbce
Andreas Gampe [Wed, 12 Jul 2017 01:50:13 +0000 (01:50 +0000)]
Merge "IpSecService: Actually throw exception" am:
3eff26449f am:
c5f089e6d5 am:
d7c0357277
am:
b33fdcf59c
Change-Id: Ic3440c4f933725be28d5cd2b86bebc2950206f63
TreeHugger Robot [Wed, 12 Jul 2017 01:48:36 +0000 (01:48 +0000)]
Merge "Use DisplayListener instead of WindowRotationListener in AudioService." into oc-dr1-dev
Andreas Gampe [Wed, 12 Jul 2017 01:43:13 +0000 (01:43 +0000)]
Merge "IpSecService: Actually throw exception" am:
3eff26449f am:
c5f089e6d5
am:
d7c0357277
Change-Id: I9d5b81d6f62b6d8ff7561d908c6d61b4a21c7419
Andreas Gampe [Wed, 12 Jul 2017 01:36:08 +0000 (01:36 +0000)]
Merge "IpSecService: Actually throw exception" am:
3eff26449f
am:
c5f089e6d5
Change-Id: Iefbe52615c1795cf1757b1f7557daf26e1d560d3
Andreas Gampe [Wed, 12 Jul 2017 01:29:47 +0000 (01:29 +0000)]
Merge "IpSecService: Actually throw exception"
am:
3eff26449f
Change-Id: I415b249d564c5ffdd2d9381b53a31dd6f6c18eab
Andreas Gampe [Tue, 11 Jul 2017 22:14:41 +0000 (15:14 -0700)]
Connectivity: Fix format arguments
Fix missing argument.
Bug:
19797138
Test: m
Change-Id: I5fdd2a453c0d7422e8c3e79c8dce2d0800ec45e9
Treehugger Robot [Wed, 12 Jul 2017 01:17:19 +0000 (01:17 +0000)]
Merge "IpSecService: Actually throw exception"
TreeHugger Robot [Wed, 12 Jul 2017 01:06:55 +0000 (01:06 +0000)]
Merge "Implement Luhn checksum algo"
Jack He [Wed, 5 Jul 2017 21:55:35 +0000 (14:55 -0700)]
GATT: Expose opportunistic client API to Java
* Allow Java based programs to create an opportunistic GATT client
* Such client does not hold a GATT connection. It automatically
disconnects when no other GATT connections are active for the
remote device.
Bug:
63347806
Test: make, run battery service
Change-Id: Ib9333817d7f17a1fa3ddacfa51c680890bac19ec
Merged-In: Ib9333817d7f17a1fa3ddacfa51c680890bac19ec
(cherry picked from commit
13f52c8118c09ffc57b581a7d44b08e5e66d62fe)
Eric Laurent [Tue, 11 Jul 2017 21:08:11 +0000 (14:08 -0700)]
audioservice: fix media volume reset at boot
mSafeUsbMediaVolumeIndex must be initialized after createStreamStates()
because it relies on audio policy having correct ranges for volum indexes.
Also change the safe volume threshold for USB headset from -15dBFs to
-30dBFs to account for max EQ gain.
Bug:
63462140
Bug:
63388412
Test: Verify USB headset media volume is unchanged after reboot
when no SIM is present.
Change-Id: I5252d97e3f3dcde7568681abb066752ef0d936d2
George Burgess IV [Wed, 12 Jul 2017 00:18:26 +0000 (17:18 -0700)]
app_main: silence static analyzer warnings
This silences two warnings:
frameworks/base/cmds/app_process/app_main.cpp:238:11: warning: Potential
memory leak
frameworks/base/cmds/app_process/app_main.cpp:261:9: warning: Potential
memory leak
As the (existing) comment notes, we nuke argv later in main(), so these
copies are necessary. Since these args need to live for basically the
entire life of the process, it seems pointless to go out of our way to
free them.
Bug:
27101951
Test: mma. Static analyzer warnings are gone.
Change-Id: Icbfabfede9db909f6acb274b697cb6076c3fc11f
Hugo Benichi [Fri, 7 Jul 2017 02:55:41 +0000 (11:55 +0900)]
Add first OWNERS files for core networking
Covering
core/java/android/net/
core/java/com/android/server/net/
packages/CaptivePortalLogin/
services/core/java/com/android/server/
ConnectivityService.java
NsdServic.java
NetworkManagementService.java
services/core/java/com/android/server/connectivity/
services/net/
tests/net/
Android core networking files not covered:
services/core/jni/com_android_server_connectivity_tethering_OffloadHardwareInterface.cpp
services/core/proto/ipconnectivity.proto (path unique to aosp)
Bug:
63408147
Test: builds
Change-Id: Ifbb923d5ffdcada83864b5e0eb07911682d66efa
Android Build Merger (Role) [Wed, 12 Jul 2017 00:19:09 +0000 (00:19 +0000)]
Merge "Merge "Ensure transparent assistant works with PiP" into oc-dr1-dev am:
8d10791f5b am:
2b9ebbe093"
Winson Chung [Wed, 12 Jul 2017 00:17:59 +0000 (00:17 +0000)]
Merge "Ensure transparent assistant works with PiP" into oc-dr1-dev am:
8d10791f5b
am:
2b9ebbe093
Change-Id: I78490c8395111630429a73e4bda31cc155547c03
TreeHugger Robot [Wed, 12 Jul 2017 00:16:09 +0000 (00:16 +0000)]
Merge "Preload app-process HALs in Zygote"
TreeHugger Robot [Wed, 12 Jul 2017 00:15:30 +0000 (00:15 +0000)]
Merge "Update test names in UserLifecycleTest."
Winson Chung [Wed, 12 Jul 2017 00:09:35 +0000 (00:09 +0000)]
Merge "Ensure transparent assistant works with PiP" into oc-dr1-dev
am:
8d10791f5b
Change-Id: Ie8ea7cec050551193b1c0520e349f6552fe0b6dd
Winson Chung [Wed, 12 Jul 2017 00:01:48 +0000 (00:01 +0000)]
Merge "Ensure transparent assistant works with PiP" into oc-dr1-dev
Winson Chung [Tue, 11 Jul 2017 16:59:56 +0000 (09:59 -0700)]
Fix z-order issue with text cursors and PiP.
- When an activity is in PiP, its windows are top most and always
computed incorrectly as the IME target. As a result, the popup
windows for the cursors don't find the right parent and are not
promoted to be above the IME.
Bug:
63546389
Test: Enter PiP, open app with bottom anchored input, and select
some text. Ensure that the cursors are top-most.
Test: go/wm-smoke
Change-Id: I1267504e10544b0a075bbf73e41e001d07a5f74c
TreeHugger Robot [Tue, 11 Jul 2017 23:48:22 +0000 (23:48 +0000)]
Merge "Prevent play/pause key from starting voice search on TV"
jiabin [Mon, 26 Jun 2017 20:48:14 +0000 (13:48 -0700)]
Use DisplayListener instead of WindowRotationListener in AudioService.
In AudioService should use a DisplayListener to listen for the default
display's orientation, not handling window orientation in AudioService.
Bug:
62460024
Test: Manually test on Marlin.
Change-Id: I0b7280f9e851b10e8c23406cae3407b45c97bdda
(cherry picked from commit
383c1cefd112c0cd56a3b34a9891ce095d3013de)
Android Build Merger (Role) [Tue, 11 Jul 2017 23:15:48 +0000 (23:15 +0000)]
Merge "Fix method sinature of FuseAppLoop JNI code am:
81977b8929 am:
4f7346b4fa"
Philip P. Moltmann [Tue, 11 Jul 2017 23:15:35 +0000 (23:15 +0000)]
Merge "Stabilize order of options in ImageTransformation"
Daichi Hirono [Tue, 11 Jul 2017 23:14:41 +0000 (23:14 +0000)]
Fix method sinature of FuseAppLoop JNI code am:
81977b8929
am:
4f7346b4fa
Change-Id: I874e40a0105d9d7666b88918d877d8d6dcf6dce3
OSDN Git Service
