Commit Graph

12583 Commits

Author SHA1 Message Date
Zoey Chen
868044d483 Merge changes from topic "PSL_TelephonyCallback" am: f619c9967d am: df270afdb6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614981

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic26eea861f33d75b7b5ef62aa411532e52cac51b
2021-03-09 11:51:08 +00:00
Aaron Huang
2314dd2d90 Merge changes I1d1f0d2d,Ifbd4a978 am: 77ed87e072 am: 9b58ed12cc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1475901

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7386dfb19911f1b9db39df3b809d18742cc13a75
2021-03-09 11:49:50 +00:00
Zoey Chen
df270afdb6 Merge changes from topic "PSL_TelephonyCallback" am: f619c9967d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614981

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idd41c34f9e4dff1ca7930a9fc2a6f06ec8c316ba
2021-03-09 11:24:06 +00:00
Aaron Huang
9b58ed12cc Merge changes I1d1f0d2d,Ifbd4a978 am: 77ed87e072
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1475901

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I156b9230ef2ea495a6d1661c3f618de4a9c2ac2a
2021-03-09 11:14:40 +00:00
Zoey Chen
f619c9967d Merge changes from topic "PSL_TelephonyCallback"
* changes:
  [Telephony] Use TelephonyCallback instead of PhoneStateListener part1
  [PhoneStateListener] Redesign PhoneStateListener: Use TelephonyCallback
2021-03-09 10:36:03 +00:00
Aaron Huang
77ed87e072 Merge changes I1d1f0d2d,Ifbd4a978
* changes:
  Communicate with BatteryStatsService through BatteryStatsManager
  Add a new API in BatteryStatsManager for connectivity service
2021-03-09 10:33:56 +00:00
Chalard Jean
4ad3d649d8 Merge "Replace withCleanCallingIdentity with [clear|restore]CallingIdentity" am: aaef65de42 am: 3d4e6deeb3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615182

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I242abe2597ad717026afc547f05701ed8c41aa5c
2021-03-09 08:26:04 +00:00
Chalard Jean
3d4e6deeb3 Merge "Replace withCleanCallingIdentity with [clear|restore]CallingIdentity" am: aaef65de42
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615182

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I376927831333a78dc2c60b5be23324b8f0395c58
2021-03-09 08:07:32 +00:00
Chalard Jean
aaef65de42 Merge "Replace withCleanCallingIdentity with [clear|restore]CallingIdentity" 2021-03-09 07:41:13 +00:00
Aaron Huang
e044c46257 Communicate with BatteryStatsService through BatteryStatsManager
Mainline connectivity service is only allowed to use formal
APIs. Use new system API in BatteryStatsManager instead of
calling BatteryStatsService directly.

Bug: 171686421
Test: FrameworksNetTests
Change-Id: I1d1f0d2d456003e842ad77519667c0532995610d
Merged-In: I1d1f0d2d456003e842ad77519667c0532995610d
2021-03-09 06:29:30 +00:00
Lucas Lin
d4185bab7a Merge "Use ArraySet#add() instead of ArraySet#append()" am: 627c6a5258 am: ee5644f6b5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615181

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4418327b7201e31620a71b693a70403889a25fbf
2021-03-09 06:10:20 +00:00
Lucas Lin
ee5644f6b5 Merge "Use ArraySet#add() instead of ArraySet#append()" am: 627c6a5258
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615181

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1991567f130f3afee6c6bcb78a9254b45e14f6e4
2021-03-09 05:31:26 +00:00
Lucas Lin
627c6a5258 Merge "Use ArraySet#add() instead of ArraySet#append()" 2021-03-09 04:52:42 +00:00
Zoey Chen
dbc2df30cb [Telephony] Use TelephonyCallback instead of PhoneStateListener part1
Since the redesign of PhoneStateListener, use TelephonyCallback to get the callback of EVENT_*

Bug: 167684594
Test: make
Change-Id: Ia3b777b12142b104b5798804f50b34748f9bf28c
Merged-In: Ia3b777b12142b104b5798804f50b34748f9bf28c
2021-03-08 20:25:00 +08:00
Remi NGUYEN VAN
f2c45c31d3 Merge "Move OemNetworkPreferences to Connectivity" am: c61a6fc426 am: 37aa459906
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620981

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0f0c36460103552d1c1f21a8a5f8486274d282e2
2021-03-08 09:51:57 +00:00
Remi NGUYEN VAN
37aa459906 Merge "Move OemNetworkPreferences to Connectivity" am: c61a6fc426
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620981

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9adc394b0c203cdb1045f50e83487ea0c2000632
2021-03-08 09:12:05 +00:00
Paul Hu
7c62151de3 Merge "Replace Inet[4|6]Address#ANY" am: 3483a8be68 am: cdb81da32c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615184

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ee00807430cd27ed1632a0a6f7c78ab0ae4a99f
2021-03-08 08:51:15 +00:00
Remi NGUYEN VAN
c61a6fc426 Merge "Move OemNetworkPreferences to Connectivity" 2021-03-08 08:41:04 +00:00
Paul Hu
cdb81da32c Merge "Replace Inet[4|6]Address#ANY" am: 3483a8be68
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615184

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I45cf2b37c775da158cdec2d3b7f50ac491d2fca8
2021-03-08 08:05:59 +00:00
Paul Hu
3483a8be68 Merge "Replace Inet[4|6]Address#ANY" 2021-03-08 07:20:21 +00:00
paulhu
ee4cd637e3 Replace Inet[4|6]Address#ANY
Connectivity is becoming a mainline module in S but mainline
modules are not allowed to use non-formal APIs. Thus, replace
non-formal API Inet[4|6]Address#ANY to
NetworkStackConstants#IPV[4|6]_ADDR_ANY.

Bug: 181756157
Test: FrameworksNetTests
Change-Id: Id4d2fc551c1384f549a586e87ab68356ba05b995
2021-03-08 07:18:31 +00:00
Frank Li
446fcf2ac9 Merge "[CS10]Remove the hidden API usage of BitUtils" am: 02d57fc2ae am: defaaf05a4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615192

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2f8fe5b886c49a1c52fb4bf27d29347899e0dd21
2021-03-08 02:55:05 +00:00
Frank Li
defaaf05a4 Merge "[CS10]Remove the hidden API usage of BitUtils" am: 02d57fc2ae
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615192

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia0dcd92a896a759e65ada070f16394db216b07b8
2021-03-08 02:14:44 +00:00
Remi NGUYEN VAN
9930f13c67 Move OemNetworkPreferences to Connectivity
The data class supports a ConnectivityManager API, so it should be
together with the ConnectivityManager API surface.

Bug: 181512874
Test: m
Change-Id: I5642486ea0febcb08cadcbd4cd3f0c6056deae0e
2021-03-08 09:26:41 +09:00
lifr
c33ea4de7d [CS10]Remove the hidden API usage of BitUtils
The connection service will become the main line module.
It is difficult to include BitUtils in the module. and so
Move the hidden API needed in BitUtils to NetworkCapabilitiesUtils.

Bug: 170598012
Test: atest ConnectivityServiceTest
      atest NetworkCapabilitiesTest
      atest DnsUtilsTest
Change-Id: Ibc81827e25a54fc3ff94f78d810fe4f5073e3a98
2021-03-06 16:21:16 +00:00
James Mattis
68fad37f38 Merge "Applying OEM network pref to all users" am: 3f0925ee2e am: 00f75b0b32
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612760

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5ec8289855a810504e82b8828a4160929f13d19b
2021-03-05 22:11:25 +00:00
James Mattis
00f75b0b32 Merge "Applying OEM network pref to all users" am: 3f0925ee2e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612760

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id805612e7b807dd789c4ff88a933660fb11b12cf
2021-03-05 21:39:23 +00:00
James Mattis
3f0925ee2e Merge "Applying OEM network pref to all users" 2021-03-05 19:09:24 +00:00
Remi NGUYEN VAN
d7e667b28f Merge "Move NetworkState to Connectivity" am: 4d2ad2a68a am: 65982d493b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620379

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3f87db84ac7d49c7f781ff9bd188f90dac54db8e
2021-03-05 11:56:39 +00:00
Remi NGUYEN VAN
65982d493b Merge "Move NetworkState to Connectivity" am: 4d2ad2a68a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620379

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie8eda98704327d894b59c335753739600b87f670
2021-03-05 11:33:30 +00:00
Remi NGUYEN VAN
4d2ad2a68a Merge "Move NetworkState to Connectivity" 2021-03-05 10:27:57 +00:00
Aaron Huang
a095858f1f Merge "Use NetworkCallback in BatteryStatsService to get connectivity change" am: 74850ac20e am: 3c79f13642
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574864

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ide9ccdb7a50e3d674cb85dfffa014c89ee52db3e
2021-03-05 08:23:08 +00:00
Aaron Huang
3c79f13642 Merge "Use NetworkCallback in BatteryStatsService to get connectivity change" am: 74850ac20e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574864

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If6fd08a8ba2bcbe4a955c245f49be517794f8a91
2021-03-05 07:45:53 +00:00
Aaron Huang
74850ac20e Merge "Use NetworkCallback in BatteryStatsService to get connectivity change" 2021-03-05 07:03:51 +00:00
Treehugger Robot
54c1b0624f Merge "[FUI22] Support getAllNetworkStateSnapshot" am: bcbc04f329 am: f216522f0f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614779

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie34762b31c98bd86f121f17112677cb33704f481
2021-03-05 06:20:16 +00:00
Remi NGUYEN VAN
68d10c47df Merge "Replace user with debuggable check in ConnectivityService" am: a923322f24 am: 4386582dd2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615085

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I00949470243a8ca63b401810bc9cb4ad3631e038
2021-03-05 06:19:52 +00:00
Chalard Jean
e05c37b5ec Merge "Generalize some PANS methods" am: b639d79547 am: 9b385fa220
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612258

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9203b1f45d072694bffad33f6e4e9d4b12185a4a
2021-03-05 06:19:21 +00:00
Treehugger Robot
f216522f0f Merge "[FUI22] Support getAllNetworkStateSnapshot" am: bcbc04f329
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614779

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I70cbeb9d2b5b4cb2d09d31444b5d60e887b7e8c2
2021-03-05 05:53:33 +00:00
Remi NGUYEN VAN
4386582dd2 Merge "Replace user with debuggable check in ConnectivityService" am: a923322f24
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1615085

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieb729be68e810972506b1d8a3960dfc371a294b1
2021-03-05 05:50:47 +00:00
Chalard Jean
9b385fa220 Merge "Generalize some PANS methods" am: b639d79547
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612258

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7baa17a0f882ec21f766c9f7dc2c0694853fb467
2021-03-05 05:47:57 +00:00
Chiachang Wang
dc14b38157 Merge "Have the DataConnectionStat started from BSS" am: 86dce50c72 am: 658a53ccef
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607895

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I63ec8e62d944828c1c6c7b9fa948a60a87f7d9e7
2021-03-05 05:43:32 +00:00
Janis Danisevskis
bb865ae949 Merge "Keystore 2.0: Make VPN Keystore 2.0 ready." am: c410b053b9 am: d8fb75701d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569502

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I77346383545bd79d9406b5711f969e07eb1e66f0
2021-03-05 05:41:50 +00:00
Chiachang Wang
658a53ccef Merge "Have the DataConnectionStat started from BSS" am: 86dce50c72
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607895

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7f9e9d496c92e86609871c93a08b819b3704314f
2021-03-05 05:37:43 +00:00
Treehugger Robot
42b8c94fae Merge "Fix CaptivePortalTest before R" am: 73e63132a6 am: a2229ce85b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618939

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib5bf1fc2b06fb5339ffd9b43d0eda893a4bbc4bd
2021-03-05 05:18:27 +00:00
Janis Danisevskis
d8fb75701d Merge "Keystore 2.0: Make VPN Keystore 2.0 ready." am: c410b053b9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569502

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I97b24a5462f42773df919bd1d7acf9a9c5dcd43c
2021-03-05 05:17:12 +00:00
Treehugger Robot
bcbc04f329 Merge "[FUI22] Support getAllNetworkStateSnapshot" 2021-03-05 05:16:43 +00:00
Remi NGUYEN VAN
a923322f24 Merge "Replace user with debuggable check in ConnectivityService" 2021-03-05 05:09:46 +00:00
Treehugger Robot
a2229ce85b Merge "Fix CaptivePortalTest before R" am: 73e63132a6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1618939

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I29443e1af761cca33185638e5bd84771e0bc9192
2021-03-05 05:03:21 +00:00
Chalard Jean
b639d79547 Merge "Generalize some PANS methods" 2021-03-05 04:48:39 +00:00
Chiachang Wang
86dce50c72 Merge "Have the DataConnectionStat started from BSS" 2021-03-05 02:59:33 +00:00