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

565223 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
a2ca3e18cc Merge changes Ie8d98359,I4d5cadfd am: 69508ee6db 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612254

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3ec456b2f2fd88648461794dc2301a3825c3c155
 2021-03-04 13:16:29 +00:00
Lucas Lin
9943270a61 Merge "Use public API Network#getNetId() to get netid" am: 0292235a96 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1601854

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3b68c194109a5839dfb11ed3fe9c3aa4a25a85bb
 2021-03-04 13:14:01 +00:00
Nathalie Le Clair
4d657988ef Merge changes Ie0a7ec38,I5199dc85 am: da70abc9e1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614041

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I23ed35b13a8499a2dffb3727d8b6be15d41473bd
 2021-03-04 13:11:28 +00:00
Treehugger Robot
69508ee6db Merge changes Ie8d98359,I4d5cadfd 
* changes:
  Fix a bug in RequestReassignment#toString
  Cleanup some of the PANS code
 2021-03-04 12:39:04 +00:00
Lucas Lin
0292235a96 Merge "Use public API Network#getNetId() to get netid" 2021-03-04 11:05:55 +00:00
Nathalie Le Clair
da70abc9e1 Merge changes Ie0a7ec38,I5199dc85 
* changes:
  Handle messages in standby for DeviceDiscoveryAction
  Prevent periodic actions from starting twice
 2021-03-04 11:01:12 +00:00
Treehugger Robot
fd426e18cd Merge "Remove unused errorMessage" am: 78a488cd10 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1616687

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c9d4dd0c721c1bb0340e52f4af1c6813efa4ee7
 2021-03-04 06:29:43 +00:00
Treehugger Robot
78a488cd10 Merge "Remove unused errorMessage" 2021-03-04 06:03:56 +00:00
Treehugger Robot
8397f20aff Merge "Remove @hide CollectionUtils in QosCallbackTracker" am: 12acf15141 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612296

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icc65c4fb9c354b00ea98552021860170189ce15c
 2021-03-04 05:02:00 +00:00
Treehugger Robot
12acf15141 Merge "Remove @hide CollectionUtils in QosCallbackTracker" 2021-03-04 04:22:18 +00:00
Aaron Huang
3f93679709 Merge "Remove PersistableBundle(Bundle) usage from ConnectivityService" am: e32c7c482e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556097

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I56756f9e45baa506cb304bd6c560c4129df7417a
 2021-03-04 04:04:25 +00:00
Aaron Huang
e32c7c482e Merge "Remove PersistableBundle(Bundle) usage from ConnectivityService" 2021-03-04 03:50:50 +00:00
Paul Hu
0e37e30151 Merge "Replace ConnectivityManager hidden symbols on framework" am: 1297f90193 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1607955

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I83a8eb6c8cefd7f84448ad14acd97e6582a4d1e4
 2021-03-04 03:11:45 +00:00
Remi NGUYEN VAN
739f8a3fb1 Merge "Add Build.IS_DEBUGGABLE to public API" am: 9c16d8e25d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1397947

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I939354b4a5de3d4ecbab9e43438c39cd3aed9ae0
 2021-03-04 03:08:57 +00:00
Paul Hu
1297f90193 Merge "Replace ConnectivityManager hidden symbols on framework" 2021-03-04 03:07:08 +00:00
Sudheer Shanka
028e394c23 Merge "Add new network process capability." am: ae0fa6d359 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612822

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I47466241367f39cb9540df3fffab59df6354401b
 2021-03-04 03:06:06 +00:00
Remi NGUYEN VAN
9c16d8e25d Merge "Add Build.IS_DEBUGGABLE to public API" 2021-03-04 03:02:56 +00:00
Sudheer Shanka
ae0fa6d359 Merge "Add new network process capability." 2021-03-04 03:02:49 +00:00
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
Haibo Huang
1c9baa3191 Remove unused errorMessage 
Change-Id: If799737a69545bf6789213ce3f4dd6c724352213
 2021-03-03 16:43:48 -08: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