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
13,045 commits 1 branch 0 tags 204 MiB
Commit graph

13,045 commits

This branch
This branch
All branches
Message SHA1
[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

Xin Li   authored and   Automerger Merge Worker   commited 2020-09-01 22:09:55 +00:00
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 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 am: c1d0f670f5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1112851

Change-Id: Ife8e4083142313916660cde2b460e3683f244350

Junyu Lai   authored and   Automerger Merge Worker   commited 2020-08-28 11:57:25 +00:00
0453d9b955
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
Merge "Notify the keepalive is stopped after the slot has been released"
Junyu Lai   authored and   Gerrit Code Review   commited 2020-08-28 10:12:44 +00:00
09a0f57f87
[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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2020-08-25 21:33:59 +00:00
e208589695
[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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2020-08-25 21:09:22 +00:00
0c3b9562fd
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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2020-08-25 20:49:04 +00:00
b54db4b9fa
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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2020-08-25 20:27:30 +00:00
a2f81d1442
Merge "Skip RAT type listener registration if IMSI is not available"
Treehugger Robot   authored and   Gerrit Code Review   commited 2020-08-25 19:55:09 +00:00
1e9c48bfec
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)

junyulai   commited 2020-08-25 18:03:38 +08:00
8c91a5f6cf
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
Automerger Merge Worker   authored and   Android (Google) Code Review   commited 2020-08-23 13:42:14 +00:00
515d8f3c4c
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

TreeHugger Robot   authored and   Automerger Merge Worker   commited 2020-08-23 13:41:55 +00:00
b3a91b1ce0
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

TreeHugger Robot   authored and   Automerger Merge Worker   commited 2020-08-23 13:41:47 +00:00
9b261be707
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

TreeHugger Robot   authored and   Automerger Merge Worker   commited 2020-08-23 13:18:49 +00:00
1b1eff1bc2
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

Paul Hu   authored and   Automerger Merge Worker   commited 2020-08-20 09:19:40 +00:00
d68ba4feaf
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

Paul Hu   authored and   Automerger Merge Worker   commited 2020-08-20 09:19:14 +00:00
8fa30d7651
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

Paul Hu   authored and   Automerger Merge Worker   commited 2020-08-20 09:06:22 +00:00
d001d445d5
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

Paul Hu   authored and   Automerger Merge Worker   commited 2020-08-20 09:05:53 +00:00
a370cac809
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

Paul Hu   authored and   Automerger Merge Worker   commited 2020-08-20 08:52:04 +00:00
ab51b37a2b
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

Paul Hu   authored and   Automerger Merge Worker   commited 2020-08-20 08:51:45 +00:00
9ea57d25d8
Merge "Revert "[RFPM03] Check permission by uid."" am: 0925015de5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404654

Change-Id: I51b37f8e717123a2725ade859d5b9dcff19ef484

Paul Hu   authored and   Automerger Merge Worker   commited 2020-08-20 08:33:41 +00:00
b2982a0643
Merge "Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method"" am: bddd412feb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404653

Change-Id: I35fe76f9cfedf0619f64023e9111d9a50cc3c41c

Paul Hu   authored and   Automerger Merge Worker   commited 2020-08-20 08:27:16 +00:00
9f33dbb509
Merge "Revert "[RFPM03] Check permission by uid.""
Paul Hu   authored and   Gerrit Code Review   commited 2020-08-20 08:24:30 +00:00
0925015de5
Merge "Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method""
Paul Hu   authored and   Gerrit Code Review   commited 2020-08-20 08:14:48 +00:00
bddd412feb
Merge "Revert "[RFPM05] Add UidNetdPermissionInfo class"" am: 324af52c7a am: 701cd3908e am: 99653eada1 am: a484db66e9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404652

Change-Id: I146f4ec57303570d7dc37716882075701d7f32d1

Paul Hu   authored and   Automerger Merge Worker   commited 2020-08-20 07:58:15 +00:00
5a93858eb3
Merge "Revert "[RFPM05] Add UidNetdPermissionInfo class"" am: 324af52c7a am: 701cd3908e am: 99653eada1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404652

Change-Id: I148fd645e30d866073a883550628f4013569af3c

Paul Hu   authored and   Automerger Merge Worker   commited 2020-08-20 07:45:15 +00:00
a484db66e9
Merge "Revert "[RFPM05] Add UidNetdPermissionInfo class"" am: 324af52c7a am: 701cd3908e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404652

Change-Id: I9edf5bfaa9cbc037e87f5781ba07a2c87932f3aa

Paul Hu   authored and   Automerger Merge Worker   commited 2020-08-20 07:04:43 +00:00
99653eada1
Merge "Revert "[RFPM05] Add UidNetdPermissionInfo class"" am: 324af52c7a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1404652

Change-Id: I8cef4a21aa8fd1923334c2a99e4ff2e864f516a5

Paul Hu   authored and   Automerger Merge Worker   commited 2020-08-20 06:44:04 +00:00
701cd3908e
Merge "Revert "[RFPM05] Add UidNetdPermissionInfo class""
Paul Hu   authored and   Gerrit Code Review   commited 2020-08-20 06:25:06 +00:00
324af52c7a
Revert "[RFPM03] Check permission by uid." 
This reverts commit f1e343c1c3.

Reason for revert: Regression in SW.  Bug:162499840

Change-Id: Ic93e762e41a728f66e200e5bc8e40ebe4c7b44f7

Paul Hu   authored and   Remi NGUYEN VAN   commited 2020-08-20 06:23:16 +00:00
fe640c8708
Revert "[RFPM04] Adjust hasRestrictedNetworkPermission method" 
This reverts commit bfa9f182b0.

Reason for revert: Regression in SW.  Bug:162499840

Change-Id: I96bf28ffc9f2d8f3838cb6d2dac16f89a70177ed

Paul Hu   authored and   Remi NGUYEN VAN   commited 2020-08-20 06:23:00 +00:00
e573ac006d
Revert "[RFPM05] Add UidNetdPermissionInfo class" 
This reverts commit fbc1f34c22.

Reason for revert: Regression in SW.  Bug:162499840

Change-Id: I0e846efcc4fc06b53d97b2007e0d8e8f97c6ac10

Paul Hu   commited 2020-08-20 03:10:08 +00:00
9e986a8e98
Notify the keepalive is stopped after the slot has been released 
Currently, the callbacks of stopping were fired when stop procedure
is started, because the upper layer apps only care about the reason
of stopping instead of stopping result. Thus, there is no need to
wait for the result comes back. However, this behavior generates
races if apps want to re-start keepalive immediately since the
resources are not released yet.

Fix: 134891441
Fix: 140305589
Test: atest com.android.server.ConnectivityServiceTest#testPacketKeepalives \
      --rerun-until-failure 1000

Change-Id: I987776a9211a50e964c4675b747bc10e203750f1

junyulai   commited 2020-08-20 11:00:08 +08:00
72d2bd016b
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)

junyulai   authored and   Junyu Lai   commited 2020-08-19 09:53:20 +00:00
675f67cbb2
Merge "Rename Kotlin util files to not include the Kt suffix" am: 6a8da60a32 am: 97cda73a1c am: 97c4e1a647 am: bda6506a01 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350084

Change-Id: I69da39a99014256dd1188cb522e8d0900deb66d1

Chalard Jean   authored and   Automerger Merge Worker   commited 2020-08-13 04:57:30 +00:00
a9b3729c3a
Merge "Rename Kotlin util files to not include the Kt suffix" am: 6a8da60a32 am: 97cda73a1c am: 97c4e1a647 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350084

Change-Id: I6d7b924f9c0e8722400611cec31b4bf4222548ad

Chalard Jean   authored and   Automerger Merge Worker   commited 2020-08-13 04:43:45 +00:00
bda6506a01
Merge "Rename Kotlin util files to not include the Kt suffix" am: 6a8da60a32 am: 97cda73a1c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350084

Change-Id: I6362695120ea8669e1da84bb686e886b85efd6a3

Chalard Jean   authored and   Automerger Merge Worker   commited 2020-08-13 04:26:11 +00:00
97c4e1a647
Merge "Rename Kotlin util files to not include the Kt suffix" am: 6a8da60a32 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350084

Change-Id: I7e1f015c21d54591a1a25b5fa461e751bc707509

Chalard Jean   authored and   Automerger Merge Worker   commited 2020-08-13 04:09:27 +00:00
97cda73a1c
Merge "Rename Kotlin util files to not include the Kt suffix"
Chalard Jean   authored and   Gerrit Code Review   commited 2020-08-13 03:52:47 +00:00
6a8da60a32
Merge "Update language to comply with Android's inclusive language guidance" am: 64f9851e3a am: 6afddeb044 am: 148be57009 am: 3db81f877e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1379156

Change-Id: I0d9947b6e4591d515a3c318be38e3c46a119a7f7

Chiachang Wang   authored and   Automerger Merge Worker   commited 2020-08-12 10:43:42 +00:00
89e9d75d7d
Merge "Update language to comply with Android's inclusive language guidance" am: 64f9851e3a am: 6afddeb044 am: 148be57009 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1379156

Change-Id: Ib078acdf9210f7c80b5cdb50ae5b860aea2a5626

Chiachang Wang   authored and   Automerger Merge Worker   commited 2020-08-12 10:28:50 +00:00
3db81f877e
Merge "Update language to comply with Android's inclusive language guidance" am: 64f9851e3a am: 6afddeb044 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1379156

Change-Id: Ibe13b2dad841e2ade2762558d1c3978a89cb825d

Chiachang Wang   authored and   Automerger Merge Worker   commited 2020-08-12 10:10:11 +00:00
148be57009
Merge "Update language to comply with Android's inclusive language guidance" am: 64f9851e3a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1379156

Change-Id: Iecf8601b2f9e286cefca0675476d0892436d5e5b

Chiachang Wang   authored and   Automerger Merge Worker   commited 2020-08-12 09:52:30 +00:00
6afddeb044
Merge "Update language to comply with Android's inclusive language guidance"
Chiachang Wang   authored and   Gerrit Code Review   commited 2020-08-12 09:30:11 +00:00
64f9851e3a
Merge "[RFPM05] Add UidNetdPermissionInfo class" am: 255bf95e97 am: 1cc0664651 am: e09d3ece31 am: f00246ed26 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322556

Change-Id: I390c22d8b114d94990a5e81ad02d47beea115680

Paul Hu   authored and   Automerger Merge Worker   commited 2020-08-12 07:25:48 +00:00
b3ab880007
Merge "[RFPM05] Add UidNetdPermissionInfo class" am: 255bf95e97 am: 1cc0664651 am: e09d3ece31 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1322556

Change-Id: I6992464abf1f79bde4da0b0ac6e9d13619ef485d

Paul Hu   authored and   Automerger Merge Worker   commited 2020-08-12 07:11:46 +00:00
f00246ed26