Commit Graph

11845 Commits

Author SHA1 Message Date
Bernie Innocenti
26b8ea83f0 Merge "Stop setting the legacy net.dnsX system properties" am: 61da71aa03 am: ab60aa4add am: 5e29d0c679 am: d8422c8eb4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1229561

Change-Id: I78ef627fdf0312cf84de53aa8da5f0bca466a6f3
2020-10-16 15:23:18 +00:00
Bernie Innocenti
d8422c8eb4 Merge "Stop setting the legacy net.dnsX system properties" am: 61da71aa03 am: ab60aa4add am: 5e29d0c679
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1229561

Change-Id: I2f310676bd67385921b42f47777dcb522e343ffa
2020-10-16 14:35:59 +00:00
Bernie Innocenti
5e29d0c679 Merge "Stop setting the legacy net.dnsX system properties" am: 61da71aa03 am: ab60aa4add
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1229561

Change-Id: I347b1bd257775204499e1c880b4205c04c76710d
2020-10-16 14:18:20 +00:00
Bernie Innocenti
ab60aa4add Merge "Stop setting the legacy net.dnsX system properties" am: 61da71aa03
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1229561

Change-Id: Id30674df53eead41a626eef81a0d7e449dfd7c83
2020-10-16 14:03:43 +00:00
Chiachang Wang
e62f378b9c Stop setting the legacy net.dnsX system properties
These have been locked down via SELinux for a while and thus
they should be safe to delete at this point.

Test: atest FrameworksNetTest
Bug: 33308258
Bug: 148724751
Change-Id: I3a1e9c6ad92c8d2367e0048e5d6cd7d06bbc6e80
2020-10-16 08:19:25 +00:00
Aaron Huang
42fe792772 Merge "Create service-connectivity.jar" 2020-10-16 07:03:33 +00:00
Aaron Huang
dfba5d17fe Create service-connectivity.jar
Create a new target service-connectivity to split
ConnectivityService from services.core.

Add ConnectivityServiceInitializer for initializing
ConnectivityService and add systemReady() in
ConnectivityManager so that SystemServer can call systemReady()
through ConnectivityManager which won't change current behavior.

Bug: 158268939
Test: make target-java, make host-java
      atest FrameworksNetIntegrationTests
      atest FrameworksNetTests
      make, device can boot,
      atest CtsStrictJavaPackagesTestCases
      wifi and mobile data work.
Change-Id: Ie732bfaf381404af0bb599ca2f421a96e7aa4257
2020-10-16 02:29:04 +08:00
Roman Kalukiewicz
e2b9459da9 Add @Nullable annotation to the parameter of Object.equals() methods.
Those annotations could be inferred by some tools (like Kotlin), but the
https://checkerframework.org/ doesn't check inherited annotations
complaining about all equals() invocations that get nullable argument.

The change was generated by running

find . -name \*.java | xargs sed -i 's/public boolean equals(Object /public boolean equals(@Nullable Object /'

in the frameworks/base directory and by automatically adding and
formatting required imports if needed. No manual edits.

Bug: 170883422
Test: Annotation change only. Should have not impact.
Exempt-From-Owner-Approval: Mechanical change not specific to any component.
Change-Id: I5eedb571c9d78862115dfdc5dae1cf2a35343580
2020-10-15 10:48:01 -07:00
Treehugger Robot
5e308f61e4 Merge "Add imports to networking test mapping" am: a9d1392d0b am: a2558cbfc2 am: 1bb4204e60 am: eaaa95983c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1461982

Change-Id: Ib665e3d7e2ad6058c36c5d93fdc67131d2f670b5
2020-10-15 12:39:49 +00:00
Treehugger Robot
eaaa95983c Merge "Add imports to networking test mapping" am: a9d1392d0b am: a2558cbfc2 am: 1bb4204e60
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1461982

Change-Id: I2532899ff95a737bf1f22640c8b5843fec595136
2020-10-15 11:47:10 +00:00
Treehugger Robot
1bb4204e60 Merge "Add imports to networking test mapping" am: a9d1392d0b am: a2558cbfc2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1461982

Change-Id: If6e2aec576eea261aa648cc027e4047c99363841
2020-10-15 11:28:49 +00:00
Treehugger Robot
a2558cbfc2 Merge "Add imports to networking test mapping" am: a9d1392d0b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1461982

Change-Id: I835d9c17377cee5adcc5f44cff3e1d4f0774aaa2
2020-10-15 11:07:41 +00:00
Treehugger Robot
a9d1392d0b Merge "Add imports to networking test mapping" 2020-10-15 10:21:25 +00:00
Remi NGUYEN VAN
1932b12535 Add imports to networking test mapping
Ensure that appropriate networking tests are triggered when submitting
changes in the frameworks/base directories.

Change-Id: Ibf8b567fa7721299120b0a6c6836dd770d92a9fc
Test: treehugger runs TEST_MAPPING tests
2020-10-15 09:16:40 +00:00
Treehugger Robot
cbca7cffe3 Merge "Fix a typo in a comment" am: 968238aa92 am: 0df34e3024 am: 173b634aab am: da629196fd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459885

Change-Id: I084659f9f874fd7654645043c31e6f5e2b7a04de
2020-10-14 12:28:40 +00:00
Treehugger Robot
da629196fd Merge "Fix a typo in a comment" am: 968238aa92 am: 0df34e3024 am: 173b634aab
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459885

Change-Id: I8428419ef645a312c7fbbc45a8ac5709d6ab5d9c
2020-10-14 12:08:20 +00:00
Treehugger Robot
173b634aab Merge "Fix a typo in a comment" am: 968238aa92 am: 0df34e3024
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459885

Change-Id: Ifdaed83a7696ad37df0487a91bcb089de229de07
2020-10-14 11:54:57 +00:00
Treehugger Robot
0df34e3024 Merge "Fix a typo in a comment" am: 968238aa92
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1459885

Change-Id: I9174acc91209d83526901587bf4603d61aa30acc
2020-10-14 11:24:43 +00:00
Treehugger Robot
968238aa92 Merge "Fix a typo in a comment" 2020-10-14 10:54:25 +00:00
Chalard Jean
05fcb2e43e Fix a typo in a comment
Test: is not necessary for fixing typos in comments
Change-Id: Idf48d2649e728cafda5c1ca32d21102094cf23f5
2020-10-14 04:56:20 +00:00
Chiachang Wang
6baf4256c9 Merge "Use system api for shell command handling" am: 3da3af2a10 am: 231acbca1b am: 8d5767de05 am: 669defa316
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456126

Change-Id: Ib1983313f09336f1bac13a8a84e80cffeee721f7
2020-10-13 10:47:57 +00:00
Chiachang Wang
669defa316 Merge "Use system api for shell command handling" am: 3da3af2a10 am: 231acbca1b am: 8d5767de05
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456126

Change-Id: I8bc3e27c6cb9f7be7056d1124458c4e283a0f945
2020-10-13 10:12:04 +00:00
Chiachang Wang
8d5767de05 Merge "Use system api for shell command handling" am: 3da3af2a10 am: 231acbca1b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456126

Change-Id: Id33a233789eb58e6ef5be2d5edf3f504c9b4eb12
2020-10-13 09:50:11 +00:00
Chiachang Wang
231acbca1b Merge "Use system api for shell command handling" am: 3da3af2a10
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1456126

Change-Id: I322bbe2f711f8c50efe9d50056787c0e60051fbb
2020-10-13 09:29:47 +00:00
Chiachang Wang
3da3af2a10 Merge "Use system api for shell command handling" 2020-10-13 08:41:40 +00:00
Chiachang Wang
0efaff8cbc Use system api for shell command handling
ConnectivityService should not use ShellCommand since it's @hide
which does not accessible in mainline modules. Replace it with
system api for mainline.

Bug: 170598012
Test: adb shell cmd connectivity airplane-mode enable
Test: adb shell cmd connectivity airplane-mode disable
Change-Id: I47e7a371c19eb18eac643fe9a2ab481bec5743c2
2020-10-13 08:41:24 +00:00
TreeHugger Robot
973561a3e6 [automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master am: 009ac78c7b -s ours am: 973d635675 -s ours am: 94c3921a03 -s ours
am skip reason: Change-Id Iecef31f7bf10ad97b7e0075cf302ae94e248474a with SHA-1 539d92beb7 is in history

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

Change-Id: I93ca7693005bd26b157fc31c10170e4d2dff5934
2020-10-13 04:50:33 +00:00
Junyu Lai
4475546bb0 Merge "Support dynamically update IMSI" am: 2d74c2e267 am: e981a87c00 am: 36b8c1d919 am: a33114824f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418348

Change-Id: I5e5fc106aaab1b55302c38717cad9dbf1281baec
2020-10-13 04:46:38 +00:00
TreeHugger Robot
94c3921a03 [automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master am: 009ac78c7b -s ours am: 973d635675 -s ours
am skip reason: Change-Id Iecef31f7bf10ad97b7e0075cf302ae94e248474a with SHA-1 539d92beb7 is in history

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

Change-Id: Icb052e904d339089be1b2e0014b7dd16f958e3d6
2020-10-13 04:22:42 +00:00
Junyu Lai
a33114824f Merge "Support dynamically update IMSI" am: 2d74c2e267 am: e981a87c00 am: 36b8c1d919
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418348

Change-Id: Id948a9453139cbf4e9afc75647152bdbd24cfe0a
2020-10-13 04:19:38 +00:00
TreeHugger Robot
973d635675 [automerger skipped] Merge "Merge ab/6749736 in stage." into stage-aosp-master am: 009ac78c7b -s ours
am skip reason: Change-Id Iecef31f7bf10ad97b7e0075cf302ae94e248474a with SHA-1 539d92beb7 is in history

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

Change-Id: I35256efaa6acc9a9f28371993587f888c1a77252
2020-10-13 03:51:03 +00:00
Junyu Lai
36b8c1d919 Merge "Support dynamically update IMSI" am: 2d74c2e267 am: e981a87c00
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418348

Change-Id: Ic369f77eb09979e8ed36e4207fe42f293548ba90
2020-10-13 03:49:06 +00:00
TreeHugger Robot
009ac78c7b Merge "Merge ab/6749736 in stage." into stage-aosp-master 2020-10-13 03:31:35 +00:00
Junyu Lai
e981a87c00 Merge "Support dynamically update IMSI" am: 2d74c2e267
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1418348

Change-Id: Id06d5d37ad5f12e689643c916548e9a59089eb3b
2020-10-13 03:22:09 +00:00
Junyu Lai
2d74c2e267 Merge "Support dynamically update IMSI" 2020-10-13 02:41:47 +00:00
junyulai
c822fe5e07 Support dynamically update IMSI
Currently, NetworkStatsSubscriptionsMonitor will skip the
listener registration until the IMSI is available to deal
with SIM PIN locked case. However, this solution can only
handle the case that IMSI changes from/to null. And it also
relies on the assumption that IMSI never changes for a subId.

Thus, support dynamically update IMSI to handle IMSI changes
more robustly.

This patch also address leftover comments at ag/12400327.

Test: enable SIM PIN and manually test
Test: atest NetworkStatsSubscriptionsMonitorTest#testSubscriberIdUnavailable
Test: atest NetworkStatsSubscriptionsMonitorTest#testSubscriberIdChanged
Test: ./out/host/linux-x86/bin/statsd_testdrive 10082
Bug: 160941101

Change-Id: I625a5b10ee4806f6fee99c2d9d6c5e7977ff785e
2020-10-12 15:31:02 +08:00
Lorenzo Colitti
052fe66496 Merge "Speculatively fix L2TP keepalive issues by reducing mtu" am: f67e00b803 am: d3bf9a15a0 am: 23a036cd42 am: e9e92b80ac
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399646

Change-Id: Iba6098badc018fa64b1c5fc20177b97a81a2e685
2020-10-12 01:48:18 +00:00
Lorenzo Colitti
e9e92b80ac Merge "Speculatively fix L2TP keepalive issues by reducing mtu" am: f67e00b803 am: d3bf9a15a0 am: 23a036cd42
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399646

Change-Id: I5b11411b87069687d32dede7194f9cd8a232c963
2020-10-12 01:34:41 +00:00
Lorenzo Colitti
23a036cd42 Merge "Speculatively fix L2TP keepalive issues by reducing mtu" am: f67e00b803 am: d3bf9a15a0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399646

Change-Id: Ie6a7fdb8e1ce035ce145b90645290e7e4777f7e6
2020-10-12 01:20:47 +00:00
Lorenzo Colitti
d3bf9a15a0 Merge "Speculatively fix L2TP keepalive issues by reducing mtu" am: f67e00b803
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1399646

Change-Id: Iac7fc24c531db663469df1b1161d9f85a4c6f3ee
2020-10-12 01:06:47 +00:00
Lorenzo Colitti
f67e00b803 Merge "Speculatively fix L2TP keepalive issues by reducing mtu" 2020-10-12 00:40:44 +00:00
Xin Li
7d27412dad Merge ab/6749736 in stage.
Bug: 167233921
Merged-In: Iecef31f7bf10ad97b7e0075cf302ae94e248474a
Change-Id: I9e9c873bc2e05a0cfe3af0bf74725500f3f108db
2020-10-10 20:38:57 -07:00
Treehugger Robot
8cec12f482 Merge "Don't let NAW.mNetworkInfo escape" am: 6e8c64b349 am: 497eab9a18 am: a6fa1d584b am: 04f8105750
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1455976

Change-Id: I239201986987a07c09321d7be7e0feae7eaf9f15
2020-10-09 12:04:45 +00:00
Treehugger Robot
04f8105750 Merge "Don't let NAW.mNetworkInfo escape" am: 6e8c64b349 am: 497eab9a18 am: a6fa1d584b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1455976

Change-Id: I5811b1c40540123b0d6446f8af7638ce2eac6d99
2020-10-09 11:51:01 +00:00
Treehugger Robot
a6fa1d584b Merge "Don't let NAW.mNetworkInfo escape" am: 6e8c64b349 am: 497eab9a18
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1455976

Change-Id: I8a9899d9a5d7eba8423cbba99f085174ae383e6a
2020-10-09 11:05:01 +00:00
Treehugger Robot
497eab9a18 Merge "Don't let NAW.mNetworkInfo escape" am: 6e8c64b349
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1455976

Change-Id: I01ef40f341c653a524ee4565c3d9bf2564e0f98f
2020-10-09 10:48:42 +00:00
Treehugger Robot
6e8c64b349 Merge "Don't let NAW.mNetworkInfo escape" 2020-10-09 10:33:47 +00:00
Chalard Jean
c8c06be939 Don't let NAW.mNetworkInfo escape
Thankfully this has no users.

This agent needs to be migrated to the modern API for
NetworkAgent, which does not have NetworkInfo at all
so this would be a hindrance

Test: FrameworksNetTests NetworkStackTests
Change-Id: I091a6ca8cdf18860f23832ae1008fa02cf0472e8
2020-10-09 17:06:30 +09:00
Remi NGUYEN VAN
c1c3e254da Merge "Move IpUtils to frameworks/libs/net" am: 1ea097fcb2 am: 5d47632002 am: ff1cfa230d am: 96c5807a35
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440234

Change-Id: I27072c126ee7eedc2de3d1cdccd0fd503f1577a1
2020-10-09 01:58:35 +00:00
Remi NGUYEN VAN
96c5807a35 Merge "Move IpUtils to frameworks/libs/net" am: 1ea097fcb2 am: 5d47632002 am: ff1cfa230d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440234

Change-Id: Ia364eb033d4ed9ae8db4f27fcfd065065581ae73
2020-10-09 01:26:33 +00:00