Junyu Lai
|
93feaa875e
|
Merge "[MS59.1] Add NetworkStatsDataMigrationUtils" am: c428b10a74 am: a5beb8b8f9 am: b7a3ae056c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1951480
Change-Id: Iebc807ae214159ec696a2ebbb037bbe7234f9e88
|
2022-01-27 09:46:12 +00:00 |
|
Frank Li
|
5411bbaff7
|
Merge "[DU10]Fix the NetworkCycleDataForUidLoaderTest error" am: 8f5f7a2230 am: 6664edbb78 am: 10cfac9d98
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1958910
Change-Id: Ia6010bba3522bd74995b97c05f81a582007ebf32
|
2022-01-27 09:45:52 +00:00 |
|
Frank Li
|
7f9026f84f
|
Merge "[MS48.5]Remove INetworkStatsSession from SummaryForAllUidLoader" am: 2c1d4eec79 am: af700e251f am: a97de322c8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1960184
Change-Id: I85fc63a47dc06878d96076ec980c6fdec607eded
|
2022-01-27 09:45:20 +00:00 |
|
Frank Li
|
e84c0fe190
|
Merge "[MS48.1] Remove INetworkStatsSession from ChartDataLoader" am: 9be1e260e8 am: 959a2cdef3 am: e54384c15d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1960183
Change-Id: Ic95ef8ab0267698c117ff845d3d9e9e931f172a8
|
2022-01-27 09:45:15 +00:00 |
|
Junyu Lai
|
b7a3ae056c
|
Merge "[MS59.1] Add NetworkStatsDataMigrationUtils" am: c428b10a74 am: a5beb8b8f9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1951480
Change-Id: I89721eb546340b66537c794f121da0cf96faad3b
|
2022-01-27 09:24:10 +00:00 |
|
Frank Li
|
10cfac9d98
|
Merge "[DU10]Fix the NetworkCycleDataForUidLoaderTest error" am: 8f5f7a2230 am: 6664edbb78
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1958910
Change-Id: Ic6553cf5866fe5633b88d7284857a2cbb2b56a68
|
2022-01-27 09:23:57 +00:00 |
|
Junyu Lai
|
a5beb8b8f9
|
Merge "[MS59.1] Add NetworkStatsDataMigrationUtils" am: c428b10a74
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1951480
Change-Id: I17ff031dbaccd0a6804aa28a65d4e5befd82fc21
|
2022-01-27 09:23:50 +00:00 |
|
Frank Li
|
a97de322c8
|
Merge "[MS48.5]Remove INetworkStatsSession from SummaryForAllUidLoader" am: 2c1d4eec79 am: af700e251f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1960184
Change-Id: I414674d0f8973702fee6f33c4242f6d93b78eb84
|
2022-01-27 09:23:38 +00:00 |
|
Frank Li
|
e54384c15d
|
Merge "[MS48.1] Remove INetworkStatsSession from ChartDataLoader" am: 9be1e260e8 am: 959a2cdef3
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1960183
Change-Id: I4872d0a40f534cfa860ff83712a5a7d3fde26607
|
2022-01-27 09:23:36 +00:00 |
|
Frank Li
|
6664edbb78
|
Merge "[DU10]Fix the NetworkCycleDataForUidLoaderTest error" am: 8f5f7a2230
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1958910
Change-Id: I425ae135e4b10366b328fee9ef13c40464f96c58
|
2022-01-27 09:23:17 +00:00 |
|
Junyu Lai
|
c428b10a74
|
Merge "[MS59.1] Add NetworkStatsDataMigrationUtils"
|
2022-01-27 09:20:10 +00:00 |
|
Aaron Huang
|
4cba369177
|
Merge "Move the implement of getAllCollapsedRatTypes to StatsPullAtomService" am: e48ca58c47 am: 828ae80219 am: f82b4fe8a7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1960191
Change-Id: I74cd4f4fe80a76fb1d946dbab5e8394832801ff8
|
2022-01-27 09:16:42 +00:00 |
|
Aaron Huang
|
1094eb2150
|
Merge "Move NETWORK_TYPE_5G_NSA from NetworkTemplate to NetworkStatsManager" am: 75ed57cd6a am: f8abec4fa5 am: e7000b64f9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1960190
Change-Id: I5b64463059b94ef80b9eea3354ce1556f7fb015f
|
2022-01-27 09:16:19 +00:00 |
|
Aaron Huang
|
c39849d986
|
Merge "Remove NetworkStats hidden API dependencies from StatsPullAtomService" am: 3f9910630b am: 9570d3f1fa am: 16856ba3fd
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1960189
Change-Id: I84f5802554e0120873e6cfc6c9383569f38b26a5
|
2022-01-27 09:15:35 +00:00 |
|
Treehugger Robot
|
c736d8d0d5
|
Merge "Revert "CTS of CtsMediaTestCases#android.media.cts.DecodeAccuracyTest may fail when video is cropped."" am: fbc849e9d8 am: 423a67e7aa am: 611cfb5d99
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1959133
Change-Id: Ib402c8fd0804fa21b33c6c96b34acefac309152c
|
2022-01-27 09:14:52 +00:00 |
|
Frank Li
|
8f5f7a2230
|
Merge "[DU10]Fix the NetworkCycleDataForUidLoaderTest error"
|
2022-01-27 09:01:57 +00:00 |
|
Frank Li
|
af700e251f
|
Merge "[MS48.5]Remove INetworkStatsSession from SummaryForAllUidLoader" am: 2c1d4eec79
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1960184
Change-Id: I2fa85e7ec6dceceef2dd60216bc17c15cda259a2
|
2022-01-27 09:01:14 +00:00 |
|
Frank Li
|
959a2cdef3
|
Merge "[MS48.1] Remove INetworkStatsSession from ChartDataLoader" am: 9be1e260e8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1960183
Change-Id: I5cd8114661789db7605f773c20565eb85e85963e
|
2022-01-27 09:01:12 +00:00 |
|
Aaron Huang
|
f82b4fe8a7
|
Merge "Move the implement of getAllCollapsedRatTypes to StatsPullAtomService" am: e48ca58c47 am: 828ae80219
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1960191
Change-Id: I64ca07c3389881908156ad27d12967367ffb7ab3
|
2022-01-27 08:59:17 +00:00 |
|
Aaron Huang
|
e7000b64f9
|
Merge "Move NETWORK_TYPE_5G_NSA from NetworkTemplate to NetworkStatsManager" am: 75ed57cd6a am: f8abec4fa5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1960190
Change-Id: Icce4e92c3878ebbcb7db1f4f74f6427cda7c57c4
|
2022-01-27 08:59:03 +00:00 |
|
Aaron Huang
|
16856ba3fd
|
Merge "Remove NetworkStats hidden API dependencies from StatsPullAtomService" am: 3f9910630b am: 9570d3f1fa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1960189
Change-Id: Iaf6cf9ad3c148ac2bd46de6cf4e2f755320c1efb
|
2022-01-27 08:58:45 +00:00 |
|
Treehugger Robot
|
611cfb5d99
|
Merge "Revert "CTS of CtsMediaTestCases#android.media.cts.DecodeAccuracyTest may fail when video is cropped."" am: fbc849e9d8 am: 423a67e7aa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1959133
Change-Id: I424622d3590d3d48bad323ea19c7806a945e44f5
|
2022-01-27 08:58:27 +00:00 |
|
Frank Li
|
2c1d4eec79
|
Merge "[MS48.5]Remove INetworkStatsSession from SummaryForAllUidLoader"
|
2022-01-27 08:47:55 +00:00 |
|
Frank Li
|
9be1e260e8
|
Merge "[MS48.1] Remove INetworkStatsSession from ChartDataLoader"
|
2022-01-27 08:47:55 +00:00 |
|
Aaron Huang
|
828ae80219
|
Merge "Move the implement of getAllCollapsedRatTypes to StatsPullAtomService" am: e48ca58c47
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1960191
Change-Id: Icc2791ae469ad719adbf9d043b2c5cebba0e1875
|
2022-01-27 08:40:56 +00:00 |
|
Aaron Huang
|
f8abec4fa5
|
Merge "Move NETWORK_TYPE_5G_NSA from NetworkTemplate to NetworkStatsManager" am: 75ed57cd6a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1960190
Change-Id: I7d52026836bdabb907a81b097a4c51d5bd8dcd3f
|
2022-01-27 08:40:35 +00:00 |
|
Aaron Huang
|
9570d3f1fa
|
Merge "Remove NetworkStats hidden API dependencies from StatsPullAtomService" am: 3f9910630b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1960189
Change-Id: Ia31902f251590d6f01e66229bce9d437cdbce983
|
2022-01-27 08:39:59 +00:00 |
|
Treehugger Robot
|
423a67e7aa
|
Merge "Revert "CTS of CtsMediaTestCases#android.media.cts.DecodeAccuracyTest may fail when video is cropped."" am: fbc849e9d8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1959133
Change-Id: I90ebd5e6b70067dff57aab16ad88c4cc0983ece6
|
2022-01-27 08:39:39 +00:00 |
|
Aaron Huang
|
e48ca58c47
|
Merge "Move the implement of getAllCollapsedRatTypes to StatsPullAtomService"
|
2022-01-27 08:37:00 +00:00 |
|
Aaron Huang
|
75ed57cd6a
|
Merge "Move NETWORK_TYPE_5G_NSA from NetworkTemplate to NetworkStatsManager"
|
2022-01-27 08:36:23 +00:00 |
|
Aaron Huang
|
3f9910630b
|
Merge "Remove NetworkStats hidden API dependencies from StatsPullAtomService"
|
2022-01-27 08:35:03 +00:00 |
|
Treehugger Robot
|
fbc849e9d8
|
Merge "Revert "CTS of CtsMediaTestCases#android.media.cts.DecodeAccuracyTest may fail when video is cropped.""
|
2022-01-27 08:25:30 +00:00 |
|
Rahul Sabnis
|
bdd60d42cb
|
Merge "Moving over core/api/*txt files" am: d93ed0045d am: d2c48ad201 am: b5f6cf1c8d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1959811
Change-Id: I9321785d49fa39c96b17a60f20b2bed42279f4ed
|
2022-01-27 06:19:21 +00:00 |
|
Rahul Sabnis
|
b5f6cf1c8d
|
Merge "Moving over core/api/*txt files" am: d93ed0045d am: d2c48ad201
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1959811
Change-Id: I5a83a5def064d09a34d62460afa0ef3c5cc424b4
|
2022-01-27 06:13:56 +00:00 |
|
TreeHugger Robot
|
682e0ad84c
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4a3fbd5851 -s ours am: 8157eb692a -s ours am: e37bdf522a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16721669
Change-Id: I286ea27a025615e2055f29a3ae6bc97344a55b03
|
2022-01-27 06:12:56 +00:00 |
|
TreeHugger Robot
|
b8de9a7076
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0a0426bd40 -s ours am: abcd4d286b -s ours am: 19b15bb6c6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16720774
Change-Id: Ie37bce1572b954f4ce86371a1a0bcf3c73433f27
|
2022-01-27 06:12:43 +00:00 |
|
TreeHugger Robot
|
45f8b94c2e
|
Merge changes from topic "presubmit-am-e4978075937f4e43aa46e37caf0dc425" into sc-qpr1-dev am: 9a1f59b4c8 am: 8af870eb95
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16721669
Change-Id: I23e8481b05a9f339c152afeb244f8e8ba5198245
|
2022-01-27 06:12:23 +00:00 |
|
Bill Yi
|
8f51088429
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e82ce9fd51 am: 36fd687019 -s ours am: 36ae9fe4c4 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16721669
Change-Id: Ie4364022c85d0216011e319ce9dd01e7172e2baf
|
2022-01-27 06:12:18 +00:00 |
|
TreeHugger Robot
|
2a93b2457a
|
Merge changes from topic "presubmit-am-1bdc6596abc94ed48e398e34bf8604a6" into sc-qpr1-dev am: 723b27a11d am: abea7d38ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16720774
Change-Id: Ia392960312f8b985d46c7d89f0b9f27b3f27896d
|
2022-01-27 06:11:54 +00:00 |
|
Bill Yi
|
87ce69a96b
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 438f56d10c am: eb5ecbde7a -s ours am: dc56ec8286 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16720774
Change-Id: Icec8679048aac79479e2a3b46afcc48affc1be6d
|
2022-01-27 06:11:48 +00:00 |
|
TreeHugger Robot
|
f9f5a326b9
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4a3fbd5851 -s ours am: 8157eb692a -s ours am: 5f7e78f674 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16721669
Change-Id: I6f072a9cf6482350839f1bbdac97710696e2df90
|
2022-01-27 06:08:11 +00:00 |
|
TreeHugger Robot
|
264041668a
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0a0426bd40 -s ours am: abcd4d286b -s ours am: df1768460c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16720774
Change-Id: Ibaec25b5ddb3f03234bde42c4cd16af0b4964107
|
2022-01-27 06:08:00 +00:00 |
|
TreeHugger Robot
|
79e58c9794
|
Merge changes from topic "presubmit-am-e4978075937f4e43aa46e37caf0dc425" into sc-qpr1-dev am: 9a1f59b4c8 am: 03451e6ea6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16721669
Change-Id: I7a7e457f2410cc84917dc7c8483b07b0ea34942d
|
2022-01-27 06:07:30 +00:00 |
|
Bill Yi
|
23a394d1a4
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e82ce9fd51 am: 36fd687019 -s ours am: f347ed0355 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16721669
Change-Id: If8281deec5a2a309d6a2de0ac95882480cfba898
|
2022-01-27 06:07:14 +00:00 |
|
TreeHugger Robot
|
d77ce78a76
|
Merge changes from topic "presubmit-am-1bdc6596abc94ed48e398e34bf8604a6" into sc-qpr1-dev am: 723b27a11d am: b7704ac989
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16720774
Change-Id: If103e38e1d669b4cd1c94194c3fd647c83479666
|
2022-01-27 06:06:50 +00:00 |
|
Bill Yi
|
c8d98d3fa3
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 438f56d10c am: eb5ecbde7a -s ours am: 417389f30c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16720774
Change-Id: I258853f7fb75770febb6842bb493eee1f0d06712
|
2022-01-27 06:06:43 +00:00 |
|
Rahul Sabnis
|
d2c48ad201
|
Merge "Moving over core/api/*txt files" am: d93ed0045d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1959811
Change-Id: Icff53d4b28aa6001ba2127a0c8d047954f61aa27
|
2022-01-27 05:58:33 +00:00 |
|
TreeHugger Robot
|
e37bdf522a
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4a3fbd5851 -s ours am: 8157eb692a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16721669
Change-Id: If0e6dc233b3a3e480b65631f230f02f2a8ab80cc
|
2022-01-27 05:56:45 +00:00 |
|
TreeHugger Robot
|
19b15bb6c6
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0a0426bd40 -s ours am: abcd4d286b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16720774
Change-Id: I807443ef15d7000a5131597a519f8c06c8340fdf
|
2022-01-27 05:56:28 +00:00 |
|
TreeHugger Robot
|
5f7e78f674
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4a3fbd5851 -s ours am: 8157eb692a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16721669
Change-Id: Ic5b9ae66911048f24597f5ddd2598674d7bd2259
|
2022-01-27 05:56:12 +00:00 |
|