junyulai
ea11e8a174
Add getAllCollapsedRatTypes to NetworkTemplate am: 199f353a9e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397953
Change-Id: I4bfdd2dcc7bd6b1e15248d7ef855fc40db018c4a
2020-08-20 03:56:10 +00:00
Treehugger Robot
c6a61f9eee
Merge changes I0faeda20,I726e74f5
...
* changes:
Add 5G NSA to collapsed RAT types list
Add getAllCollapsedRatTypes to NetworkTemplate
2020-08-20 03:44:07 +00:00
Junyu Lai
8c8fe82145
Merge "Skip RAT type listener registration if IMSI is not available"
2020-08-20 02:20:31 +00:00
junyulai
dad37d17fb
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-19 09:53:20 +00:00
junyulai
43e9bf91cf
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
Change-Id: I408379b3c432d9e62e0837d6b4f6551cc7838e29
2020-08-19 15:15:51 +08:00
Roshan Pius
311d14bde4
Merge "WifiP2pManager: Plumb package name to service"
2020-08-13 03:29:03 +00:00
Roshan Pius
a61dac1417
WifiP2pManager: Plumb package name to service
...
Will be used for prioritization of different ifaces in HDM.
Bug: 162344695
Test: atest com.android.server.wifi
Change-Id: Iac1447390f7329768b9c307b08d28ebbd4ea3b90
2020-08-12 06:39:30 -07:00
Chiachang Wang
e4a3f3d6c1
Merge "Update language to comply with Android's inclusive language guidance" am: 2dd299c5db am: 0e7aefd000 am: e15e314aad am: 2a0b75be4c am: 06f68e1736
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1379156
Change-Id: Ib455b42f7f360b75a295f86fd5166125fd0f69aa
2020-08-12 10:58:30 +00:00
Chiachang Wang
06f68e1736
Merge "Update language to comply with Android's inclusive language guidance" am: 2dd299c5db am: 0e7aefd000 am: e15e314aad am: 2a0b75be4c
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1379156
Change-Id: I0d9947b6e4591d515a3c318be38e3c46a119a7f7
2020-08-12 10:43:42 +00:00
Chiachang Wang
2a0b75be4c
Merge "Update language to comply with Android's inclusive language guidance" am: 2dd299c5db am: 0e7aefd000 am: e15e314aad
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1379156
Change-Id: Ib078acdf9210f7c80b5cdb50ae5b860aea2a5626
2020-08-12 10:28:50 +00:00
junyulai
fd139892de
Add 5G NSA to collapsed RAT types list
...
Currently, getAllCollapsedRatTypes is used to retrieve
all RAT types which will be recorded into NetworkStatsService.
However, there is a missing part that 5G NSA virtual RAT type
is not added into this list. This makes callers such as statsd
do not aware of 5G NSA RAT type and missed to collect data
usage of it.
Test: atest NetworkStatsSubscriptionsMonitorTest#test5g
Test: adb shell cmd stats pull-source 10082
Test: ./out/host/linux-x86/bin/statsd_testdrive 10082
Test: atest UidAtomTests#testMobileBytesTransfer \
UidAtomTests#testMobileBytesTransferByFgBg \
UidAtomTests#testDataUsageBytesTransfer
Bug: 163021464
Change-Id: I0faeda20f0506a48ac1131b234c5fc40d95dfbe0
Merged-In: I0faeda20f0506a48ac1131b234c5fc40d95dfbe0
(cherry-picked from ag/12355984)
2020-08-12 10:12:48 +00:00
Chiachang Wang
e15e314aad
Merge "Update language to comply with Android's inclusive language guidance" am: 2dd299c5db am: 0e7aefd000
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1379156
Change-Id: Ibe13b2dad841e2ade2762558d1c3978a89cb825d
2020-08-12 10:10:11 +00:00
junyulai
199f353a9e
Add getAllCollapsedRatTypes to NetworkTemplate
...
This is a partial cherry-pick of ag/10293594
Test: TH
Bug: 129082217
Merged-In: I726e74f5c63a6ed456cb13ea259b58c7a33bec76
Change-Id: I726e74f5c63a6ed456cb13ea259b58c7a33bec76
2020-08-12 18:01:13 +08:00
junyulai
c4d0f79462
[automerger skipped] Add 5G NSA to collapsed RAT types list am: 923ab36b89 am: ef29845f01 am: 50a4ef97f3 -s ours
...
am skip reason: Change-Id I0faeda20f0506a48ac1131b234c5fc40d95dfbe0 with SHA-1 fd54bcf23f is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12355984
Change-Id: I7e9ec32d8619cb3527beace1b9c080b75c0fa204
2020-08-12 09:34:24 +00:00
junyulai
50a4ef97f3
Add 5G NSA to collapsed RAT types list am: 923ab36b89 am: ef29845f01
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12355984
Change-Id: I37ea30affa142ecf13c9dab6fca44266e8547202
2020-08-12 09:15:41 +00:00
junyulai
ef29845f01
Add 5G NSA to collapsed RAT types list am: 923ab36b89
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12355984
Change-Id: I7afb61046da5e7381604ec7407ca80d0f42bcb0c
2020-08-12 08:56:39 +00:00
junyulai
923ab36b89
Add 5G NSA to collapsed RAT types list
...
Currently, getAllCollapsedRatTypes is used to retrieve
all RAT types which will be recorded into NetworkStatsService.
However, there is a missing part that 5G NSA virtual RAT type
is not added into this list. This makes callers such as statsd
do not aware of 5G NSA RAT type and missed to collect data
usage of it.
Test: atest NetworkStatsSubscriptionsMonitorTest#test5g
Test: adb shell cmd stats pull-source 10082
Test: ./out/host/linux-x86/bin/statsd_testdrive 10082
Test: atest UidAtomTests#testMobileBytesTransfer \
UidAtomTests#testMobileBytesTransferByFgBg \
UidAtomTests#testDataUsageBytesTransfer
Bug: 163021464
Change-Id: I0faeda20f0506a48ac1131b234c5fc40d95dfbe0
Merged-In: I0faeda20f0506a48ac1131b234c5fc40d95dfbe0
2020-08-12 05:21:23 +00:00
junyulai
fd54bcf23f
Add 5G NSA to collapsed RAT types list
...
Currently, getAllCollapsedRatTypes is used to retrieve
all RAT types which will be recorded into NetworkStatsService.
However, there is a missing part that 5G NSA virtual RAT type
is not added into this list. This makes callers such as statsd
do not aware of 5G NSA RAT type and missed to collect data
usage of it.
Test: atest NetworkStatsSubscriptionsMonitorTest#test5g
Test: adb shell cmd stats pull-source 10082
Test: ./out/host/linux-x86/bin/statsd_testdrive 10082
Test: atest UidAtomTests#testMobileBytesTransfer \
UidAtomTests#testMobileBytesTransferByFgBg \
UidAtomTests#testDataUsageBytesTransfer
Bug: 163021464
Change-Id: I0faeda20f0506a48ac1131b234c5fc40d95dfbe0
2020-08-12 05:20:54 +00:00
Chiachang Wang
2fea4a758b
Update language to comply with Android's inclusive language guidance
...
See https://source.android.com/setup/contribute/respectful-code
for reference.
Bug: 161896447
Test: m ; atest FrameworkNetTests
Change-Id: Ib6b4c9526992c31e05e82be80e2b9b86bc0b57ef
2020-08-12 12:23:59 +08:00
Chiachang Wang
0f2cebfb52
Update language to comply with Android's inclusive language guidance
...
See https://source.android.com/setup/contribute/respectful-code
for reference.
Test: m ; atest TetheringTests
Bug: 161896447
Change-Id: Idc58697c72fb00896bee00185fefc50c1a24dd35
Merged-In: Idc58697c72fb00896bee00185fefc50c1a24dd35
2020-08-07 05:40:26 +00:00
Peter Wang
51716751b9
[automerger skipped] Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" am: b6ff6f6c2c am: 4b6112a42c -s ours am: 86383582b4 -s ours am: a0988882c1 -s ours am: 3b7dd48ddb -s ours
...
am skip reason: Change-Id I7f3b1f5170e032336d9b39b322c49e2b92573586 with SHA-1 9487c9e513 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1260749
Change-Id: Ifc57a2934b10301dc50e448cf6603a211500acf9
2020-07-31 10:47:42 +00:00
Peter Wang
3b7dd48ddb
[automerger skipped] Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" am: b6ff6f6c2c am: 4b6112a42c -s ours am: 86383582b4 -s ours am: a0988882c1 -s ours
...
am skip reason: Change-Id I7f3b1f5170e032336d9b39b322c49e2b92573586 with SHA-1 ceba2adbbd is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1260749
Change-Id: Ic30f3dc44333a759d86920c5c9d8588d5142eec3
2020-07-31 10:18:58 +00:00
Peter Wang
a0988882c1
[automerger skipped] Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" am: b6ff6f6c2c am: 4b6112a42c -s ours am: 86383582b4 -s ours
...
am skip reason: Change-Id I7f3b1f5170e032336d9b39b322c49e2b92573586 with SHA-1 ceba2adbbd is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1260749
Change-Id: Ic15254afce6f13f0553faf9ec98fc16fe9563c81
2020-07-31 09:55:23 +00:00
Peter Wang
86383582b4
[automerger skipped] Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission" am: b6ff6f6c2c am: 4b6112a42c -s ours
...
am skip reason: Change-Id I7f3b1f5170e032336d9b39b322c49e2b92573586 with SHA-1 ceba2adbbd is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1260749
Change-Id: I1e06f6cdb0e69e06cf94a543eec83478dabeda14
2020-07-31 09:34:47 +00:00
Peter Wang
b6ff6f6c2c
Merge "[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and guard with permission"
2020-07-31 08:43:44 +00:00
Chiachang Wang
c7e9b25f7b
Merge "Update language to comply with Android's inclusive language guidance" am: ae5caa0013 am: 36a22f06b1 am: 1aafac2782 am: 38b7647244 am: 1012aaa906
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375618
Change-Id: Ib1c23f0a9758bdcf55d11ac67ff6ff54dc513066
2020-07-31 01:10:21 +00:00
Chiachang Wang
1012aaa906
Merge "Update language to comply with Android's inclusive language guidance" am: ae5caa0013 am: 36a22f06b1 am: 1aafac2782 am: 38b7647244
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375618
Change-Id: Ic73d5ae40bfe8e37bbe96b96d6975e305f4c849c
2020-07-31 00:24:20 +00:00
Chiachang Wang
38b7647244
Merge "Update language to comply with Android's inclusive language guidance" am: ae5caa0013 am: 36a22f06b1 am: 1aafac2782
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375618
Change-Id: Ib53b46257c7fec87c0da23832776133107f13e5d
2020-07-30 03:38:47 +00:00
Chiachang Wang
1aafac2782
Merge "Update language to comply with Android's inclusive language guidance" am: ae5caa0013 am: 36a22f06b1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1375618
Change-Id: I8426e89337e60c48ad20677e835d36622d41ed91
2020-07-30 03:17:44 +00:00
Chiachang Wang
ae5caa0013
Merge "Update language to comply with Android's inclusive language guidance"
2020-07-30 02:49:44 +00:00
Chiachang Wang
893335012c
Update language to comply with Android's inclusive language guidance
...
See https://source.android.com/setup/contribute/respectful-code
for reference.
Test: m ; atest TetheringTests
Bug: 161896447
Change-Id: Idc58697c72fb00896bee00185fefc50c1a24dd35
2020-07-29 12:05:04 +08:00
Junyu Lai
e6f715329b
Merge "Gracefully handle integer overflows." am: 0e0b61e92e am: aeddf47458 am: efbd79c600 am: 6ca6396bd7 am: 507cbe9859
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1316217
Change-Id: I7c04b66f75f64c214bd0c8d27bb5dbeda13094ce
2020-07-29 02:58:33 +00:00
Junyu Lai
507cbe9859
Merge "Gracefully handle integer overflows." am: 0e0b61e92e am: aeddf47458 am: efbd79c600 am: 6ca6396bd7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1316217
Change-Id: I86e762f63a2e18833dcebdae4921a24a18bbf01d
2020-07-29 02:41:38 +00:00
Junyu Lai
6ca6396bd7
Merge "Gracefully handle integer overflows." am: 0e0b61e92e am: aeddf47458 am: efbd79c600
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1316217
Change-Id: I9cde0d9e70b389b91bde9b3384f82887259c9c74
2020-07-29 02:14:58 +00:00
Junyu Lai
efbd79c600
Merge "Gracefully handle integer overflows." am: 0e0b61e92e am: aeddf47458
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1316217
Change-Id: I0bba17d0367ebf4e1c868a8cc7471366bc7a4408
2020-07-29 01:55:23 +00:00
Junyu Lai
0e0b61e92e
Merge "Gracefully handle integer overflows."
2020-07-29 01:19:07 +00:00
Chiachang Wang
0a9b92e0f7
Merge "Update language to comply with Android's inclusive language guidance" am: 2ad3ca40cb am: 55c0d6e638 am: 0defe35efb am: df7fb22e70 am: 25c0279ce1
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373160
Change-Id: Ideecaaaa12e82c5771e75d0c743228f6478e1ca3
2020-07-28 12:03:04 +00:00
Chiachang Wang
25c0279ce1
Merge "Update language to comply with Android's inclusive language guidance" am: 2ad3ca40cb am: 55c0d6e638 am: 0defe35efb am: df7fb22e70
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373160
Change-Id: I725e6a7b199837b673531fcc458f97a1e325ef56
2020-07-28 11:46:59 +00:00
Chiachang Wang
df7fb22e70
Merge "Update language to comply with Android's inclusive language guidance" am: 2ad3ca40cb am: 55c0d6e638 am: 0defe35efb
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373160
Change-Id: I2efddd398c4d7cf4d65f1c76c399a3a07a843889
2020-07-28 11:31:06 +00:00
Chiachang Wang
0defe35efb
Merge "Update language to comply with Android's inclusive language guidance" am: 2ad3ca40cb am: 55c0d6e638
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373160
Change-Id: I9318abb0233e7b8847466914724eeaae769ea9c8
2020-07-28 11:19:47 +00:00
Chiachang Wang
2ad3ca40cb
Merge "Update language to comply with Android's inclusive language guidance"
2020-07-28 10:51:53 +00:00
Chiachang Wang
06defe000d
Update language to comply with Android's inclusive language guidance
...
See https://source.android.com/setup/contribute/respectful-code
for reference.
Bug: 161896447
Test: m
Change-Id: I6c3c03c0c2d1302af6d5245486823c13a3432900
2020-07-28 15:36:30 +08:00
Pavan Kumar M
fc5b6cb326
Gracefully handle integer overflows.
...
Avoid recording negative data by doing integer-based
math as much as possible, but switch to double-based
math if we detect that we'd end up causing an overflow.
Test :
- Builds, Boots
- High data throughput scenarios
- NetworkStatsHistoryTest, NetworkStatsCollectionTest,
NetworkStatsTest
Bug: 119527458
Change-Id: I55d4aa649bea3ae201ad513074ff2b71cb918dad
2020-07-28 11:36:49 +05:30
android-build-team Robot
83ab94e48d
Snap for 6690197 from 3affbe4d9f964d5ac060e265f331cafe2a4798a9 to rvc-release
...
Change-Id: Iff50afbc6d986908a3a16c7c79d1c8aa9a7af3ce
2020-07-18 01:02:10 +00:00
Aaron Huang
9973770e6b
Merge "Remove ProxyInfo(String) and update callers to use ProxyInfo(Uri)" am: 28ced6a6ca am: 251d68487e am: b841abe371 am: 8bb88d4126 am: d6079e5033
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1146757
Change-Id: I7965efe61d17ad96d1ff409b57c126e3c8f7fc78
2020-07-17 06:49:40 +00:00
Aaron Huang
d6079e5033
Merge "Remove ProxyInfo(String) and update callers to use ProxyInfo(Uri)" am: 28ced6a6ca am: 251d68487e am: b841abe371 am: 8bb88d4126
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1146757
Change-Id: Ifd73e18235961e33b61331753193bbdc2646b7a4
2020-07-17 06:30:55 +00:00
Aaron Huang
8bb88d4126
Merge "Remove ProxyInfo(String) and update callers to use ProxyInfo(Uri)" am: 28ced6a6ca am: 251d68487e am: b841abe371
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1146757
Change-Id: I9d141616f0efb16874488489f5c382a5eb7f6048
2020-07-17 06:18:09 +00:00
Aaron Huang
b841abe371
Merge "Remove ProxyInfo(String) and update callers to use ProxyInfo(Uri)" am: 28ced6a6ca am: 251d68487e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1146757
Change-Id: If60a348768c507153c1a9038953b2f6c29fc8f03
2020-07-17 06:05:38 +00:00
Aaron Huang
28ced6a6ca
Merge "Remove ProxyInfo(String) and update callers to use ProxyInfo(Uri)"
2020-07-17 05:40:31 +00:00
Automerger Merge Worker
22545cae12
[automerger skipped] Merge changes from topic "am-79f86a8dcf76422daca2ee482cf222f3" into rvc-d1-dev-plus-aosp am: ef3cbbc2c9 -s ours am: fe1031dc9a -s ours
...
am skip reason: Change-Id I7d98ab425852ffa064c68f5dc50bd1f5a4a49ab9 with SHA-1 472144c35a is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12166028
Change-Id: I8d7e1601bb3d0943d0da103e1568cb31e5129ef4
2020-07-17 04:50:16 +00:00