Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
683,888 Commits 3 Branches 0 Tags
2580f4afc2355cd1994bf8cfdffc868aab761758
Commit Graph

683888 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yan Yan
2580f4afc2 Merge "Improve the API doc for setVcnUnderlyingNetworkPriorities" am: b85c5d7634 am: e6286ba332 am: 59bb050977 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1945490

Change-Id: I38301bd886ab0733bc66d5fd36f7c6368acf0fa5
 2022-01-24 19:40:03 +00:00
TreeHugger Robot
b5e3ae424c Merge changes from topic "presubmit-am-9ac0d720d9e1426daa03a0d40542b907" into sc-v2-dev-plus-aosp 
* changes:
  [automerged blank] Service: transmits empty station list 2p: 02f65dd642
  Service: transmits empty station list
 2022-01-24 19:39:34 +00:00
Yan Yan
59bb050977 Merge "Improve the API doc for setVcnUnderlyingNetworkPriorities" am: b85c5d7634 am: e6286ba332 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1945490

Change-Id: I7d88ec6377f5bf1972d8a981a005ab4aa69982ae
 2022-01-24 19:27:11 +00:00
Yan Yan
e6286ba332 Merge "Improve the API doc for setVcnUnderlyingNetworkPriorities" am: b85c5d7634 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1945490

Change-Id: Iad3b19f722a20cdd6ebcfaaf3c5a551f3bf4d197
 2022-01-24 19:02:46 +00:00
Andrew Cheng
87bbfa2701 Merge "New @SystemApi's in BluetoothMapClient" am: f97b80ebd7 am: 490121697e am: b92748937f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1954736

Change-Id: I47b5102392b9469ee3e34c1b3288c976a32e8b2e
 2022-01-24 19:01:46 +00:00
Andrew Cheng
b92748937f Merge "New @SystemApi's in BluetoothMapClient" am: f97b80ebd7 am: 490121697e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1954736

Change-Id: Ia99bffadb72600a0df7af5ce58a3d77e42431b79
 2022-01-24 18:45:48 +00:00
Yan Yan
b85c5d7634 Merge "Improve the API doc for setVcnUnderlyingNetworkPriorities" 2022-01-24 18:37:31 +00:00
Andrew Cheng
490121697e Merge "New @SystemApi's in BluetoothMapClient" am: f97b80ebd7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1954736

Change-Id: I3a0c6f4206693f6c68d4a39575c366b1c4e14d74
 2022-01-24 18:23:38 +00:00
Andrew Cheng
f97b80ebd7 Merge "New @SystemApi's in BluetoothMapClient" 2022-01-24 18:11:45 +00:00
Anton Hansson
7312a200ec Merge "Split android-non-updatable-stubs-defaults in two" am: 70ab0685cf am: e55397e910 am: 8906255544 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1958860

Change-Id: I9d7b3b14357d4a2db3d18bbc61a4b10c986a3634
 2022-01-24 18:04:22 +00:00
Anton Hansson
8906255544 Merge "Split android-non-updatable-stubs-defaults in two" am: 70ab0685cf am: e55397e910 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1958860

Change-Id: Ia4926c922cd1663690f118b7fa996787fc995b08
 2022-01-24 17:47:38 +00:00
Anton Hansson
e55397e910 Merge "Split android-non-updatable-stubs-defaults in two" am: 70ab0685cf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1958860

Change-Id: I89ea760ec38328347a7946d17f352438ac3341c9
 2022-01-24 17:30:28 +00:00
Anton Hansson
70ab0685cf Merge "Split android-non-updatable-stubs-defaults in two" 2022-01-24 17:15:15 +00:00
Sooraj Sasindran
f6b90779f8 Merge "Make sure to udpate enterprise id" am: 724e9d6a7f am: 0cd153c240 am: 9f28d7cf30 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1956749

Change-Id: Ia3b355f327cc7a2251f76ded4d54dea767a698fe
 2022-01-24 17:10:18 +00:00
Sooraj Sasindran
9f28d7cf30 Merge "Make sure to udpate enterprise id" am: 724e9d6a7f am: 0cd153c240 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1956749

Change-Id: I23bc303e7c273ae087a2f089f94889f4eab95054
 2022-01-24 16:59:01 +00:00
Sooraj Sasindran
0cd153c240 Merge "Make sure to udpate enterprise id" am: 724e9d6a7f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1956749

Change-Id: I197e3ffcb876739c724942915c08a323565c7a35
 2022-01-24 16:42:02 +00:00
Sooraj Sasindran
724e9d6a7f Merge "Make sure to udpate enterprise id" 2022-01-24 16:26:03 +00:00
Anton Hansson
9dce832eea Split android-non-updatable-stubs-defaults in two 
Put the module classpath defaults into a separate defaults module,
such that users can choose to add the module symbols in a different
way.

Update all the current users to apply both defaults.

Test: m nothing
Change-Id: I22f9518c2e205bfa8ad8d4b630ec976921786b73
 2022-01-24 15:50:59 +00:00
Jerome Gaillard
86ad227a40 Merge "Add more owners for LayoutlibLoader.cpp" am: 64085cd5db am: d4b635fa4d am: 77bb3f9288 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1909192

Change-Id: I9098cc47d0046303da3f05bd8a2f1a7ec5ede84a
 2022-01-24 15:26:40 +00:00
Jerome Gaillard
77bb3f9288 Merge "Add more owners for LayoutlibLoader.cpp" am: 64085cd5db am: d4b635fa4d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1909192

Change-Id: I0436ad6e162f7343be8e6531d26d04738f529f02
 2022-01-24 15:11:06 +00:00
Alex Florescu
bad23fe8f7 Merge "Adding alexflo@'s team" am: 5bfe18ca55 am: cdaf2613cf am: 38caa9f305 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1954316

Change-Id: Iff36be82750cb054edecccae720e6750b0595576
 2022-01-24 15:03:37 +00:00
Jerome Gaillard
d4b635fa4d Merge "Add more owners for LayoutlibLoader.cpp" am: 64085cd5db 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1909192

Change-Id: I54b98c2177e91b910a16f29b149f3c821a7b76fc
 2022-01-24 14:59:10 +00:00
Alex Florescu
38caa9f305 Merge "Adding alexflo@'s team" am: 5bfe18ca55 am: cdaf2613cf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1954316

Change-Id: I435e2c0a181db31e457c47e4080dce37e25a0b2a
 2022-01-24 14:52:23 +00:00
Jerome Gaillard
64085cd5db Merge "Add more owners for LayoutlibLoader.cpp" 2022-01-24 14:44:46 +00:00
Alex Florescu
cdaf2613cf Merge "Adding alexflo@'s team" am: 5bfe18ca55 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1954316

Change-Id: Iacf418a0b38ee6c014ab27c3294b9d9915496ea6
 2022-01-24 14:35:27 +00:00
Junyu Lai
4061d54f2b Merge changes I54c2258c,I47b2d3ac am: 53de4cb310 am: d0dcf4d412 am: e447b40de4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1936446

Change-Id: I579f5805c98d3d6497b016bdbdb5a7ef76fce7f0
 2022-01-24 14:22:49 +00:00
Anton Hansson
fc0236b17f Merge "Remove defaults that add nothing" am: 4c11ce8ee3 am: f8319bd662 am: 5c5e6cbf80 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1952384

Change-Id: Ia2b44bc5e0b5afbaac4708ebc6b8eb0f26a57f83
 2022-01-24 14:22:35 +00:00
Siim Sammul
4e38ab22c6 Merge "Move binder latency data logging to a background thread to improve performance of the main thread." am: 3af0c6a106 am: b24b15c6f9 am: 1f0a6f7d4e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1942954

Change-Id: I047b1a6e06a35e4f8fdd7be363e30c59982e0cee
 2022-01-24 14:22:12 +00:00
Alex Florescu
5bfe18ca55 Merge "Adding alexflo@'s team" 2022-01-24 14:19:59 +00:00
Junyu Lai
e447b40de4 Merge changes I54c2258c,I47b2d3ac am: 53de4cb310 am: d0dcf4d412 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1936446

Change-Id: I753f3bee6b3a3e06489d46f3bf0dd5caf2ca70f7
 2022-01-24 14:17:27 +00:00
Junyu Lai
d0dcf4d412 Merge changes I54c2258c,I47b2d3ac am: 53de4cb310 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1936446

Change-Id: Id51ceff565e5d5467f3a236b5d43e5395d65bdac
 2022-01-24 14:12:24 +00:00
Anton Hansson
5c5e6cbf80 Merge "Remove defaults that add nothing" am: 4c11ce8ee3 am: f8319bd662 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1952384

Change-Id: I7869d9cad9ac70df5246047cc508da0116f1d981
 2022-01-24 14:11:55 +00:00
Siim Sammul
1f0a6f7d4e Merge "Move binder latency data logging to a background thread to improve performance of the main thread." am: 3af0c6a106 am: b24b15c6f9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1942954

Change-Id: I3fd253bc0e023a3aa05222ef8c7105f26b6f95fe
 2022-01-24 14:11:30 +00:00
Junyu Lai
53de4cb310 Merge changes I54c2258c,I47b2d3ac 
* changes:
  [MS38] Remove android.os.HandlerExecutor dependencies
  [MS58] Expose Apis which will be used by data migration utility
 2022-01-24 14:08:56 +00:00
Anton Hansson
f8319bd662 Merge "Remove defaults that add nothing" am: 4c11ce8ee3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1952384

Change-Id: Ic280f40686a07f95e948974606727eda916a5091
 2022-01-24 14:01:35 +00:00
Siim Sammul
b24b15c6f9 Merge "Move binder latency data logging to a background thread to improve performance of the main thread." am: 3af0c6a106 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1942954

Change-Id: I35ceec5144a13ef836055569b1d0f2a01106a828
 2022-01-24 13:56:38 +00:00
Anton Hansson
4c11ce8ee3 Merge "Remove defaults that add nothing" 2022-01-24 13:56:13 +00:00
Siim Sammul
3af0c6a106 Merge "Move binder latency data logging to a background thread to improve performance of the main thread." 2022-01-24 13:40:33 +00:00
Xiao Ma
33f4958b4b Merge "Move Ethernet related files to f/b/packages/ConnectivityT." am: 487a9cc8a4 am: bf089a8cd1 am: 738edf5e07 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1934465

Change-Id: I07793dab25e38188a3895c18c59b28e4b05f709c
 2022-01-24 13:37:31 +00:00
Xiao Ma
738edf5e07 Merge "Move Ethernet related files to f/b/packages/ConnectivityT." am: 487a9cc8a4 am: bf089a8cd1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1934465

Change-Id: I1eb7467e256c0694bfed9c7af5676ec4cf9b30df
 2022-01-24 13:24:01 +00:00
Xiao Ma
bf089a8cd1 Merge "Move Ethernet related files to f/b/packages/ConnectivityT." am: 487a9cc8a4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1934465

Change-Id: I56397ac11a2d41b10fe2880b432f56861f13edeb
 2022-01-24 13:06:50 +00:00
Xiao Ma
487a9cc8a4 Merge "Move Ethernet related files to f/b/packages/ConnectivityT." 2022-01-24 12:50:39 +00:00
junyulai
a7d85f0028 [MS38] Remove android.os.HandlerExecutor dependencies 
Mainline module can't use internal HandlerExecutor, so inline
the implementation instead.

Test: atest FrameworksNetTests NetworkPolicyManagerServiceTest
Bug: 204830222
Change-Id: I54c2258cb3cee5fb862409441de293d6fed6b32c
 2022-01-24 15:53:42 +08:00
Junyu Lai
6629435836 [MS58] Expose Apis which will be used by data migration utility 
This includes:
1. NetworkIdentity
2. NetworkIdentitySet
3. NetworkStatsHistory

NetworkStatsCollection Apis will be exposed in a separate CL.

Test: TH
Bug: 204830222
Change-Id: I47b2d3ac3b86cb4e6879afaae34326ca3c050ffa
 2022-01-24 15:44:27 +08:00
Junyu Lai
39b28bcaa2 Merge changes from topics "ms56-historybuilder", "ms65.3" am: 54bc16fc64 am: 7246788b30 am: 8a1007ba5a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1951478

Change-Id: If1615141e401e464ecfe737e1fff1d92229a17bc
 2022-01-24 06:24:45 +00:00
Junyu Lai
8a1007ba5a Merge changes from topics "ms56-historybuilder", "ms65.3" am: 54bc16fc64 am: 7246788b30 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1951478

Change-Id: Idca0e0184e91fdef8be63091472bd729b1ad0950
 2022-01-24 06:12:11 +00:00
Junyu Lai
7246788b30 Merge changes from topics "ms56-historybuilder", "ms65.3" am: 54bc16fc64 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1951478

Change-Id: I8f727a73716c3f06d8c946a7e014793c5c8046eb
 2022-01-24 05:55:03 +00:00
Junyu Lai
54bc16fc64 Merge changes from topics "ms56-historybuilder", "ms65.3" 
* changes:
  [MS56.1] Add NetworkStatsHistory#Builder
  [MS65.3] Address comments at aosp/1954383
 2022-01-24 05:41:10 +00:00
Ken Chen
152f95dd6a Merge "Delete libnetdbpf from linked libs used by libandroid_runtime" am: e0b5cb4c91 am: 2c73071f79 am: 85094a4f40 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1956981

Change-Id: I374d4ecb567974705ff1065f4ad0eadedb413aaa
 2022-01-24 04:41:27 +00:00
Ken Chen
85094a4f40 Merge "Delete libnetdbpf from linked libs used by libandroid_runtime" am: e0b5cb4c91 am: 2c73071f79 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1956981

Change-Id: I52e02017e2239f526d8bf88ae58d8848abb0e34c
 2022-01-24 04:24:15 +00:00