Remi NGUYEN VAN
|
ca7d992a14
|
[automerger skipped] Merge "Remove dependency on libnetd_client" am: 5d3005cc98 am: ab6817ffa2 -s ours am: 2cd7e3405b -s ours
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722742
Change-Id: I933e9aa94069fce7a30dbfc6bafe74922bec23d4
|
2021-06-04 10:53:20 +00:00 |
|
Paul Hu
|
fa607cbc3d
|
Merge "Implement mobile data preferred uids feature" into sc-dev am: 87f2897f90 am: 44bfe2d4c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14732015
Change-Id: Ia41a71b3bd22fbee4b842c8fb49ce64956c93d2c
|
2021-06-04 09:36:03 +00:00 |
|
Paul Hu
|
44bfe2d4c0
|
Merge "Implement mobile data preferred uids feature" into sc-dev am: 87f2897f90
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14732015
Change-Id: Ic0b248bc137b694aed5fcfc1766093c85ed61711
|
2021-06-04 09:15:22 +00:00 |
|
Paul Hu
|
87f2897f90
|
Merge "Implement mobile data preferred uids feature" into sc-dev
|
2021-06-04 08:55:31 +00:00 |
|
Remi NGUYEN VAN
|
2cd7e3405b
|
[automerger skipped] Merge "Remove dependency on libnetd_client" am: 5d3005cc98 am: ab6817ffa2 -s ours
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722742
Change-Id: I88e6c2cacf33031489becca7c5bd2c22b8c81885
|
2021-06-04 07:38:24 +00:00 |
|
Remi NGUYEN VAN
|
ab6817ffa2
|
Merge "Remove dependency on libnetd_client" am: 5d3005cc98
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722742
Change-Id: Ic27863c19e2175d6278e88b547caf9092f01cd4b
|
2021-06-04 07:23:42 +00:00 |
|
Remi NGUYEN VAN
|
5d3005cc98
|
Merge "Remove dependency on libnetd_client"
|
2021-06-04 07:01:11 +00:00 |
|
Aaron Huang
|
c7c9badcad
|
Merge "Remove framework-connectivity-annotations library" into sc-dev am: 059ddb4025 am: d80dfe936b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14731888
Change-Id: Ibd03ba898c405260abb97404699aef9df0f7c12e
|
2021-06-04 00:18:10 +00:00 |
|
TreeHugger Robot
|
f1cf6eddfd
|
Merge changes I81bf8969,I2edba513,Ibb913979 into sc-dev am: 98c351f429 am: ce42528d72
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14452540
Change-Id: I3f7d10bb25baf5c9c6424e341f16d13bd90f6758
|
2021-06-04 00:18:01 +00:00 |
|
Chiachang Wang
|
c0af557304
|
[automerger skipped] Merge "Unify the verification for unregister a NetworkAgent" into sc-dev am: 1084882539 am: 40eec1eaf9 -s ours
am skip reason: Merged-In I66d8e5a0fa1e2245711e8ac90d9daca24802e399 with SHA-1 ecd0886e36 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14706912
Change-Id: Iad585efee75d3698628a0f42f6e9fb17f2b54dc9
|
2021-06-04 00:17:56 +00:00 |
|
TreeHugger Robot
|
63fab1ba6e
|
[automerger skipped] Merge "Fix memory access violation in NetworkStack" into sc-dev am: 1dc094b2c0 am: 00c47e1c5a -s ours
am skip reason: Merged-In I9d8ec0708efd747e24b3b3ffed5336434d4f64a7 with SHA-1 365ada7e04 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14713334
Change-Id: I1a477c5f743b82b63ffe6cb569e92abb9dd12d90
|
2021-06-04 00:17:52 +00:00 |
|
Remi NGUYEN VAN
|
e91e4a9a6f
|
[automerger skipped] Skip merge of: Merge fixed history of Connectivity am: 9fc5a2653c -s ours
am skip reason: Merged-In Ib95d84b91a455d1a5f10cbf3f8c08c0459bc1c7c with SHA-1 8af1002b83 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14809397
Change-Id: I253ed2539eff546c83622410330215c62c670cbd
|
2021-06-04 00:17:47 +00:00 |
|
Remi NGUYEN VAN
|
5e40dee9a2
|
[automerger skipped] Merge fixed history of Connectivity am: 8c05c9ec88 -s ours
am skip reason: Merged-In Ib95d84b91a455d1a5f10cbf3f8c08c0459bc1c7c with SHA-1 8af1002b83 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14809392
Change-Id: I53cc5316ae34a626a4e9574e31d3a089e5eb84e8
|
2021-06-04 00:17:38 +00:00 |
|
TreeHugger Robot
|
0c83d9bddf
|
Merge changes I1de322c9,Id0983d4b into sc-dev am: 4914db6830 am: 29a6df2088
Original change: undetermined
Change-Id: I2f73398983466d413c6c9b98cd8229f340bd50d9
|
2021-06-04 00:17:31 +00:00 |
|
TreeHugger Robot
|
303e953193
|
Merge "Check location permission for ConnDiags last." into sc-dev am: e90a19e611 am: 1f363995fc
Original change: undetermined
Change-Id: I54231daf2b222f1e8e7f79d7f0e52f5fe3b95364
|
2021-06-04 00:17:10 +00:00 |
|
Remi NGUYEN VAN
|
8b5a75558f
|
[automerger skipped] Merge "Add NDK API for getprocnetwork" am: ae471dd3f2 am: 5a1053d423 -s ours am: 22729195ed -s ours
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722734
Change-Id: I79580eeeb9d184f5656f26d19ff4d1e376677679
|
2021-06-03 09:57:27 +00:00 |
|
Remi NGUYEN VAN
|
22729195ed
|
[automerger skipped] Merge "Add NDK API for getprocnetwork" am: ae471dd3f2 am: 5a1053d423 -s ours
am skip reason: Merged-In I3c2563d4ae4e3715d0c6270344ba8f7ef067872f with SHA-1 2afd0986d3 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722734
Change-Id: Iaa13da17466a4d9c521ba6de04eb6f895d21bf7a
|
2021-06-03 09:41:04 +00:00 |
|
Remi NGUYEN VAN
|
5a1053d423
|
Merge "Add NDK API for getprocnetwork" am: ae471dd3f2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722734
Change-Id: Id05c47d9a6eed0434bdf0c9b9377810036b321c7
|
2021-06-03 09:36:31 +00:00 |
|
vichang
|
376b2565a6
|
[automerger skipped] Merge "Use updated NetworkEventDispatcher API" am: 952eed1278 am: 729f247849 -s ours am: 788f0a517a -s ours
am skip reason: Merged-In Iae3cec4f751e1f74ccd26db6f22f55cf21dfc04a with SHA-1 1f4fa9ffd5 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719611
Change-Id: Iffcd5408b288d3af0f67e0779aed4b1a6936d68b
|
2021-06-03 09:31:45 +00:00 |
|
Chiachang Wang
|
a7b9de4ea1
|
Merge changes I5d3e448e,Id69ac1d3 am: 02eea987c0 am: b675eba4c1 am: a3df1ed5f1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1711429
Change-Id: I801108af0f1d7ac4b6adaacfc41ffc5856df796a
|
2021-06-03 09:31:28 +00:00 |
|
Treehugger Robot
|
3b2e63de71
|
[automerger skipped] Merge "Test tethered callback with TetheringInterface" am: c4d26414f8 am: f5590e79e3 -s ours am: 3ae845be9d -s ours
am skip reason: Merged-In I2a0b8c43fb340c3eaed7f0f90464199222a24280 with SHA-1 82f99f95b7 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722733
Change-Id: If818939f33461c336cb846bc0111be2b65eac290
|
2021-06-03 09:31:24 +00:00 |
|
Treehugger Robot
|
7873cc0ad8
|
[automerger skipped] Merge "Add the tethering type to TetheringEventCallback methods" am: 414edc4ac9 am: ceca234921 -s ours am: 66895c05ae -s ours
am skip reason: Merged-In I91bcccd676d109c1b974497ac29bd366a41b8899 with SHA-1 9935dbe03e is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1708093
Change-Id: Ie8d9419ca3c8cdc1d5c9fbc1c127c38b452d0f2b
|
2021-06-03 09:31:19 +00:00 |
|
Aaron Huang
|
9fda64e8b1
|
[automerger skipped] Merge "Add required permission to Tethering" am: 87f051bfa6 am: c84ed50376 -s ours am: 7aa12de842 -s ours
am skip reason: Merged-In I40b45a0f1b44fba0b68e94811d14725a59ed4e59 with SHA-1 a546d85a03 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1688267
Change-Id: I5a95487db3111a4e3006f474249feddec7a3f025
|
2021-06-03 09:25:35 +00:00 |
|
Remi NGUYEN VAN
|
2a5fcc26aa
|
Merge "Revert "Add owners block for migration"" am: 43740568b6 am: dc4690f77e am: 4cda76cdb9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722671
Change-Id: I83fccf1eb71aa56bd8b2b196f8ceee53f8a25d03
|
2021-06-03 09:25:17 +00:00 |
|
Remi NGUYEN VAN
|
ec6a29f078
|
[automerger skipped] Skip merge of: Merge fixed history of Connectivity am: 689b08d86d -s ours am: 1f0e609863 -s ours
am skip reason: Merged-In Ie3a058b904cb2e3704c3a0725c8f720f81bb235e with SHA-1 f9e7c2a543 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14809399
Change-Id: I0ba58fbb752b1840f952385127d31b0c8faab030
|
2021-06-03 09:25:09 +00:00 |
|
Remi NGUYEN VAN
|
76f1c7fec9
|
[automerger skipped] Merge fixed history of Connectivity am: 04a96452cf -s ours am: d1b1cd0961 -s ours
am skip reason: Merged-In Ie3a058b904cb2e3704c3a0725c8f720f81bb235e with SHA-1 f9e7c2a543 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14809394
Change-Id: Ifdd570e70052ec82c211fab2f5ae9a959a187f2b
|
2021-06-03 09:24:56 +00:00 |
|
vichang
|
788f0a517a
|
[automerger skipped] Merge "Use updated NetworkEventDispatcher API" am: 952eed1278 am: 729f247849 -s ours
am skip reason: Merged-In Iae3cec4f751e1f74ccd26db6f22f55cf21dfc04a with SHA-1 1f4fa9ffd5 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719611
Change-Id: I08f0c128337837b3fa543d61a23c0d70ab674d9d
|
2021-06-03 09:22:52 +00:00 |
|
Chiachang Wang
|
a3df1ed5f1
|
Merge changes I5d3e448e,Id69ac1d3 am: 02eea987c0 am: b675eba4c1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1711429
Change-Id: Iede15400f50e5e0f37a95f59b924d8b7dd698509
|
2021-06-03 09:22:36 +00:00 |
|
Treehugger Robot
|
3ae845be9d
|
[automerger skipped] Merge "Test tethered callback with TetheringInterface" am: c4d26414f8 am: f5590e79e3 -s ours
am skip reason: Merged-In I2a0b8c43fb340c3eaed7f0f90464199222a24280 with SHA-1 82f99f95b7 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722733
Change-Id: I28503e9bec154854b69e7c15c2e23a8782e50ac5
|
2021-06-03 09:19:30 +00:00 |
|
vichang
|
729f247849
|
Merge "Use updated NetworkEventDispatcher API" am: 952eed1278
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1719611
Change-Id: I001a7efddd9e783ce054f740d34c679fe27b0131
|
2021-06-03 09:17:18 +00:00 |
|
Treehugger Robot
|
66895c05ae
|
[automerger skipped] Merge "Add the tethering type to TetheringEventCallback methods" am: 414edc4ac9 am: ceca234921 -s ours
am skip reason: Merged-In I91bcccd676d109c1b974497ac29bd366a41b8899 with SHA-1 9935dbe03e is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1708093
Change-Id: Icc0d493d7c6ff7e7dcf444309676ca8453c0894a
|
2021-06-03 09:14:57 +00:00 |
|
Aaron Huang
|
7aa12de842
|
[automerger skipped] Merge "Add required permission to Tethering" am: 87f051bfa6 am: c84ed50376 -s ours
am skip reason: Merged-In I40b45a0f1b44fba0b68e94811d14725a59ed4e59 with SHA-1 a546d85a03 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1688267
Change-Id: Ie19938c1988a946b2d1acf66a6bfcb7fa4cab3d6
|
2021-06-03 09:13:47 +00:00 |
|
Chiachang Wang
|
b675eba4c1
|
Merge changes I5d3e448e,Id69ac1d3 am: 02eea987c0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1711429
Change-Id: Ib1aa32fbf6f2904bd88c418af51db8128ec0bfc2
|
2021-06-03 09:13:38 +00:00 |
|
Remi NGUYEN VAN
|
4cda76cdb9
|
Merge "Revert "Add owners block for migration"" am: 43740568b6 am: dc4690f77e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722671
Change-Id: Ib7698688fe1dec6f534a6571c715c4989a93fada
|
2021-06-03 09:13:30 +00:00 |
|
TreeHugger Robot
|
8daeb7df73
|
Merge "Use CS identity to update setting while performing factory reset" into sc-dev am: 0621a3e18e am: e2e7dcc0d7
Original change: undetermined
Change-Id: I98f57bee1e15806462ca663ef80fff3a79620036
|
2021-06-03 09:13:26 +00:00 |
|
Remi NGUYEN VAN
|
1f0e609863
|
[automerger skipped] Skip merge of: Merge fixed history of Connectivity am: 689b08d86d -s ours
am skip reason: Merged-In Ie3a058b904cb2e3704c3a0725c8f720f81bb235e with SHA-1 f9e7c2a543 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14809399
Change-Id: Iba158f969b1dcb27804e4be08f836ed3df6694fd
|
2021-06-03 09:13:22 +00:00 |
|
Remi NGUYEN VAN
|
d1b1cd0961
|
[automerger skipped] Merge fixed history of Connectivity am: 04a96452cf -s ours
am skip reason: Merged-In Ie3a058b904cb2e3704c3a0725c8f720f81bb235e with SHA-1 f9e7c2a543 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14809394
Change-Id: I82710ff2ce1c9176cb9dbacc7df5836199cce9b3
|
2021-06-03 09:13:11 +00:00 |
|
TreeHugger Robot
|
7d959ef64e
|
Merge "Add test for NetworkCapabilities.Builder.withoutDefaultCapabilities" into sc-dev am: 7094b6470f am: 2de3812370
Original change: undetermined
Change-Id: Ic36ed3bb92503a6abc76e7ed21a13a7bb752bb13
|
2021-06-03 09:13:04 +00:00 |
|
Treehugger Robot
|
f5590e79e3
|
Merge "Test tethered callback with TetheringInterface" am: c4d26414f8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722733
Change-Id: If6863c282c259c3fbc6fd3a3f8fc7e4b2510ee23
|
2021-06-03 09:10:47 +00:00 |
|
Treehugger Robot
|
ceca234921
|
Merge "Add the tethering type to TetheringEventCallback methods" am: 414edc4ac9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1708093
Change-Id: I83a86395d6dd2b2f0a0e8f49e2045508307ac5e7
|
2021-06-03 09:07:03 +00:00 |
|
Aaron Huang
|
c84ed50376
|
Merge "Add required permission to Tethering" am: 87f051bfa6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1688267
Change-Id: I68b7063f0689407c2259a2387c6bfe6567dc83da
|
2021-06-03 08:14:34 +00:00 |
|
Remi NGUYEN VAN
|
dc4690f77e
|
Merge "Revert "Add owners block for migration"" am: 43740568b6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1722671
Change-Id: I0e59f2b9a9903f12229baeab2a47d49b213ea7f9
|
2021-06-03 08:13:23 +00:00 |
|
Remi NGUYEN VAN
|
ae471dd3f2
|
Merge "Add NDK API for getprocnetwork"
|
2021-06-03 08:07:23 +00:00 |
|
Aaron Huang
|
d80dfe936b
|
Merge "Remove framework-connectivity-annotations library" into sc-dev am: 059ddb4025
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14731888
Change-Id: Idba65290a50bf4ab2f2fafa135fdcf0f8a4fa3e7
|
2021-06-03 06:14:47 +00:00 |
|
TreeHugger Robot
|
ce42528d72
|
Merge changes I81bf8969,I2edba513,Ibb913979 into sc-dev am: 98c351f429
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14452540
Change-Id: I0de545e1e475d128919e06ef0a9398722d608b67
|
2021-06-03 06:14:33 +00:00 |
|
Chiachang Wang
|
40eec1eaf9
|
Merge "Unify the verification for unregister a NetworkAgent" into sc-dev am: 1084882539
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14706912
Change-Id: Ibcfb16860cf6e2606ad41607d64c5d8533372855
|
2021-06-03 06:14:26 +00:00 |
|
TreeHugger Robot
|
00c47e1c5a
|
Merge "Fix memory access violation in NetworkStack" into sc-dev am: 1dc094b2c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14713334
Change-Id: Ie1eca928523704673fb42870df01644b215252de
|
2021-06-03 06:14:12 +00:00 |
|
Remi NGUYEN VAN
|
689b08d86d
|
Skip merge of: Merge fixed history of Connectivity
This merges commit b2f2271ef1 with
"-s ours"
Bug: 186628461
Test: TH
Ignore-AOSP-First: per-branch merges
Merged-In: I9f798dd3a96c917001d52e6167fceb59885ce6f0
Merged-In: I37e52cf7d59b6dbcd77879725385c7940318b835
Merged-In: Ie3a058b904cb2e3704c3a0725c8f720f81bb235e
Change-Id: I36d8f58d5cc16d32d3927976394a732945de4767
|
2021-06-03 11:04:09 +09:00 |
|
Remi NGUYEN VAN
|
9fc5a2653c
|
Skip merge of: Merge fixed history of Connectivity
This merges commit 1af06c78df with
"-s ours"
Bug: 186628461
Test: TH
Merged-In: Ib95d84b91a455d1a5f10cbf3f8c08c0459bc1c7c
Change-Id: I5fd3b9c2686f9261166ef8e16ce8d55e1eff2cd7
|
2021-06-03 11:00:24 +09:00 |
|
Remi NGUYEN VAN
|
04a96452cf
|
Merge fixed history of Connectivity
Bug: 189375701
Bug: 186628461
TEST: TH
Ignore-AOSP-First: per-branch merges
Merged-In: I9f798dd3a96c917001d52e6167fceb59885ce6f0
Merged-In: I37e52cf7d59b6dbcd77879725385c7940318b835
Merged-In: Ie3a058b904cb2e3704c3a0725c8f720f81bb235e
Change-Id: I517c9af0f644ee59abebf56b6acce772c19b368d
|
2021-06-03 10:51:41 +09:00 |
|