LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,120 Commits 2 Branches 0 Tags
423cee9988f33b50fc2137a1932bcc1887f4d93d
Commit Graph

11120 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xin Li
423cee9988 [automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours am: b9db5b54f6 -s ours am: 539397a032 -s ours am: 60be5c6c7c -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: I47087cabc2093c6de6116f11f660aa624dcb260e
 2020-09-11 03:58:59 +00:00
Xin Li
60be5c6c7c [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
 2020-09-11 03:33:28 +00:00
Xin Li
539397a032 [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
 2020-09-11 02:02:37 +00:00
Xin Li
2fc9f48792 Merge Android R 
Bug: 168057903
Merged-In: Ice3e441cc9c0df8d0a6acc016bb74375e081bd67
Change-Id: I1d85742f594be2007c99841b290e502b6ede624e
 2020-09-09 20:21:10 -07:00
Automerger Merge Worker
6f937b7cea 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 am: 1ab4354f9a -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: Iad1bd8cd64ea6b3385f8bc09815d48ad45f9b0b6
 2020-09-10 02:15:24 +00:00
TreeHugger Robot
8423ddc539 [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: 0752181f1b -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: I42ade8a77e5402fa362d5dc92c278de22776cfda
 2020-09-10 02:14:51 +00:00
Automerger Merge Worker
1ab4354f9a 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 2020-09-10 01:59:35 +00:00
TreeHugger Robot
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: 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
 2020-09-10 01:59:24 +00:00
TreeHugger Robot
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: 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
 2020-09-10 01:59:15 +00:00
TreeHugger Robot
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: I63b18c469854d3c3025c7b6e99827ddbea327f65
 2020-09-10 01:44:10 +00:00
TreeHugger Robot
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: 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
 2020-09-10 01:43:19 +00:00
TreeHugger Robot
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: 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
 2020-09-10 01:14:38 +00:00
TreeHugger Robot
12d5c16a87 [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
 2020-09-10 00:46:56 +00:00
TreeHugger Robot
2dbc78ee39 [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
 2020-09-10 00:27:47 +00:00
Etan Cohen
9aaf663dda [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
 2020-09-07 00:37:33 +00:00
Xin Li
b8eb6b9751 [automerger skipped] Merge RP1A.200720.011 am: 383cdb1c99 -s ours am: 930f94115d -s ours am: 02a7ee4541 -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: I69458ecf599da92d513da87251868a04ff24f3f9
 2020-09-02 23:44:58 +00:00
Xin Li
02a7ee4541 [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
 2020-09-02 23:36:34 +00:00
Xin Li
930f94115d [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
 2020-09-02 23:16:43 +00:00
Xin Li
c82d7822ff [automerger skipped] Merge "Mark RP1A.200720.001 as merged" into stage-aosp-master am: 5cc3fc4908 -s ours am: 1461832820 -s ours am: 9d55e46862 -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: I6e8a2040ecfef8ba0e28807c2f753d68afa32155
 2020-09-02 20:33:01 +00:00
Xin Li
9d55e46862 [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
 2020-09-02 19:37:31 +00:00
Xin Li
383cdb1c99 Merge RP1A.200720.011 
Bug: 167588565
Merged-In: Iec7a26ecd68aca9c7a38cc8f441197a8237b0c8c
Change-Id: Ia8f5f008bc1f77115b644ab996aedc892fab68e7
 2020-09-02 12:34:37 -07:00
Xin Li
1461832820 [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
 2020-09-02 19:15:20 +00:00
Xin Li
9fbf46da7d Mark RP1A.200720.001 as merged 
Bug: 167588565
Merged-In: I608df7327b8366fd365b11c6bdff9ed28fde99b0
Change-Id: Ie293ab2bcba5f778a7cac8476e226dc7c15e000f
 2020-09-02 11:44:54 -07:00
Xin Li
ea562ae9d6 [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: 9ad1a5fb1a -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: Ibf18c18a55f917c4bbdccd1e088a5ec808573ea7
 2020-09-01 22:09:55 +00:00
Xin Li
9ad1a5fb1a [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
 2020-09-01 21:46:39 +00:00
Xin Li
210f4c7e70 [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
 2020-09-01 20:37:03 +00:00
Xin Li
4037c36d47 Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) 
Bug: 166295507
Merged-In: I3d92a6de21a938f6b352ec26dc23420c0fe02b27
Change-Id: Ifdb80563ef042738778ebb8a7581a97c4e3d96e2
 2020-08-31 21:21:38 -07:00
Junyu Lai
0453d9b955 Merge "Notify the keepalive is stopped after the slot has been released" am: 09a0f57f87 am: b5e1feccbe am: d1804f87dc am: c1d0f670f5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1112851

Change-Id: Ife8e4083142313916660cde2b460e3683f244350
 2020-08-28 11:57:25 +00:00
Junyu Lai
c1d0f670f5 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
 2020-08-28 11:45:51 +00:00
Junyu Lai
d1804f87dc 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
 2020-08-28 11:09:43 +00:00
Junyu Lai
09a0f57f87 Merge "Notify the keepalive is stopped after the slot has been released" 2020-08-28 10:12:44 +00:00
Treehugger Robot
e208589695 [automerger skipped] Merge "Skip RAT type listener registration if IMSI is not available" am: 1e9c48bfec am: a2f81d1442 am: b54db4b9fa -s ours am: 0c3b9562fd -s ours 
am skip reason: Change-Id I408379b3c432d9e62e0837d6b4f6551cc7838e29 with SHA-1 675f67cbb2 is in history

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

Change-Id: Ifba95c25fab6decc52b78cc92c95b100d5066fb6
 2020-08-25 21:33:59 +00:00
Treehugger Robot
0c3b9562fd [automerger skipped] Merge "Skip RAT type listener registration if IMSI is not available" am: 1e9c48bfec am: a2f81d1442 am: b54db4b9fa -s ours 
am skip reason: Change-Id I408379b3c432d9e62e0837d6b4f6551cc7838e29 with SHA-1 675f67cbb2 is in history

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

Change-Id: Iff9fe875b4e12d837e5fe52f956ff0f13d3c6ce3
 2020-08-25 21:09:22 +00:00
Treehugger Robot
b54db4b9fa Merge "Skip RAT type listener registration if IMSI is not available" am: 1e9c48bfec am: a2f81d1442 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1409907

Change-Id: I34de6bc6dd862f8042489f60f4b6be76af7c961e
 2020-08-25 20:49:04 +00:00
Treehugger Robot
a2f81d1442 Merge "Skip RAT type listener registration if IMSI is not available" am: 1e9c48bfec 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1409907

Change-Id: Ie24dee18456ee0741dbcd9330664398f0492c644
 2020-08-25 20:27:30 +00:00
Treehugger Robot
1e9c48bfec Merge "Skip RAT type listener registration if IMSI is not available" 2020-08-25 19:55:09 +00:00
junyulai
8c91a5f6cf Skip RAT type listener registration if IMSI is not available 
Currently, if SIM is inserted but IMSI is not available, such
as SIM PIN locked state. Information of such SIM will still
be available but IMSI is not. Which makes
NetworkStatsSubscriptionMonitor failed to store IMSI locally
for later RAT type query. Hence, NETWORK_TYPE_UNKNOWN is
always returned for such SIM.

Skip the registration until the IMSI is available. This is safe
since there will be another onSubscriptionsChanged event when
that happens.

Test: enable SIM PIN and manually test
Test: atest NetworkStatsSubscriptionsMonitorTest#testSubscriberIdUnavailable
Test: ./out/host/linux-x86/bin/statsd_testdrive 10082
Bug: 160941101
Merged-In: I408379b3c432d9e62e0837d6b4f6551cc7838e29
Change-Id: I408379b3c432d9e62e0837d6b4f6551cc7838e29
(cherry-picked from ag/12400327)
 2020-08-25 18:03:38 +08:00
Automerger Merge Worker
515d8f3c4c Merge "Merge "Skip RAT type listener registration if IMSI is not available" into rvc-d1-dev am: 5403c7646a am: d74c016c09" into rvc-qpr-dev-plus-aosp 2020-08-23 13:42:14 +00:00
TreeHugger Robot
b3a91b1ce0 Merge "Skip RAT type listener registration if IMSI is not available" into rvc-d1-dev am: 5403c7646a am: d74c016c09 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12406769

Change-Id: I0c3658f86f2d359778f63d3dfe4e682708ddbb71
 2020-08-23 13:41:55 +00:00
TreeHugger Robot
9b261be707 Merge "Skip RAT type listener registration if IMSI is not available" into rvc-d1-dev am: 5403c7646a am: 1b1eff1bc2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12406769

Change-Id: I8e6777e87c50699977316d88478f230fce494c42
 2020-08-23 13:41:47 +00:00
TreeHugger Robot
1b1eff1bc2 Merge "Skip RAT type listener registration if IMSI is not available" into rvc-d1-dev am: 5403c7646a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12406769

Change-Id: Ia10dc546e107e9c1fc249766c2bcfc5856ce1bd2
 2020-08-23 13:18:49 +00:00
Paul Hu
d68ba4feaf Merge "Revert "[RFPM03] Check permission by uid."" am: 0925015de5 am: b2982a0643 am: ab51b37a2b am: d001d445d5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404654

Change-Id: I8913969ddf7480ad498631db05c9bc84e1d0396a
 2020-08-20 09:19:40 +00:00
Paul Hu
8fa30d7651 Merge "Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method"" am: bddd412feb am: 9f33dbb509 am: 9ea57d25d8 am: a370cac809 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404653

Change-Id: I123a821f1b121f4ea11dc2a1cb71bf88de409797
 2020-08-20 09:19:14 +00:00
Paul Hu
d001d445d5 Merge "Revert "[RFPM03] Check permission by uid."" am: 0925015de5 am: b2982a0643 am: ab51b37a2b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404654

Change-Id: Ie7ac76d52a1bc8e58fc660a86a5f30ab7f2a25b4
 2020-08-20 09:06:22 +00:00
Paul Hu
a370cac809 Merge "Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method"" am: bddd412feb am: 9f33dbb509 am: 9ea57d25d8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404653

Change-Id: I159f2052d27ad2c923c4463f161fbb3358eb1bb2
 2020-08-20 09:05:53 +00:00
Paul Hu
ab51b37a2b Merge "Revert "[RFPM03] Check permission by uid."" am: 0925015de5 am: b2982a0643 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404654

Change-Id: I393e91873923d7b6601d4e8c863cca6986f66f23
 2020-08-20 08:52:04 +00:00
Paul Hu
9ea57d25d8 Merge "Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method"" am: bddd412feb am: 9f33dbb509 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404653

Change-Id: Ifa19cb8fce8dca66ac5f4ecc7737c1c095b7b35b
 2020-08-20 08:51:45 +00:00
Paul Hu
b2982a0643 Merge "Revert "[RFPM03] Check permission by uid."" am: 0925015de5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404654

Change-Id: I51b37f8e717123a2725ade859d5b9dcff19ef484
 2020-08-20 08:33:41 +00:00
Paul Hu
9f33dbb509 Merge "Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method"" am: bddd412feb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404653

Change-Id: I35fe76f9cfedf0619f64023e9111d9a50cc3c41c
 2020-08-20 08:27:16 +00:00
Paul Hu
0925015de5 Merge "Revert "[RFPM03] Check permission by uid."" 2020-08-20 08:24:30 +00:00