Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
663,613 Commits 3 Branches 0 Tags
a97de322c8a8aa68e6299a95caae1a7da7ae1b73
Commit Graph

663613 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
8af870eb95 Merge changes from topic "presubmit-am-e4978075937f4e43aa46e37caf0dc425" into sc-qpr1-dev am: 9a1f59b4c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16721669

Change-Id: Ib42516f168fc720e753d13288d7953eded8d773b
 2022-01-27 05:56:08 +00:00
Bill Yi
36ae9fe4c4 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e82ce9fd51 am: 36fd687019 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I88784eeada393cd2bf4885e786669f1c0bf1031a
 2022-01-27 05:56:01 +00:00
TreeHugger Robot
8157eb692a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4a3fbd5851 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4a5b40ddb71a7fed7b97fdb15660acf7d65f8c0b
 2022-01-27 05:55:33 +00:00
TreeHugger Robot
abea7d38ab Merge changes from topic "presubmit-am-1bdc6596abc94ed48e398e34bf8604a6" into sc-qpr1-dev am: 723b27a11d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16720774

Change-Id: Idb497c3f013db8d7e16eb537930142e730051102
 2022-01-27 05:55:30 +00:00
Bill Yi
dc56ec8286 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 438f56d10c am: eb5ecbde7a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I755f19696a31505efa1d3dd5ec845955ad2baa16
 2022-01-27 05:55:23 +00:00
TreeHugger Robot
abcd4d286b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0a0426bd40 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If4dfbe72ecd50a2931b668b2996f39fa9a172906
 2022-01-27 05:55:20 +00:00
Rahul Sabnis
d93ed0045d Merge "Moving over core/api/*txt files" 2022-01-27 05:42:18 +00:00
TreeHugger Robot
9a1f59b4c8 Merge changes from topic "presubmit-am-e4978075937f4e43aa46e37caf0dc425" into sc-qpr1-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: e82ce9fd51
  Import translations. DO NOT MERGE ANYWHERE
 2022-01-27 05:41:32 +00:00
TreeHugger Robot
4a3fbd5851 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2022-01-27 05:41:32 +00:00
TreeHugger Robot
723b27a11d Merge changes from topic "presubmit-am-1bdc6596abc94ed48e398e34bf8604a6" into sc-qpr1-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 438f56d10c
  Import translations. DO NOT MERGE ANYWHERE
 2022-01-27 05:36:41 +00:00
TreeHugger Robot
0a0426bd40 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2022-01-27 05:36:41 +00:00
TreeHugger Robot
57e7eba08f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: efbb02e704 -s ours am: d484686e58 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I10b2cd61053aec97a4b420101a77bfba4baeebcf
 2022-01-27 04:55:09 +00:00
Frank Li
9b2173796b Merge "[DU11]Remove NetworkStats hiddden API dependencies" am: dc23434bd5 am: 09b42ebd3c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1958915

Change-Id: Ieddbdc2faa69face2fbfc0a332d2696cda895402
 2022-01-27 04:53:58 +00:00
TreeHugger Robot
d484686e58 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: efbb02e704 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic05909045ffc11ff7a185a6d8eeecf32e9637fd9
 2022-01-27 04:42:14 +00:00
Frank Li
09b42ebd3c Merge "[DU11]Remove NetworkStats hiddden API dependencies" am: dc23434bd5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1958915

Change-Id: Ic818de9de5e0e8ea67848df9e2d247d671a09194
 2022-01-27 04:41:26 +00:00
TreeHugger Robot
d0b3871438 Merge changes from topic "presubmit-am-aa055fd7a8a84c0ebcfface10787a9e8" into sc-qpr1-dev am: d9bacad89c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16722530

Change-Id: I233fe2354e1a64ac65a87d313c103d1ba77072fb
 2022-01-27 04:38:00 +00:00
Bill Yi
29ef9c8f77 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d6e4af674a am: 4289a15ed3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4d1f6fb3cb7c59e0874a8e448d03ed315c49db77
 2022-01-27 04:37:55 +00:00
TreeHugger Robot
577390f759 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 871aa4262f -s ours am: c40725a57b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic5dce643cbc864e6755dbf1e4886958ed53c1ee1
 2022-01-27 04:37:42 +00:00
TreeHugger Robot
efbb02e704 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2022-01-27 04:37:35 +00:00
TreeHugger Robot
d9bacad89c Merge changes from topic "presubmit-am-aa055fd7a8a84c0ebcfface10787a9e8" into sc-qpr1-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d6e4af674a
  Import translations. DO NOT MERGE ANYWHERE
 2022-01-27 04:37:35 +00:00
TreeHugger Robot
b6619256ae Merge changes from topic "presubmit-am-f3c9c8d2f3cc42109908dbad1153c587" into sc-qpr1-dev am: 7dc62fe70a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16722344

Change-Id: If31366efe8c05be3fae2e242bbcedfb900844527
 2022-01-27 04:37:28 +00:00
Bill Yi
630d6c68e2 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 9829ca31f5 am: 2f020d6eda -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2a71aab77fd722b98f804580854b5d63f22092cd
 2022-01-27 04:37:22 +00:00
TreeHugger Robot
c40725a57b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 871aa4262f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0eda2926fffdb66f3c6376a7240eca03071c402b
 2022-01-27 04:37:06 +00:00
Frank Li
dc23434bd5 Merge "[DU11]Remove NetworkStats hiddden API dependencies" 2022-01-27 04:27:41 +00:00
Aaron Huang
c9be32e9f1 Move the implement of getAllCollapsedRatTypes to StatsPullAtomService 
To make data usage as a mainline module, move getAllCollapsedRatTypes
to StatsPullAtomService since currently it is the only user. Also, the
method needs to call getCollapsedRatType, thus move getCollapsedRatType
to NetworkStatsManager and expose it as module API.

Bug: 210073043
Test: builds, FrameworksNetTests
Change-Id: Ibe41b50f173464694c21dd22841552bdb69a6a14
 2022-01-27 12:27:20 +08:00
Aaron Huang
de58e7cea5 Move NETWORK_TYPE_5G_NSA from NetworkTemplate to NetworkStatsManager 
Move NETWORK_TYPE_5G_NSA to NetworkStatsManager. Also expose it as
module API so that it can be used out of module.

Bug: 210073043
Test: builds, FrameworksNetTests
Change-Id: I670c7e1405107bbe30b92fe1a8d81652c46de6d9
 2022-01-27 12:23:56 +08:00
TreeHugger Robot
871aa4262f Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2022-01-27 04:17:11 +00:00
TreeHugger Robot
7dc62fe70a Merge changes from topic "presubmit-am-f3c9c8d2f3cc42109908dbad1153c587" into sc-qpr1-dev 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 9829ca31f5
  Import translations. DO NOT MERGE ANYWHERE
 2022-01-27 04:17:11 +00:00