Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
567,210 Commits 3 Branches 0 Tags
1764ceaa6761c978bf720185e301aad8d09ac0ac
Commit Graph

567210 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Remi NGUYEN VAN
1764ceaa67 Merge changes from topic "ethernet_specifier" am: c77293b7a9 am: 2943678b0e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626207

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I772ca29f64cb9431a899a2c213c511ad467fc36f
 2021-03-12 00:26:49 +00:00
Remi NGUYEN VAN
734c56f7a9 Add Ethernet, TestNetworkSpecifier API am: c5479a0886 am: c792424cad 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574300

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I63159846579c43c721eeb86c9a55faa3f2888be8
 2021-03-12 00:26:45 +00:00
Treehugger Robot
4f3026147a Merge "Added mount to OWNERS for RecyclerView and ViewPager" am: 2273adedcd am: 62aa26cacb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629662

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id7b9ca5d814aa27e295c46b755af35743de5d434
 2021-03-12 00:25:20 +00:00
Remi NGUYEN VAN
2943678b0e Merge changes from topic "ethernet_specifier" am: c77293b7a9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626207

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ef1a287439b5f5705ff3b3b4de4ded54f61c1c1
 2021-03-12 00:12:52 +00:00
Remi NGUYEN VAN
c792424cad Add Ethernet, TestNetworkSpecifier API am: c5479a0886 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1574300

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a1b38fb6b8b6831bac016a8352ae9073758f9af
 2021-03-12 00:10:08 +00:00
Grace Jia
3e96c1328c Merge "Annotation and doc improvement for adhoc conference APIs." am: 0251d617a5 am: e4bc4e9ca5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1412812

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iee57bef7f60bb612b864a72d5bf2d98115b03d28
 2021-03-12 00:05:34 +00:00
Treehugger Robot
62aa26cacb Merge "Added mount to OWNERS for RecyclerView and ViewPager" am: 2273adedcd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1629662

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I40e5292a7663baddddf604d1b6d164fa8b4541f7
 2021-03-12 00:05:24 +00:00
mrenouf
85bf625569 Merge "Update OWNERS for long screenshots framework code" am: 4392dd9cb8 am: 695b9ee40e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1619622

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5fe8f6ed9302d560959f28d9ebd2f309fb6502ef
 2021-03-12 00:05:22 +00:00
Treehugger Robot
8de105cc8b Merge "Removed EpsQosSessionAttributes#onCreate" am: 5967b657ef am: 0dd1a463f0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626282

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5324674f92f5229affc6af4735da73826c6572bc
 2021-03-12 00:05:08 +00:00
Treehugger Robot
bec7ce5cf4 Merge changes Iac9487e8,Ifa411c7b am: 999506022f am: 7d70dd9c33 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622675

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0742b4bb3c5b2ddaa06830b403d849ed25ef71cd
 2021-03-12 00:04:56 +00:00
Remi NGUYEN VAN
c77293b7a9 Merge changes from topic "ethernet_specifier" 
* changes:
  Fix common tests on Q and R
  Add Ethernet, TestNetworkSpecifier API
 2021-03-11 23:51:49 +00:00
Treehugger Robot
2273adedcd Merge "Added mount to OWNERS for RecyclerView and ViewPager" 2021-03-11 23:38:03 +00:00
Grace Jia
e4bc4e9ca5 Merge "Annotation and doc improvement for adhoc conference APIs." am: 0251d617a5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1412812

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie6f423bfbd4965e4cc27c3e1591ecdef29dcf0c8
 2021-03-11 23:25:32 +00:00
mrenouf
695b9ee40e Merge "Update OWNERS for long screenshots framework code" am: 4392dd9cb8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1619622

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibe7f623cb291cab2201dc1b61cb5b42edd18b418
 2021-03-11 23:23:04 +00:00
Treehugger Robot
0dd1a463f0 Merge "Removed EpsQosSessionAttributes#onCreate" am: 5967b657ef 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626282

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2a43814aa235b0e293a8d8e160bdb13aa161b599
 2021-03-11 23:19:05 +00:00
Treehugger Robot
7d70dd9c33 Merge changes Iac9487e8,Ifa411c7b am: 999506022f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1622675

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2cf126259f903d407830b1e8bc2d3fcdc02b97c2
 2021-03-11 23:15:17 +00:00
TreeHugger Robot
e23f71e88e Merge "Revert "Only allow BROWSABLE && DEFAULT Intents to be always opened"" into rvc-qpr-dev am: 5079f881c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13727687

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4eba7c6725fa82b1402153a7bd2d4fe2814f10d4
 2021-03-11 23:15:00 +00:00
Grace Jia
0251d617a5 Merge "Annotation and doc improvement for adhoc conference APIs." 2021-03-11 23:07:54 +00:00
TreeHugger Robot
5079f881c0 Merge "Revert "Only allow BROWSABLE && DEFAULT Intents to be always opened"" into rvc-qpr-dev 2021-03-11 22:49:55 +00:00
mrenouf
4392dd9cb8 Merge "Update OWNERS for long screenshots framework code" 2021-03-11 22:41:24 +00:00
Treehugger Robot
5967b657ef Merge "Removed EpsQosSessionAttributes#onCreate" 2021-03-11 22:37:36 +00:00
Tianjie Xu
2184af92df Merge "Extend the metrics for resume on reboot" am: 1c5faf6141 am: f593e71276 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556763

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8dbb655ca1511ab9a194c68171995b93fb95a24c
 2021-03-11 22:37:33 +00:00
Tyler Gunn
b40dd1553c Merge "Mark android.net.sip code as deprecated." am: 3b36aa32fa am: 346a19a3ce 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540225

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iabfc90911c149ce44e6c9133abf320b1a2809372
 2021-03-11 22:36:54 +00:00
Kevin Han
a1cb84d03c Merge "Fix local service binding in tests." am: 6d0bf150e3 am: fe54088dcb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624867

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7767b6abb495a5c3e96cc991b18bbd4647b4ef70
 2021-03-11 22:36:33 +00:00
Treehugger Robot
999506022f Merge changes Iac9487e8,Ifa411c7b 
* changes:
  [VCN11] Make requestBackgroundNetwork requires handler
  [VCN10] Add new API to listen for highest score network
 2021-03-11 22:34:06 +00:00
Tianjie Xu
f593e71276 Merge "Extend the metrics for resume on reboot" am: 1c5faf6141 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556763

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I833356a154218a3e2c914efd4b2a6242e37a26c6
 2021-03-11 22:18:39 +00:00
Tianjie Xu
1c5faf6141 Merge "Extend the metrics for resume on reboot" 2021-03-11 22:13:25 +00:00
Tyler Gunn
346a19a3ce Merge "Mark android.net.sip code as deprecated." am: 3b36aa32fa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540225

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8d84a4fbaaf910ca3c0420229f67e282cf258f74
 2021-03-11 22:07:55 +00:00
Tyler Gunn
3b36aa32fa Merge "Mark android.net.sip code as deprecated." 2021-03-11 22:03:11 +00:00
Kevin Han
fe54088dcb Merge "Fix local service binding in tests." am: 6d0bf150e3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624867

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieb43aae6f11a26f6d1d1937ab99880b3da19e352
 2021-03-11 22:00:03 +00:00
George Mount
029208ebdd Added mount to OWNERS for RecyclerView and ViewPager 
As requested, mount was added to OWNERS for RecyclerView
and ViewPager as changes are occasionally needed by UI
toolkit team.

Test: None
Change-Id: Ie3d49d0d5ddf092d2dd0680c6a067b2fe6b81f94
 2021-03-11 21:27:55 +00:00
mrenouf
7b969ae133 Update OWNERS for long screenshots framework code 
Adds OWNERS line for internal binder interfaces.

Test: n/a
Change-Id: Ib6cdef76c5c9444f7187e33588bb3fdfbf5f5787
 2021-03-11 21:23:44 +00:00
Kevin Han
6d0bf150e3 Merge "Fix local service binding in tests." 2021-03-11 21:10:43 +00:00
Daniel Bright
27a0642a9b Merge "Update comments on onApnUnthrottled" am: 1bec754c8b am: bb58b8a819 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626323

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iafbd99a78e3cf47d5a265a88978e2a1a9e25cb70
 2021-03-11 19:07:29 +00:00
Daniel Bright
bb58b8a819 Merge "Update comments on onApnUnthrottled" am: 1bec754c8b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626323

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4de8a5e489211dcaa469608a04ac07d70afb7391
 2021-03-11 18:29:33 +00:00
Neil Fuller
8a71bbc85f Merge "Add MetricsTimeZoneSuggestion for metrics use" am: c06b300638 am: 288f5630c1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628820

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia7c9657c803ab1d292c203732ce6036cc3edda21
 2021-03-11 18:12:15 +00:00
Neil Fuller
d34bf7100d Merge "OWNERS change / new .proto file" am: 6d3fb3d57c am: 6ca6f593a1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628819

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I35dae3f53d34a1fb0628503857659bf394e07779
 2021-03-11 18:12:01 +00:00
James Mattis
c8cf0becf0 Merge "Add auto-postsubmit test tag for frameworks/base" am: ec14bafb25 am: 987d246395 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626462

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I501cb60a1f805215970d16e27fe741605c1389b9
 2021-03-11 18:11:29 +00:00
Daniel Bright
1bec754c8b Merge "Update comments on onApnUnthrottled" 2021-03-11 18:02:36 +00:00
Neil Fuller
288f5630c1 Merge "Add MetricsTimeZoneSuggestion for metrics use" am: c06b300638 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628820

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6166e51e6c323c6f0ae46a0515189468ce897ba6
 2021-03-11 17:46:17 +00:00
Neil Fuller
6ca6f593a1 Merge "OWNERS change / new .proto file" am: 6d3fb3d57c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1628819

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7cbee2d8c4938aca3045f22c61c03b9961faac7a
 2021-03-11 17:43:27 +00:00
Neil Fuller
c06b300638 Merge "Add MetricsTimeZoneSuggestion for metrics use" 2021-03-11 17:38:30 +00:00
James Mattis
987d246395 Merge "Add auto-postsubmit test tag for frameworks/base" am: ec14bafb25 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1626462

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ica56ddfb4e4320ab5e553856b9ef3abf88add266
 2021-03-11 17:33:52 +00:00
Neil Fuller
6d3fb3d57c Merge "OWNERS change / new .proto file" 2021-03-11 17:12:18 +00:00
James Mattis
ec14bafb25 Merge "Add auto-postsubmit test tag for frameworks/base" 2021-03-11 17:05:34 +00:00
Janis Danisevskis
2a38d13272 Merge "Keystore 2.0: Remove hidden API from RecoverableKeystore" am: 5de808c5e2 am: 8b7ca71fd7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624871

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I41a1d4c746b1bc390a6060f526b90580d3f2397a
 2021-03-11 16:56:41 +00:00
Janis Danisevskis
8b7ca71fd7 Merge "Keystore 2.0: Remove hidden API from RecoverableKeystore" am: 5de808c5e2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1624871

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ccf99568c8238256addc02982a9b63757a7a22e
 2021-03-11 16:18:12 +00:00
Janis Danisevskis
5de808c5e2 Merge "Keystore 2.0: Remove hidden API from RecoverableKeystore" 2021-03-11 15:50:32 +00:00
Remi NGUYEN VAN
c5479a0886 Add Ethernet, TestNetworkSpecifier API 
Rename StringNetworkSpecifier to EthernetNetworkSpecifier (its only
production user), and make it module-lib API.
The original StringNetworkSpecifier file is actually kept to satisfy
some invalid dependencies; it will be removed separately.

This allows specifying an Ethernet interface with a non-deprecated API:
until this change the only way to do so would be to use
NetworkRequest#setSpecifier(String), which is deprecated.

Similarly, add the TestNetworkSpecifier API for TestNetworkManager, to
replace previous usage of StringNetworkSpecifier. TestNetworkManager is
module API, so TestNetworkSpecifier should be module API too. This
allows tests to request the test interface specifically, without using
the deprecated NetworkRequest#setSpecifier(String).

Bug: 179329291
Test: m
Merged-In: Iee569f5c8bbdc4bc979610e1191308281f3d4620

Change-Id: Iee569f5c8bbdc4bc979610e1191308281f3d4620
 2021-03-11 23:02:02 +08:00
Remi NGUYEN VAN
3c6140d8cc Fix common tests on Q and R 
The common tests cannot reference EthernetNetworkSpecifier,
as it did not exist in Q and R yet.

Bug: 179329291
Merged-In: Iec8ef874a3ca6dcc65944bbbaa3575a5ae0f4989
Change-Id: Iec8ef874a3ca6dcc65944bbbaa3575a5ae0f4989
Test: atest CtsNetTestCasesLatestSdk
 2021-03-11 23:02:02 +08:00