Commit Graph

7324 Commits

Author SHA1 Message Date
Heemin Seog
d6bb517577 Merge "Change factoryReset to succeed for Settings" am: 67322170b5 am: 9d59a75463 am: 86ee3e922d
am: 6f44822682

Change-Id: Ib8361625c9d0ef00f6cbbb6e35b5167ce8d7dcd6
2019-06-14 00:39:39 -07:00
Heemin Seog
6f44822682 Merge "Change factoryReset to succeed for Settings" am: 67322170b5 am: 9d59a75463
am: 86ee3e922d

Change-Id: I5b826a4744cd4dfc8848ab6cd8313307d537d68b
2019-06-14 00:31:38 -07:00
Heemin Seog
86ee3e922d Merge "Change factoryReset to succeed for Settings" am: 67322170b5
am: 9d59a75463

Change-Id: I9b7ce285fc205255dd9e2e0fa71afd0f8392d243
2019-06-14 00:25:17 -07:00
Treehugger Robot
67322170b5 Merge "Change factoryReset to succeed for Settings" 2019-06-14 07:02:17 +00:00
Lorenzo Colitti
6f2385bbca Merge "Change factoryReset to succeed for Settings" into qt-dev am: a86fb41d68 am: 5015d9fa86
am: 84bd2bc63e

Change-Id: I6537cc1b37184c0db27ff9e93a3b55f38292b2be
2019-06-13 22:46:03 -07:00
Lorenzo Colitti
e0266ba227 Merge "Change factoryReset to succeed for Settings" into qt-dev am: a86fb41d68 am: 2d2d35427c
am: b1e757ebb8

Change-Id: I75b0f141421ff0eec3e9d62daf953600a8173186
2019-06-13 22:34:04 -07:00
Lorenzo Colitti
84bd2bc63e Merge "Change factoryReset to succeed for Settings" into qt-dev am: a86fb41d68
am: 5015d9fa86

Change-Id: Icfc13c71e2d768a1080aeaa9130896621fe986ce
2019-06-13 22:13:35 -07:00
Lorenzo Colitti
b1e757ebb8 Merge "Change factoryReset to succeed for Settings" into qt-dev am: a86fb41d68
am: 2d2d35427c

Change-Id: Ica379a97191bb4c7f7b93b4b3396df9e102d30e0
2019-06-13 22:09:00 -07:00
Lorenzo Colitti
5015d9fa86 Merge "Change factoryReset to succeed for Settings" into qt-dev
am: a86fb41d68

Change-Id: Iea895d4bbbae2fd6ddaf0c7627c8066c0a7e6033
2019-06-13 21:52:34 -07:00
Lorenzo Colitti
a86fb41d68 Merge "Change factoryReset to succeed for Settings" into qt-dev 2019-06-14 04:13:27 +00:00
Heemin Seog
d5085f3093 Change factoryReset to succeed for Settings
Wrap a part of factoryReset with Binder.withCleanCallingIdentity() so
that it doesn't crash thinking that a different uid connected to the
network stack.

Test: build, manual
Change-Id: Iea246a4c1939a4e7e35434137051835ece81d92f
2019-06-13 09:30:19 -07:00
Heemin Seog
47e9a55358 Change factoryReset to succeed for Settings
Wrap a part of factoryReset with Binder.withCleanCallingIdentity() so
that it doesn't crash thinking that a different uid connected to the
network stack.

Bug: 135029349
Test: build, manual
Change-Id: Iea246a4c1939a4e7e35434137051835ece81d92f
2019-06-13 09:19:48 -07:00
Chiachang Wang
d8daf1277d Merge "Suppress the wtf log for notifications that are expected" am: 6b6e383d2b am: 4e3761e1d9 am: 632cf0f090
am: 26fb026e63

Change-Id: I91b92249dc7905aadbc59df50c3bc6da30a8590e
2019-06-13 02:50:16 -07:00
Chiachang Wang
26fb026e63 Merge "Suppress the wtf log for notifications that are expected" am: 6b6e383d2b am: 4e3761e1d9
am: 632cf0f090

Change-Id: I228813f2a79025b51c206cec920e1762b680212f
2019-06-13 02:46:01 -07:00
Chiachang Wang
632cf0f090 Merge "Suppress the wtf log for notifications that are expected" am: 6b6e383d2b
am: 4e3761e1d9

Change-Id: Ia1c2a765b0fb0cc8d440c02533bdc15774a5a3ef
2019-06-13 02:29:06 -07:00
Chiachang Wang
6b6e383d2b Merge "Suppress the wtf log for notifications that are expected" 2019-06-13 09:15:09 +00:00
Chiachang Wang
a6cd3b1b89 Suppress the wtf log for notifications that are expected
PARTIAL and NO_INTERNET may happen in the real world for
those transport types that provide internet. These two
notification types should be reasonable notificaitons, not a
terrible failure as the log. For Q, it may be too risky to
display more notifications with other information instead of
SSID. Thus, suppress the wtf log for these two notifications.

Bug: 135043192
Test: atest FrameworksNetTests
Change-Id: I35f3718fa93b403858587d918f0bc596f6c92f3e
2019-06-13 07:55:07 +00:00
Luke Huang
402e2e5d76 [automerger skipped] Merge "Merge "Fix race condition caused by fd reused for DnsResolver" into qt-dev am: 7187dbc4e0 am: f7e2b55a70" into qt-r1-dev-plus-aosp
am: 47ee9d48ba -s ours
am skip reason: change_id I443bb11b15845b079ee4370a7797e692e62fa3c8 with SHA1 766354ccc3 is in history

Change-Id: I45c5e6309a6218448b82b7226aa3190177058bb4
2019-06-12 01:33:38 -07:00
Luke Huang
e5bdb45668 [automerger skipped] Merge "Fix race condition caused by fd reused for DnsResolver" into qt-dev am: 7187dbc4e0 am: 143d037127
am: 6d76a45289 -s ours
am skip reason: change_id I443bb11b15845b079ee4370a7797e692e62fa3c8 with SHA1 766354ccc3 is in history

Change-Id: I176b4ab3e57377ed5e4b257dc1ba6cb44a1bc8b2
2019-06-12 01:32:02 -07:00
Android Build Merger (Role)
47ee9d48ba Merge "Merge "Fix race condition caused by fd reused for DnsResolver" into qt-dev am: 7187dbc4e0 am: f7e2b55a70" into qt-r1-dev-plus-aosp 2019-06-12 08:27:58 +00:00
Luke Huang
6d76a45289 Merge "Fix race condition caused by fd reused for DnsResolver" into qt-dev am: 7187dbc4e0
am: 143d037127

Change-Id: I3ccce970c788944cbdf597e92766b1fa30d2009e
2019-06-12 01:27:05 -07:00
Luke Huang
07de6202d4 Merge "Fix race condition caused by fd reused for DnsResolver" into qt-dev am: 7187dbc4e0
am: f7e2b55a70

Change-Id: I5be2a7839c7384bd566320ee153944738d91c0f8
2019-06-12 01:27:03 -07:00
Luke Huang
143d037127 Merge "Fix race condition caused by fd reused for DnsResolver" into qt-dev
am: 7187dbc4e0

Change-Id: Ib33d8a7955039eb6ec40c949670a52fa2f76660a
2019-06-12 01:22:07 -07:00
Mark Chien
8fd2a20670 Merge "Fix NullPointerException in ConnectivityService" am: 6edc85b8e4 am: d0e6636019 am: 889fe88bf0
am: 47c7468b78

Change-Id: I8ac5bbeb053af4e626980725c8216758c797e6ea
2019-06-11 23:53:47 -07:00
Mark Chien
47c7468b78 Merge "Fix NullPointerException in ConnectivityService" am: 6edc85b8e4 am: d0e6636019
am: 889fe88bf0

Change-Id: Ifb398cef8fb51848b4c1cefa2ef1dfd6b6c01732
2019-06-11 23:48:31 -07:00
Mark Chien
889fe88bf0 Merge "Fix NullPointerException in ConnectivityService" am: 6edc85b8e4
am: d0e6636019

Change-Id: If0c65bd11f5b76e35f6033fa79a8938f7e47a8e7
2019-06-11 23:43:37 -07:00
Mark Chien
6edc85b8e4 Merge "Fix NullPointerException in ConnectivityService" 2019-06-12 06:24:41 +00:00
Varun Anand
726806d7a3 [automerger skipped] Merge changes from topic "vpn_data_accnt_revert" am: aa3d512c05 am: 39f9c1c212 -s ours am: ab1ec6527c -s ours
am: a51b10cae0 -s ours
am skip reason: change_id Ibdaad3a4cbf0d8ef1ed53cfab1e454b9b878bae9 with SHA1 237d3e55cd is in history

Change-Id: I476f1bf69f0cceaeadbe6dbdd93b5dfa096e955a
2019-06-11 19:22:30 -07:00
Varun Anand
a51b10cae0 [automerger skipped] Merge changes from topic "vpn_data_accnt_revert" am: aa3d512c05 am: 39f9c1c212 -s ours
am: ab1ec6527c -s ours
am skip reason: change_id Ibdaad3a4cbf0d8ef1ed53cfab1e454b9b878bae9 with SHA1 237d3e55cd is in history

Change-Id: I48f805c08d46e03a837173f59f411506c9748951
2019-06-11 19:11:23 -07:00
Varun Anand
ab1ec6527c [automerger skipped] Merge changes from topic "vpn_data_accnt_revert" am: aa3d512c05
am: 39f9c1c212 -s ours
am skip reason: change_id Ibdaad3a4cbf0d8ef1ed53cfab1e454b9b878bae9 with SHA1 237d3e55cd is in history

Change-Id: I47d22d76e3525efc7771e6b514ebadc9b2c75e22
2019-06-11 19:03:04 -07:00
Varun Anand
aa3d512c05 Merge changes from topic "vpn_data_accnt_revert"
* changes:
  Revert "Take all VPN underlying networks into account when migrating traffic for"
  Revert "NetworkStatsService: Fix getDetailedUidStats to take VPNs into account."
  Revert "Addressing comments for http://ag/7700679."
  Revert "Add one more test for VPN usage stats."
2019-06-12 01:05:01 +00:00
Luke Huang
d4b823433c Fix race condition caused by fd reused for DnsResolver
There might be a gap between fd close and fd event listener unregister.
If fd is reused for another query during that gap, it might cause the
query failed with no response since addOnFileDescriptorEventListener
method failed. To fix this problem, we must ensure that fd event
listener is unregistered before fd closing.

Bug: 134310704
Test: atest DnsResolverTest

Merged-In: I443bb11b15845b079ee4370a7797e692e62fa3c8
(cherry picked from commit 07de4cf82ac09f8b9f37afa9eb1b7a44b43b6fe6)

Change-Id: I7041e67d8c906cbf88050e7d94245f8e15dcdbb4
2019-06-11 17:33:39 +00:00
Luke Huang
766354ccc3 Merge "Fix race condition caused by fd reused for DnsResolver" am: ece3a7471c am: f8a2c15ca1 am: ac5024452d
am: 8e760fe220

Change-Id: I443bb11b15845b079ee4370a7797e692e62fa3c8
2019-06-11 09:08:00 -07:00
Luke Huang
8e760fe220 Merge "Fix race condition caused by fd reused for DnsResolver" am: ece3a7471c am: f8a2c15ca1
am: ac5024452d

Change-Id: I6268edd2b0f98694de7c55f8c6fac844cd5f8635
2019-06-11 08:56:50 -07:00
Luke Huang
ac5024452d Merge "Fix race condition caused by fd reused for DnsResolver" am: ece3a7471c
am: f8a2c15ca1

Change-Id: I93e0d4a8664a16f2814763346ff00e6c874efd02
2019-06-11 08:52:18 -07:00
Luke Huang
ece3a7471c Merge "Fix race condition caused by fd reused for DnsResolver" 2019-06-11 15:32:17 +00:00
Luke Huang
17a68ce4f8 Fix race condition caused by fd reused for DnsResolver
There might be a gap between fd close and fd event listener unregister.
If fd is reused for another query during that gap, it might cause the
query failed with no response since addOnFileDescriptorEventListener
method failed. To fix this problem, we must ensure that fd event
listener is unregistered before fd closing.

Bug: 134310704
Test: atest DnsResolverTest
Change-Id: Ifb6bd34dc54dcf1c61fe8b87785124df4bc0f410
2019-06-11 15:18:28 +08:00
Varun Anand
9863ba9f09 Revert "Take all VPN underlying networks into account when migrating traffic for"
This reverts commit 2dbf6e6978.

Reason for revert: This change has been implicated in 4-way deadlocks as seen in b/134244752.

Bug: 134244752
Change-Id: I2f1839d7776a613ca571af8a542755ddc5fc8760
Merged-In: Ibdaad3a4cbf0d8ef1ed53cfab1e454b9b878bae9
2019-06-10 16:00:48 -07:00
Varun Anand
0e62e01524 Revert "NetworkStatsService: Fix getDetailedUidStats to take VPNs into account."
This reverts commit 23e1e5e300.

Reason for revert: This change has been implicated in 4-way deadlocks as seen in b/134244752.

Bug: 134244752
Change-Id: I37f75c2b243ea548a88ef1dae88287405c6ef55f
Merged-In: I0c00e8f0e30cee987b71b561079a97bf09d4dae4
2019-06-10 16:00:38 -07:00
Varun Anand
b5be3c22e5 Revert "Addressing comments for http://ag/7700679."
This reverts commit ab4f831229.

Reason for revert: This change has been implicated in 4-way deadlocks as seen in b/134244752.

Bug: 134244752
Change-Id: I12ab724e2ef8a5c1b42078330ba74713ff86fdd1
Merged-In: I5fbb3443a39a21fc9d96442726cd10d20e8d61cd
2019-06-10 16:00:28 -07:00
Varun Anand
a79856d603 Revert "Add one more test for VPN usage stats."
This reverts commit e13b3791a0.

Reason for revert: This change has been implicated in 4-way deadlocks as seen in b/134244752.

Bug: 134244752
Change-Id: I87ddc0af9ff6fbd9b7afd6d4d24985b9b7205416
Merged-In: I64b48d575f2e6ec4cb7d2d100a859a30af0501dc
2019-06-10 15:59:58 -07:00
Benedict Wong
c53ad327b4 Merge changes from topic "am-9a435ce648dc47d49fc32dc2680fa5b7" into qt-r1-dev-plus-aosp
am: 6e2518eee4

Change-Id: I46aebe74e24d39b7fce0c7eb835e282d59f2c169
2019-06-07 02:50:31 -07:00
Benedict Wong
3548266f99 Revert "Take all VPN underlying networks into account when migrating traffic for" am: 237d3e55cd am: 00ea7edde3
am: 86af1c8612

Change-Id: I5306f76761ce4ae3c8a0ec89b6bdea3e004a1d73
2019-06-07 02:48:37 -07:00
Benedict Wong
577a0bd681 Revert "NetworkStatsService: Fix getDetailedUidStats to take VPNs into account." am: d73fa75845 am: f428a00d1e
am: ccdd5bdded

Change-Id: I6e9f5b04bbb036c13eedee6e8d079a48f14f5685
2019-06-07 02:48:33 -07:00
Benedict Wong
c1784bfc1c Revert "Addressing comments for http://ag/7700679." am: 01ca66ff03 am: 2dce717756
am: 570ccdc801

Change-Id: If2c644ab4b69f385a6e939ca4760530c196f098d
2019-06-07 02:48:29 -07:00
Benedict Wong
cbbbb1fb9d Revert "Add one more test for VPN usage stats." am: e81acb7351 am: c57fff650e
am: 7aee019ab7

Change-Id: I0f46aeeb024e7ca6e694ba8cdf0893b12dc12c0b
2019-06-07 02:48:23 -07:00
Android Build Merger (Role)
6e2518eee4 Merge changes from topic "am-9a435ce648dc47d49fc32dc2680fa5b7" into qt-r1-dev-plus-aosp
* changes:
  Revert "Take all VPN underlying networks into account when migrating traffic for" am: 237d3e55cd am: 3e9726c69c
  Revert "NetworkStatsService: Fix getDetailedUidStats to take VPNs into account." am: d73fa75845 am: 9b8282b7ba
  Revert "Addressing comments for http://ag/7700679." am: 01ca66ff03 am: 25f881d116
  Revert "Add one more test for VPN usage stats." am: e81acb7351 am: 469ee82902
2019-06-07 09:44:50 +00:00
Benedict Wong
8297d7bb93 Revert "Take all VPN underlying networks into account when migrating traffic for" am: 237d3e55cd
am: 3e9726c69c

Change-Id: Ia6598f3550d1dcdd42e04f846ac6cfcce18ce7c1
2019-06-07 02:43:37 -07:00
Benedict Wong
86af1c8612 Revert "Take all VPN underlying networks into account when migrating traffic for" am: 237d3e55cd
am: 00ea7edde3

Change-Id: I2695c296398aeb6e5378bba0c89c8ae0b3cd55c6
2019-06-07 02:43:33 -07:00
Benedict Wong
93b984717f Revert "NetworkStatsService: Fix getDetailedUidStats to take VPNs into account." am: d73fa75845
am: 9b8282b7ba

Change-Id: I799bbaed92dfce20690ae5a8b59241d22e5dc6d6
2019-06-07 02:43:33 -07:00