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
Automerger Merge Worker
0762b246aa
[automerger skipped] Merge changes from topic "am-3081ec444acb4d69974a1b8546d081d1" into rvc-qpr-dev-plus-aosp am: a67709873c -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: I0b1cd2d835c74dd9dcbfc636a61960d7783350f7
2020-07-17 04:50:02 +00:00
junyulai
68f52bc400
[automerger skipped] Attribute data usage to virtual RAT type for 5G non-standalone mode am: fba76f64a6 -s ours am: db8c524876 -s ours am: 6539daafc1 -s ours am: 57fe8da28e -s ours
...
am skip reason: Change-Id I8753e68140c0993773017c9a49bd8a666a364071 with SHA-1 c7af656fa2 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12166464
Change-Id: I79d8719de8a7550a0b4666b3864b565342d06944
2020-07-17 04:49:20 +00:00
Automerger Merge Worker
fe1031dc9a
[automerger skipped] Merge changes from topic "am-79f86a8dcf76422daca2ee482cf222f3" into rvc-d1-dev-plus-aosp am: ef3cbbc2c9 -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: I05486888bbb04e45be7978dc4fdd0ae8adca3f04
2020-07-17 04:33:12 +00:00
Automerger Merge Worker
a67709873c
Merge changes from topic "am-3081ec444acb4d69974a1b8546d081d1" into rvc-qpr-dev-plus-aosp
...
* changes:
Merge changes I7d98ab42,I8753e681 into rvc-dev am: 7368ed7d03 am: 8c4224a070 am: 2909a2ae8f
[automerger skipped] Attribute data usage to virtual RAT type for 5G non-standalone mode am: fba76f64a6 am: 2537d34c56 am: fe9d1d5eb1 -s ours
2020-07-17 04:33:09 +00:00
junyulai
646515fcd6
[automerger skipped] Attribute data usage to virtual RAT type for 5G non-standalone mode am: fba76f64a6 am: 2537d34c56 am: fe9d1d5eb1 -s ours
...
am skip reason: Change-Id I8753e68140c0993773017c9a49bd8a666a364071 with SHA-1 3e1d718c12 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12166464
Change-Id: I7c339c9ddebf1f2c3b9fdb61fa728006f1017728
2020-07-17 04:32:43 +00:00
junyulai
57fe8da28e
[automerger skipped] Attribute data usage to virtual RAT type for 5G non-standalone mode am: fba76f64a6 -s ours am: db8c524876 -s ours am: 6539daafc1 -s ours
...
am skip reason: Change-Id I8753e68140c0993773017c9a49bd8a666a364071 with SHA-1 3e1d718c12 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12166464
Change-Id: Ic05abb50b8115e619ca60b42c8de31d0a9a3369f
2020-07-17 04:32:41 +00:00
Automerger Merge Worker
ef3cbbc2c9
Merge changes from topic "am-79f86a8dcf76422daca2ee482cf222f3" into rvc-d1-dev-plus-aosp
...
* changes:
Merge changes I7d98ab42,I8753e681 into rvc-dev am: 7368ed7d03 am: 8c4224a070
[automerger skipped] Attribute data usage to virtual RAT type for 5G non-standalone mode am: fba76f64a6 am: 2537d34c56 -s ours
2020-07-17 04:19:57 +00:00
junyulai
6539daafc1
[automerger skipped] Attribute data usage to virtual RAT type for 5G non-standalone mode am: fba76f64a6 -s ours am: db8c524876 -s ours
...
am skip reason: Change-Id I8753e68140c0993773017c9a49bd8a666a364071 with SHA-1 3e1d718c12 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12166464
Change-Id: I02095d84ee19167ca7e254e977e1e38ba7ba87f0
2020-07-17 04:19:45 +00:00
junyulai
e145b12398
[automerger skipped] Attribute data usage to virtual RAT type for 5G non-standalone mode am: fba76f64a6 am: 2537d34c56 -s ours
...
am skip reason: Change-Id I8753e68140c0993773017c9a49bd8a666a364071 with SHA-1 3e1d718c12 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12166464
Change-Id: I5e06da5cbb80d02e8d216d63c9c9c0f96a11fc6c
2020-07-17 04:19:23 +00:00
junyulai
0e8ab53d8f
Attribute data usage to virtual RAT type for 5G non-standalone mode am: fba76f64a6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12166464
Change-Id: Ied7f50c7aa2ef5f1bf7cf36381a8b76cb00b3e16
2020-07-17 04:03:35 +00:00
junyulai
db8c524876
[automerger skipped] Attribute data usage to virtual RAT type for 5G non-standalone mode am: fba76f64a6 -s ours
...
am skip reason: Change-Id I8753e68140c0993773017c9a49bd8a666a364071 with SHA-1 3e1d718c12 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12166464
Change-Id: I7e48e1b94107d84a1b828b005437ad2e24a92850
2020-07-17 04:03:35 +00:00
junyulai
2537d34c56
Attribute data usage to virtual RAT type for 5G non-standalone mode am: fba76f64a6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12166464
Change-Id: I77a3455318db44cf28ca4cfddf86a9767efe6302
2020-07-17 04:03:07 +00:00
Treehugger Robot
94f205546a
[automerger skipped] Merge "Attribute data usage to virtual RAT type for 5G non-standalone mode" am: e36ce3a88b am: 416911a122 am: 747d3fd8b5 am: eb4b975f38 am: 977bef2f2a -s ours
...
am skip reason: Change-Id I8753e68140c0993773017c9a49bd8a666a364071 with SHA-1 c7af656fa2 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1364497
Change-Id: I46ebe986b4bb88e021166d83788ec9926c358e4d
2020-07-16 12:55:18 +00:00
Treehugger Robot
977bef2f2a
Merge "Attribute data usage to virtual RAT type for 5G non-standalone mode" am: e36ce3a88b am: 416911a122 am: 747d3fd8b5 am: eb4b975f38
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1364497
Change-Id: Iee2d99fa2288d026a7bda193ade2105d5a5b8454
2020-07-16 12:38:22 +00:00
Treehugger Robot
eb4b975f38
Merge "Attribute data usage to virtual RAT type for 5G non-standalone mode" am: e36ce3a88b am: 416911a122 am: 747d3fd8b5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1364497
Change-Id: I828f3f4f4f81d9a43c403d0a6a6b6f4e2bc1b654
2020-07-16 12:21:14 +00:00
Treehugger Robot
747d3fd8b5
Merge "Attribute data usage to virtual RAT type for 5G non-standalone mode" am: e36ce3a88b am: 416911a122
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1364497
Change-Id: Idef0dd6e0e0486b76c0067540e580d444e97d6a0
2020-07-16 12:09:04 +00:00
Treehugger Robot
e36ce3a88b
Merge "Attribute data usage to virtual RAT type for 5G non-standalone mode"
2020-07-16 11:43:51 +00:00
junyulai
3e1d718c12
Attribute data usage to virtual RAT type for 5G non-standalone mode
...
Test: atest NetworkStatsSubscriptionsMonitorTest#test5g
Bug: 160727498
Change-Id: I8753e68140c0993773017c9a49bd8a666a364071
Merged-In: I8753e68140c0993773017c9a49bd8a666a364071
(cherry-picked from ag/12167624)
2020-07-16 18:22:09 +08:00
Peter Wang
171598cb7c
[Telephony Mainline] Rename getActiveAndHiddenSubscriptionIdList and
...
guard with permission
Bug: 150878235
Fix: 150878235
Test: Build
Change-Id: I7f3b1f5170e032336d9b39b322c49e2b92573586
Merged-In: I7f3b1f5170e032336d9b39b322c49e2b92573586
2020-07-16 02:01:06 -07:00
junyulai
fba76f64a6
Attribute data usage to virtual RAT type for 5G non-standalone mode
...
Test: atest NetworkStatsSubscriptionsMonitorTest#test5g
Bug: 160727498
Change-Id: I8753e68140c0993773017c9a49bd8a666a364071
Merged-In: I8753e68140c0993773017c9a49bd8a666a364071
(cherry-picked from ag/12167624)
2020-07-16 15:33:35 +08:00
junyulai
c7af656fa2
Attribute data usage to virtual RAT type for 5G non-standalone mode
...
Test: atest NetworkStatsSubscriptionsMonitorTest#test5g
Bug: 160727498
Change-Id: I8753e68140c0993773017c9a49bd8a666a364071
2020-07-16 15:32:01 +08:00