Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
565,194 Commits 3 Branches 0 Tags
a2611c00ca69fac6366aeaa2dbd56bbfc517657e
Commit Graph

565194 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
a2611c00ca Merge "Use Log instead of Slog in QosCallbackAgentConnection" am: c0b0157d3e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614020

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d5362567ab4c9f510582261ef365edfaabceaf5
 2021-03-04 03:01:11 +00:00
Treehugger Robot
c0b0157d3e Merge "Use Log instead of Slog in QosCallbackAgentConnection" 2021-03-04 02:58:37 +00:00
Treehugger Robot
eeb8bba5f4 Merge "Address comments on aosp/1612040." am: e486d38855 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1613962

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id3ad9eb4cf16d37cddfaece70b4f72755fd4e3a2
 2021-03-04 02:56:42 +00:00
Frank Li
8e7a1b38d9 Merge "[CS05]Remove the hidden API usage of MetricsLogger" am: 9e79e9d99a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612039

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8de53ff3755ae4f15bdaf1b4f6dbd1850e99ed94
 2021-03-04 02:52:52 +00:00
Junyu Lai
013ae86f00 Merge "[FUI19] Migrate ConnectivityService to use NetworkStatsManager" am: 7563c45083 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1560408

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I90895f9109aaa2fbe8d76b1b7904dff9d09cb512
 2021-03-04 02:42:52 +00:00
Treehugger Robot
e486d38855 Merge "Address comments on aosp/1612040." 2021-03-04 02:04:36 +00:00
Frank Li
9e79e9d99a Merge "[CS05]Remove the hidden API usage of MetricsLogger" 2021-03-04 01:34:53 +00:00
Junyu Lai
7563c45083 Merge "[FUI19] Migrate ConnectivityService to use NetworkStatsManager" 2021-03-04 01:24:57 +00:00
Ruslan Tkhakokhov
8192a10e2f Merge "Add B&R as owners for LocalTransport package" am: 48054e5cf4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614520

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifbfc000453326a385280360b459a4d0a7c54ce51
 2021-03-03 23:53:07 +00:00
Ruslan Tkhakokhov
48054e5cf4 Merge "Add B&R as owners for LocalTransport package" 2021-03-03 23:39:40 +00:00
Haibo Huang
14fff93b3f Merge "[bit] Use new jsoncpp API" am: c8379556c0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607474

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ided8274dc9cb5a63e7ab04f0612a3b04a2214c90
 2021-03-03 22:45:23 +00:00
Sunil Ravi
3cbc44875c Merge "WiFi: Define permissions for set/clear country code API" am: bb57bf925a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1590279

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idb91cb3a25d9badbde16825742615c23c4fa9888
 2021-03-03 22:41:05 +00:00
Xin Li
065dbb1c6b [automerger skipped] Merge "Merge RQ2A.210305.007" am: 1af6a12e98 -s ours 
am skip reason: Change-Id I2958205678f4340e96ce6e845718e994a0231afc with SHA-1 9882ff4bf8 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I05ab53a6a483b8e4dbe40afe6dab40e2b7d328ea
 2021-03-03 22:35:44 +00:00
Haibo Huang
c8379556c0 Merge "[bit] Use new jsoncpp API" 2021-03-03 22:34:58 +00:00
Haibo Huang
39f4db5ea0 [bit] Use new jsoncpp API 
Reader / StyledWriter are deprecated upstream

Bug: 170642246
Change-Id: Ia2dcd3a817209e6821ecdd7c7f8094ec74bae44a
 2021-03-03 22:17:10 +00:00
Jeff Sharkey
df5a88ea6d Merge "Add OWNERS file for UsageStats unit tests." am: eeb577dc44 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614160

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iac20f909ac2c97120853dcfeeb701361d8ae9c36
 2021-03-03 22:01:26 +00:00
Sunil Ravi
bb57bf925a Merge "WiFi: Define permissions for set/clear country code API" 2021-03-03 21:50:21 +00:00
Xin Li
1af6a12e98 Merge "Merge RQ2A.210305.007" 2021-03-03 21:41:39 +00:00
Jeff Sharkey
eeb577dc44 Merge "Add OWNERS file for UsageStats unit tests." 2021-03-03 21:32:24 +00:00
Ruslan Tkhakokhov
8a535c3c9b Add B&R as owners for LocalTransport package 
The package is primarily used and maintained by B&R.

Bug: n/a
Test: n/a
Change-Id: I207b1f78c11b1fa8fcdc870fcee953f948e660f8
 2021-03-03 20:39:20 +00:00
Jakub Pawlowski
5b746422d6 Merge "Fix comment typo in PeriodicAdvertisingParameters" am: d806639032 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614522

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I20348933b26ae9dc07b20370832ea52187362c17
 2021-03-03 19:09:20 +00:00
Sarah Chin
f898afeaf8 Merge "APIs for 5G slicing" am: 08b9f41364 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1593931

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4d2a9cd1442a1bd0f194d5bb2b17f98c3f29e747
 2021-03-03 18:59:57 +00:00
Jakub Pawlowski
d806639032 Merge "Fix comment typo in PeriodicAdvertisingParameters" 2021-03-03 18:45:54 +00:00
Jakub Pawlowski
5629c959bf Fix comment typo in PeriodicAdvertisingParameters 
Bug: 176967118
Test: m ds-docs-java
Exempt-From-Owner-Approval: Docs-only change
Change-Id: I1777ca23ba6f395eeb2ec98b970ccbf920661663
 2021-03-03 18:45:45 +00:00
Sarah Chin
08b9f41364 Merge "APIs for 5G slicing" 2021-03-03 18:42:20 +00:00
Patrick Baumann
131084c94a Merge "Parcel queriesProviders in ParsingPackageImpl" am: 8ee2b99d71 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1584517

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I95f95fdfbc3cf9b4f97b8d17f2c4c6883bad0e44
 2021-03-03 18:39:33 +00:00
Yan Yan
a5d4ead8ed Merge "Use VERSION_CODES.S instead of VERSION_CODES.R + 1" am: b9fdfa8270 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606597

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I565eb522ff02784c36533be2eabb3267c2035991
 2021-03-03 18:33:31 +00:00
Brad Ebinger
98e4437b38 Merge "Move illegal state detection in stub classes to warning" am: 4d183b882d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1613919

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I90930b5f98ae8976dd567b5d788e7ade14b0d431
 2021-03-03 18:31:25 +00:00
James Mattis
a9daf47946 Merge "Adding additional docs for OemNetworkPreferences" am: 1258b5fec3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1606593

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I947176ec2f71fcddb7bc432b23917eef219562f3
 2021-03-03 18:24:33 +00:00
Patrick Baumann
8ee2b99d71 Merge "Parcel queriesProviders in ParsingPackageImpl" 2021-03-03 18:19:56 +00:00
Yan Yan
b9fdfa8270 Merge "Use VERSION_CODES.S instead of VERSION_CODES.R + 1" 2021-03-03 18:04:52 +00:00
Brad Ebinger
4d183b882d Merge "Move illegal state detection in stub classes to warning" 2021-03-03 17:45:49 +00:00
Sunil Ravi
063cf92aa8 WiFi: Define permissions for set/clear country code API 
Added new signature permission for calling country code APIs.

Bug: 168743500
Test: Cts tests
Change-Id: Idb4f5627f5ef45b054a5a80ecfa0ae691bfec021
 2021-03-03 17:31:10 +00:00
James Mattis
1258b5fec3 Merge "Adding additional docs for OemNetworkPreferences" 2021-03-03 17:25:01 +00:00
Xin Li
e085f87400 Merge RQ2A.210305.007 
Bug: 180401296
Merged-In: I2958205678f4340e96ce6e845718e994a0231afc
Change-Id: I9f591a70330cf80de4139570caa0ca8b0af4cc3c
 2021-03-03 09:12:09 -08:00
Varun Shah
0ef490024e Add OWNERS file for UsageStats unit tests. 
Bug: n/a
Test: n/a
Change-Id: Iab4b0153c4e7bff94fb6a6d02b6439e3d6151820
 2021-03-03 17:08:47 +00:00
Treehugger Robot
0f2ed8b795 Merge "[FUI18] Expose notifyNetworkStatus as system API" am: 10eb5d0faf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559088

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8b20786397ff83c0d086549a0d942c5703e31b9a
 2021-03-03 16:21:54 +00:00
Treehugger Robot
10eb5d0faf Merge "[FUI18] Expose notifyNetworkStatus as system API" 2021-03-03 15:49:06 +00:00
junyulai
c5bfa330bf [FUI19] Migrate ConnectivityService to use NetworkStatsManager 
Test: atest FrameworksNetTests
Bug: 174123988
Change-Id: Iaefd99f87ae96bc9d97d139bcd92a3fe8de917d2
 2021-03-03 20:01:51 +08:00
junyulai
33b44da527 [FUI18] Expose notifyNetworkStatus as system API 
Test: m -j doc-comment-check-docs
Bug: 174123988
Merged-In: I11d4c9ab24de87fb2ad120e3787b78b73133e874
Change-Id: I11d4c9ab24de87fb2ad120e3787b78b73133e874
  (cherry-picked from ag/13749978)
 2021-03-03 20:01:46 +08:00
Abhijeet Kaur
3fe1ba327b Merge "Update mount values to be consistent with IVold.aidl" am: ddd2a13c38 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1605514

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2851203ddb2af3702f9603eefd17bc26fc9aab64
 2021-03-03 11:12:54 +00:00
lifr
e4a6c677ba [CS05]Remove the hidden API usage of MetricsLogger 
Legacy metrics are unused and deprecated, so they are being removed.
Therefore, delete the usage of the hidden MetricsLogger API.

Bug: 157966864
Test: atest CtsNetTestCases
      atest CaptivePortalTest
      atest ConnectivityServiceTest
Change-Id: I51241f5d50ec580015882c84dd917b015c700c7c
 2021-03-03 10:17:52 +00:00
Abhijeet Kaur
ddd2a13c38 Merge "Update mount values to be consistent with IVold.aidl" 2021-03-03 10:09:46 +00:00
Yi Kong
f388bf48ac Merge "profcollect: Update binder method names" am: 453966a20b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1593776

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic8e37ba3f93486906bfcdcab48ebb08d9fe12bdc
 2021-03-03 09:00:38 +00:00
Treehugger Robot
e1826640ee Merge "Additional metadata keys for Fast Pair" am: ad1bbc487c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596412

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icbc6c331894be59140f379a443260edaafc05aa1
 2021-03-03 08:54:49 +00:00
Treehugger Robot
a117895548 Merge "Extend timeout for receiving broadcasts" am: 15b5b58a7c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614339

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I14924edf870ff55c334113f5d1583862be20e0f8
 2021-03-03 08:51:04 +00:00
Benedict Wong
46b1ae0666 Merge changes Ib439bde4,I5bc0fe94,I72abf1e2,Id1813bcb am: a3fab46d7b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1611230

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic3863bd060aa8cbdc5aac3e40d65ee03e82c357c
 2021-03-03 08:41:30 +00:00
Lorenzo Colitti
7ff87b2116 Merge changes Idfb5e149,Ia52b24c5 am: 8c93a76901 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612040

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0ea9aed0e6c626ab0076260dab6ff9f657a82a30
 2021-03-03 08:33:11 +00:00
Yo Chiang
3121af69d3 Merge "DSUService: stopSelf() only if no ongoing installation" am: 0fb5c3f306 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1609094

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ec7b60e0a5d964db91e84bb1ebb4c751eda5cf5
 2021-03-03 08:21:05 +00:00
Yi Kong
453966a20b Merge "profcollect: Update binder method names" 2021-03-03 08:16:51 +00:00