joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity
10,824 commits 1 branch 0 tags 204 MiB
Commit graph

10,824 commits

This branch
This branch
All branches
Message SHA1
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 71ff1397a9 am: 547ad6e26b -s ours am: 656cfa4b0e -s ours 
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515

Change-Id: I18f6dabacb6e272e2d3fdf63a9220afc5572f2d2

Bill Yi   authored and   Automerger Merge Worker   commited 2020-09-19 07:01:25 +00:00
a3d9761208
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: d1631c4bda am: 3eb5580591 -s ours am: add0444867 -s ours 
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515

Change-Id: Ib3e8b5c0678513b5128aaf106c8f8044bed09702

Bill Yi   authored and   Automerger Merge Worker   commited 2020-09-19 07:00:58 +00:00
70b18ac7e7
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 71ff1397a9 am: 547ad6e26b -s ours 
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515

Change-Id: I2ad75dfe2a2109ea63eade0ed3edc40b92149a16

Bill Yi   authored and   Automerger Merge Worker   commited 2020-09-19 05:51:33 +00:00
656cfa4b0e
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: d1631c4bda am: 3eb5580591 -s ours 
am skip reason: Change-Id Id04ea331831e8b26ba99478848392b40a92548d5 with SHA-1 c54ab73ef9 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515

Change-Id: I4a14d0f2ef305f4f564e7e38134763a85fd09ad3

Bill Yi   authored and   Automerger Merge Worker   commited 2020-09-19 05:50:36 +00:00
add0444867
Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 71ff1397a9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515

Change-Id: Iaa631aaca21a51d786f59801d317f27ee635c70f

Bill Yi   authored and   Automerger Merge Worker   commited 2020-09-19 05:25:29 +00:00
547ad6e26b
Merge mainline-release 6664920 to master - DO NOT MERGE am: d1631c4bda 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1431515

Change-Id: Id233d0d39ad2d63ae3e6d6128b631e149f68990e

Bill Yi   authored and   Automerger Merge Worker   commited 2020-09-19 05:22:39 +00:00
3eb5580591
Merge "Merge mainline-release 6664920 to master - DO NOT MERGE"
Bill Yi   authored and   Gerrit Code Review   commited 2020-09-18 18:47:48 +00:00
71ff1397a9
Merge mainline-release 6664920 to master - DO NOT MERGE 
Merged-In: Id04ea331831e8b26ba99478848392b40a92548d5
Change-Id: I888da0c9475f2d00602d917d2f58169f8d7c93a4

Bill Yi   commited 2020-09-17 21:56:59 -07:00
d1631c4bda
Merge "Remove a useless method" am: 8523dd4e8b am: 4806612bef am: d4ce551094 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426655

Change-Id: I0d32f54bf0c10afa33d59292291806a482af159c

Treehugger Robot   authored and   Automerger Merge Worker   commited 2020-09-16 07:46:30 +00:00
e1615d27e4
Merge "Remove a useless method" am: 8523dd4e8b am: 4806612bef 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426655

Change-Id: Idbf3ffa12027bbfb3f68ad867f61eebbd54af9f5

Treehugger Robot   authored and   Automerger Merge Worker   commited 2020-09-16 07:17:46 +00:00
d4ce551094
Merge "Remove a useless method" am: 8523dd4e8b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426655

Change-Id: I371245204277fa58c986370b503b379e97a0706e

Treehugger Robot   authored and   Automerger Merge Worker   commited 2020-09-16 06:36:15 +00:00
4806612bef
Merge "Remove a useless method"
Treehugger Robot   authored and   Gerrit Code Review   commited 2020-09-16 05:58:01 +00:00
8523dd4e8b
Remove a useless method 
No seriously ?

Test: builds
Change-Id: Ie1508ce50a39e4c69a4b238067bab1e83ddaf019

Chalard Jean   commited 2020-09-15 16:18:56 +09:00
8eaf3a9a60
Merge changes from topic "sep11" am: 17b739a5f7 am: 94d8d5e4ce am: 4e9a12f773 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426195

Change-Id: I9b79dbf3e9983523db11599d8ae289b05aabf80c

Jeff Sharkey   authored and   Automerger Merge Worker   commited 2020-09-14 23:42:34 +00:00
5d45f311b1
Merge changes from topic "sep11" am: 17b739a5f7 am: 94d8d5e4ce 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426195

Change-Id: I7da537200efe31e803234bd1a0236843064186c8

Jeff Sharkey   authored and   Automerger Merge Worker   commited 2020-09-14 23:10:42 +00:00
4e9a12f773
Merge changes from topic "sep11" am: 17b739a5f7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426195

Change-Id: I4fd71573b4301e5473d44517a72d73858b3928c8

Jeff Sharkey   authored and   Automerger Merge Worker   commited 2020-09-14 22:36:51 +00:00
94d8d5e4ce
Merge changes from topic "sep11" 
* changes:
  Update language to comply with Android's inclusive language guidance
  Update language to comply with Android's inclusive language guidance
  Update language to comply with Android's inclusive language guidance
  Update language to comply with Android's inclusive language guidance
  Update language to comply with Android's inclusive language guidance
  Update language to comply with Android's inclusive language guidance
  Update language to comply with Android's inclusive language guidance
  Update language to comply with Android's inclusive language guidance

Jeff Sharkey   authored and   Gerrit Code Review   commited 2020-09-14 21:52:13 +00:00
17b739a5f7
[automerger skipped] Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 77c27b78ea -s ours am: 1221d9265d -s ours 
am skip reason: Change-Id I8f9b41ca6388fdeeda287e7919ef05e56f9da1a6 with SHA-1 f72a5498af is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12577741

Change-Id: I0fe501d77d176eb43d9e308e7fe3e01c579f22bb

Bill Yi   authored and   Automerger Merge Worker   commited 2020-09-14 21:50:56 +00:00
2da01b3354
[automerger skipped] Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master am: 77c27b78ea -s ours 
am skip reason: Change-Id I8f9b41ca6388fdeeda287e7919ef05e56f9da1a6 with SHA-1 f72a5498af is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12577741

Change-Id: I9b5e1a916081cb266eaca328b86506481e938c7f

Bill Yi   authored and   Automerger Merge Worker   commited 2020-09-14 21:18:54 +00:00
1221d9265d
Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

Test: none
Bug: 168334533
Exempt-From-Owner-Approval: docs updates
Change-Id: If75259aab72329f9f8b0e1972a96370ca5134e2c

Jeff Sharkey   commited 2020-09-14 10:00:10 -06:00
0d58543df0
Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

Test: none
Bug: 168334533
Exempt-From-Owner-Approval: docs updates
Change-Id: I53003332717baf57dc088b2f6b969cdb1863f65e

Jeff Sharkey   commited 2020-09-14 09:59:01 -06:00
814cd18388
Merge "Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE" into stage-aosp-master
Bill Yi   authored and   Android (Google) Code Review   commited 2020-09-14 05:33:38 +00:00
77c27b78ea
Merge "Handle lockdown VPN reset intent in ConnectivityService" am: 63b0d576a0 am: 8ea944d77a am: ecf857098c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1413614

Change-Id: I907b35a02c0957ae57f55ae960df1ff5fce0be8e

Junyu Lai   authored and   Automerger Merge Worker   commited 2020-09-14 05:02:21 +00:00
e1a8529932
Merge "Handle lockdown VPN reset intent in ConnectivityService" am: 63b0d576a0 am: 8ea944d77a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1413614

Change-Id: I4eb9d53d1136ba6e4b9e1fdb884e0920567db2f7

Junyu Lai   authored and   Automerger Merge Worker   commited 2020-09-14 04:26:15 +00:00
ecf857098c
Merge "Handle lockdown VPN reset intent in ConnectivityService"
Junyu Lai   authored and   Gerrit Code Review   commited 2020-09-14 03:14:51 +00:00
63b0d576a0
Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE 
Merged-In: I8f9b41ca6388fdeeda287e7919ef05e56f9da1a6
Change-Id: If78e130888b8d4653ef128d747e18cc46844d732

Bill Yi   commited 2020-09-13 07:58:42 -07:00
e908d9f43d
Handle lockdown VPN reset intent in ConnectivityService 
Currently, LockdownVpnTracker handles lockdown VPN reset intent.
Which will grab VPN object as a lock, then calls into
ConnectivityService to grab mVpn lock when querying NetworkInfo.
However, the order of grabing locks differs from ConnectivityService
and will causes deadlock if ConnectivityService grabs locks in
the other order.

Thus, make ConnectivityService handles reset intent so the
order of grabing locks can be consistent.

Test: atest FrameworksNetTests
Bug: 147403549
Change-Id: Ia10a3ef6f1e20d092a17313935083a84860961aa

junyulai   commited 2020-09-11 11:43:51 +08:00
b56dc51652
[automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours am: b9db5b54f6 -s ours am: 539397a032 -s ours 
am skip reason: Change-Id Ice3e441cc9c0df8d0a6acc016bb74375e081bd67 with SHA-1 ec82033d3e is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1422395

Change-Id: Idcd3d30dddc7818975b50aee1b253e37608a3eae

Xin Li   authored and   Automerger Merge Worker   commited 2020-09-11 03:33:28 +00:00
60be5c6c7c
[automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours am: b9db5b54f6 -s ours 
am skip reason: Change-Id Ice3e441cc9c0df8d0a6acc016bb74375e081bd67 with SHA-1 ec82033d3e is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1422395

Change-Id: Ie915db11679ce05f5d37815028015f61ffb1a4a6

Xin Li   authored and   Automerger Merge Worker   commited 2020-09-11 02:02:37 +00:00
539397a032
Merge Android R 
Bug: 168057903
Merged-In: Ice3e441cc9c0df8d0a6acc016bb74375e081bd67
Change-Id: I1d85742f594be2007c99841b290e502b6ede624e

Xin Li   commited 2020-09-09 20:21:10 -07:00
2fc9f48792
Merge "[automerger skipped] Merge "[CS] Add an option to block sensitive network specifier" into pi-dev am: 9c70259e2b -s ours am: 2dbc78ee39 -s ours am: 12d5c16a87 -s ours am: ab53da358e -s ours am: 9176934506 -s ours" into rvc-d1-dev-plus-aosp
Automerger Merge Worker   authored and   Android (Google) Code Review   commited 2020-09-10 01:59:35 +00:00
1ab4354f9a
[automerger skipped] Merge "[CS] Add an option to block sensitive network specifier" into pi-dev am: 9c70259e2b -s ours am: 2dbc78ee39 -s ours am: 12d5c16a87 -s ours am: ab53da358e -s ours am: b100e1907c -s ours 
am skip reason: Change-Id If08d312ff814bdde1147518f923199e6349503d5 with SHA-1 c069b066d3 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12321778

Change-Id: I235447b402e1c2d2706eeab87e1be4de5bb4db4f

TreeHugger Robot   authored and   Automerger Merge Worker   commited 2020-09-10 01:59:24 +00:00
0752181f1b
[automerger skipped] Merge "[CS] Add an option to block sensitive network specifier" into pi-dev am: 9c70259e2b -s ours am: 2dbc78ee39 -s ours am: 12d5c16a87 -s ours am: ab53da358e -s ours am: 9176934506 -s ours 
am skip reason: Change-Id If08d312ff814bdde1147518f923199e6349503d5 with SHA-1 c069b066d3 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12321778

Change-Id: Ice0925112fbe3503ca968dd0ae397a89f8c520f9

TreeHugger Robot   authored and   Automerger Merge Worker   commited 2020-09-10 01:59:15 +00:00
efd521d2b5
[automerger skipped] Merge "[CS] Add an option to block sensitive network specifier" into pi-dev am: 9c70259e2b -s ours am: 2dbc78ee39 -s ours am: 12d5c16a87 -s ours am: ab53da358e -s ours 
am skip reason: Change-Id If08d312ff814bdde1147518f923199e6349503d5 with SHA-1 c069b066d3 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12321778

Change-Id: I63b18c469854d3c3025c7b6e99827ddbea327f65

TreeHugger Robot   authored and   Automerger Merge Worker   commited 2020-09-10 01:44:10 +00:00
b100e1907c
[automerger skipped] Merge "[CS] Add an option to block sensitive network specifier" into pi-dev am: 9c70259e2b -s ours am: 2dbc78ee39 -s ours am: 12d5c16a87 -s ours am: ab53da358e -s ours 
am skip reason: Change-Id If08d312ff814bdde1147518f923199e6349503d5 with SHA-1 c069b066d3 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12321778

Change-Id: Ie0d62c79853bc017102ad95acc1a5190182a92c7

TreeHugger Robot   authored and   Automerger Merge Worker   commited 2020-09-10 01:43:19 +00:00
9176934506
[automerger skipped] Merge "[CS] Add an option to block sensitive network specifier" into pi-dev am: 9c70259e2b -s ours am: 2dbc78ee39 -s ours am: 12d5c16a87 -s ours 
am skip reason: Change-Id If08d312ff814bdde1147518f923199e6349503d5 with SHA-1 c069b066d3 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12321778

Change-Id: I553eead2b24367b09f4888ea8a687c48cd2bf9da

TreeHugger Robot   authored and   Automerger Merge Worker   commited 2020-09-10 01:14:38 +00:00
ab53da358e
[automerger skipped] Merge "[CS] Add an option to block sensitive network specifier" into pi-dev am: 9c70259e2b -s ours am: 2dbc78ee39 -s ours 
am skip reason: Change-Id If08d312ff814bdde1147518f923199e6349503d5 with SHA-1 c069b066d3 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12321778

Change-Id: I90bb0d837e4ac6c3acc834653bc1f758d62e1a08

TreeHugger Robot   authored and   Automerger Merge Worker   commited 2020-09-10 00:46:56 +00:00
12d5c16a87
[automerger skipped] Merge "[CS] Add an option to block sensitive network specifier" into pi-dev am: 9c70259e2b -s ours 
am skip reason: Change-Id If08d312ff814bdde1147518f923199e6349503d5 with SHA-1 c069b066d3 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12321778

Change-Id: I58327bb904244e5f962c27b7c8facdfeae8a758d

TreeHugger Robot   authored and   Automerger Merge Worker   commited 2020-09-10 00:27:47 +00:00
2dbc78ee39
[CS] Add an option to block sensitive network specifier 
Network specifiers are used for 2 purposes:

- As part of network requests to specify more information on the type
  of requested networks.
- On network agents to specify information about their networks.

The network specifiers of the requests and agents are matched to each
other. However, the agent network specifier may contain sensitive
information which we do not want forwarded to any app.

This CL adds an option to strip out this agent network specifier before
the network capabilities are forwarded to the app.

Bug: 161853197
Bug: 161370134
Test: atest ConnectivityServiceTest (frameworks/base/tests/net)
Test: atest frameworks/base/tests/net
Test: atest frameworks/opt/net/wifi/tests/wifitests
Test: atest frameworks/opt/telephony/tests/telephonytests
Test: atest frameworks/opt/net/ethernet/tests
Test: atest android.net.cts - some flakiness!
Test: act.py ThroughputTest
Test: act.py DataPathTest
Test: atest SingleDeviceTest (cts)
Change-Id: I38ed3ff88532ef522ab167c88d87e6e82295ffc5
Merged-In: If08d312ff814bdde1147518f923199e6349503d5

Etan Cohen   authored and   Chiachang Wang   commited 2020-09-07 00:37:33 +00:00
9aaf663dda
[automerger skipped] Merge RP1A.200720.011 am: 383cdb1c99 -s ours am: 930f94115d -s ours 
am skip reason: Change-Id Iec7a26ecd68aca9c7a38cc8f441197a8237b0c8c with SHA-1 b89c6d94c5 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12514348

Change-Id: Ic485b269579ca470e4b74ee434f1b35110a0ab75

Xin Li   authored and   Automerger Merge Worker   commited 2020-09-02 23:36:34 +00:00
02a7ee4541
[automerger skipped] Merge RP1A.200720.011 am: 383cdb1c99 -s ours 
am skip reason: Change-Id Iec7a26ecd68aca9c7a38cc8f441197a8237b0c8c with SHA-1 b89c6d94c5 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12514348

Change-Id: I735e135e519708d0e1ab07504944ad1dcdfcccbc

Xin Li   authored and   Automerger Merge Worker   commited 2020-09-02 23:16:43 +00:00
930f94115d
[automerger skipped] Merge "Mark RP1A.200720.001 as merged" into stage-aosp-master am: 5cc3fc4908 -s ours am: 1461832820 -s ours 
am skip reason: Change-Id I608df7327b8366fd365b11c6bdff9ed28fde99b0 with SHA-1 98a01b7fad is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12514140

Change-Id: Ibe18c1e4bb2fffb65add10a48b8a72fde60a2e2b

Xin Li   authored and   Automerger Merge Worker   commited 2020-09-02 19:37:31 +00:00
9d55e46862
Merge RP1A.200720.011 
Bug: 167588565
Merged-In: Iec7a26ecd68aca9c7a38cc8f441197a8237b0c8c
Change-Id: Ia8f5f008bc1f77115b644ab996aedc892fab68e7

Xin Li   commited 2020-09-02 12:34:37 -07:00
383cdb1c99
[automerger skipped] Merge "Mark RP1A.200720.001 as merged" into stage-aosp-master am: 5cc3fc4908 -s ours 
am skip reason: Change-Id I608df7327b8366fd365b11c6bdff9ed28fde99b0 with SHA-1 98a01b7fad is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12514140

Change-Id: Ie4932da5ffa8bc042a930b01a18d1ff1ce1abc90

Xin Li   authored and   Automerger Merge Worker   commited 2020-09-02 19:15:20 +00:00
1461832820
Mark RP1A.200720.001 as merged 
Bug: 167588565
Merged-In: I608df7327b8366fd365b11c6bdff9ed28fde99b0
Change-Id: Ie293ab2bcba5f778a7cac8476e226dc7c15e000f

Xin Li   commited 2020-09-02 11:44:54 -07:00
9fbf46da7d
[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: ff2ffe48ac -s ours am: 210f4c7e70 -s ours 
am skip reason: Change-Id I3d92a6de21a938f6b352ec26dc23420c0fe02b27 with SHA-1 d2d3a20624 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12484850

Change-Id: Icebcb9092d11694141d0d6a0c47c9f8378f5b03a

Xin Li   authored and   Automerger Merge Worker   commited 2020-09-01 21:46:39 +00:00
9ad1a5fb1a
[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: ff2ffe48ac -s ours 
am skip reason: Change-Id I3d92a6de21a938f6b352ec26dc23420c0fe02b27 with SHA-1 d2d3a20624 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12484850

Change-Id: I6fee791ed4a4939ab3f24b66f779a20124d0c63d

Xin Li   authored and   Automerger Merge Worker   commited 2020-09-01 20:37:03 +00:00
210f4c7e70
Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) 
Bug: 166295507
Merged-In: I3d92a6de21a938f6b352ec26dc23420c0fe02b27
Change-Id: Ifdb80563ef042738778ebb8a7581a97c4e3d96e2

Xin Li   commited 2020-08-31 21:21:38 -07:00
4037c36d47
Merge "Notify the keepalive is stopped after the slot has been released" am: 09a0f57f87 am: b5e1feccbe am: d1804f87dc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1112851

Change-Id: I846ad59dba08f17a01700378a2cdbb931629b283

Junyu Lai   authored and   Automerger Merge Worker   commited 2020-08-28 11:45:51 +00:00
c1d0f670f5
Merge "Notify the keepalive is stopped after the slot has been released" am: 09a0f57f87 am: b5e1feccbe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1112851

Change-Id: Icdd61fb39ebd14963f4ec6e591b3a245e6b999b2

Junyu Lai   authored and   Automerger Merge Worker   commited 2020-08-28 11:09:43 +00:00
d1804f87dc