Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
642,054 Commits 3 Branches 0 Tags
ee26ec181caecf362673cf1111bb5e40f8b366e8
Commit Graph

642054 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
ee26ec181c [automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" am: 8e90abbe39 -s ours am: b67a5b50fa -s ours am: d4aa3fc310 -s ours am: 9b4ec0cd60 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0a78302d9356077442675cbd512eab75ee5ba2fc
 2021-04-14 07:30:18 +00:00
Bill Yi
9b4ec0cd60 [automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" am: 8e90abbe39 -s ours am: b67a5b50fa -s ours am: d4aa3fc310 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie382825bbc4a1b0cda64fe7a118dd6066b2cae7c
 2021-04-14 07:16:31 +00:00
Siarhei Vishniakou
bc7a82e6b8 Merge "Revert "Check mInputEventReceiver before sending timeline"" into sc-dev am: f3779061f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14173053

Change-Id: I140690f397572b8a956d432ac9d3d2c44714a4c1
 2021-04-14 06:51:16 +00:00
Bill Yi
d4aa3fc310 [automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" am: 8e90abbe39 -s ours am: b67a5b50fa -s ours 
am skip reason: skip tag Change-Id I735b41ed53ce7d374b5d36c4aee79f73d0334234 with SHA-1 bf7c109ed6 is already in history

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

Change-Id: Ie4dfff3cfbe5df4b60353217e8f99611438fd2be
 2021-04-14 06:31:20 +00:00
Siarhei Vishniakou
f3779061f4 Merge "Revert "Check mInputEventReceiver before sending timeline"" into sc-dev 2021-04-14 06:26:45 +00:00
Ben Murdoch
35fccc4535 Revert "Check mInputEventReceiver before sending timeline" 
This reverts commit d2766d013f.

Reason for revert: Cheery pick for release build stabilisation

Bug: 169866723
Bug: 184255546
Bug: 184771626
Bug: 185015591

Change-Id: I1ee859aa8432598932efe918656146d257c6684e
 2021-04-14 06:24:10 +00:00
Benedict Wong
a197302f4b Convert VcnNetworkProvider to use NetworkOffers am: 9dfb804a4e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14170558

Change-Id: I1a6a45b516cbd7e4b34d41039f7906ee513e11c3
 2021-04-14 06:08:43 +00:00
Benedict Wong
979d92d00a Merge changes Ib0690243,I0cabce70,I8f13a0d8,I81efeaa4,If2abfec1 into sc-dev am: 183576c844 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14170557

Change-Id: Ifa376254a24312b9aac4a3b449030d59d5e5ae73
 2021-04-14 06:08:28 +00:00
Bill Yi
b67a5b50fa [automerger skipped] Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" am: 8e90abbe39 -s ours 
am skip reason: skip tag Change-Id I735b41ed53ce7d374b5d36c4aee79f73d0334234 with SHA-1 bf7c109ed6 is already in history

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

Change-Id: I92a667574c0f8f8754c6c1c28d90c32f26e8d3b3
 2021-04-14 05:46:16 +00:00
Benedict Wong
9dfb804a4e Convert VcnNetworkProvider to use NetworkOffers 
This change brings VcnNetworkProvider to full functionality in the new
NetworkProvider paradigm, where NetworkProviders offer networks, and are
notified based on NetworkOfferCallbacks.

Bug: 185204197
Test: atest FrameworksVcnTests
Change-Id: I88c69c0be9f6fd81839fb1595ed00341001694a5
 2021-04-14 05:41:51 +00:00
Benedict Wong
183576c844 Merge changes Ib0690243,I0cabce70,I8f13a0d8,I81efeaa4,If2abfec1 into sc-dev 
* changes:
  Switch to using NetworkScore instead of legacy integer
  Remove use of network scores, and provider IDs in VcnNetworkProvider
  Improve dump detail
  Disable INTERNET/DUN when mobile data toggled off
  Remove unused variable in MtuUtils
 2021-04-14 05:41:39 +00:00
Bill Yi
8e90abbe39 Merge "Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE" 2021-04-14 04:59:51 +00:00
Paul Hu
2da0b40c98 Merge "Add [get|set]MaxManifestReceiverApiLevel to test api for CTS" into sc-dev am: 68c58b9ccd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14161095

Change-Id: Ide6860fbe5ed06e717b72b25f24481bf62fb7ec5
 2021-04-14 04:56:04 +00:00
Paul Hu
68c58b9ccd Merge "Add [get|set]MaxManifestReceiverApiLevel to test api for CTS" into sc-dev 2021-04-14 04:52:38 +00:00
Roshan Pius
18b8ca3e6b Merge changes from topic "uwb_aosp_service" into sc-dev am: 9bed14ecc8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14064871

Change-Id: I29d48ed2e4bd3333b9319e4f2c4fb9809d870151
 2021-04-14 03:42:09 +00:00
Roshan Pius
9bed14ecc8 Merge changes from topic "uwb_aosp_service" into sc-dev 
* changes:
  UwbService: Handle vendor service death
  UwbService: Create a UwbRanging callback wrapper
  Uwb: Create a new Uwb system service
 2021-04-14 03:26:40 +00:00
Kyunglyul Hyun
2544369e9e Merge "Change PlaybackState#isActiveState to isActive" into sc-dev am: 90e33e72cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14124578

Change-Id: I97ceb59fc3441289360aa0aefc25356689a1fb6e
 2021-04-14 03:20:05 +00:00
Allen Su
25e2168423 Merge "[RCS]Migrate from getEncodedMessage() to toEncodedMessage()" am: 23bbd41fde am: bf7c109ed6 am: 85f4d04ef2 am: 11d3489ba1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671789

Change-Id: I7fd216c70a9cdaf32b3d3abe549684ef9c5a96d3
 2021-04-14 03:19:54 +00:00
Lorenzo Colitti
96801a67f2 Merge "Add @RedactionType annotations to VpnTransportInfo." am: 97b4639efa am: b2087b4635 am: 1a4acce753 am: 53ba814150 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674568

Change-Id: Ib846f0acb9602b809c9d4882c5125ec261ddcdf7
 2021-04-14 03:19:22 +00:00
Chiachang Wang
1f774026df Merge "Add framework-connectivity-test-defaults into integration test" into sc-dev am: f2488fcc1a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14170758

Change-Id: I2f2abe627a4e00dd2dd5f43c3fb1a2a06b8cb8f5
 2021-04-14 03:18:26 +00:00
Kyunglyul Hyun
90e33e72cb Merge "Change PlaybackState#isActiveState to isActive" into sc-dev 2021-04-14 03:18:06 +00:00
Allen Su
11d3489ba1 Merge "[RCS]Migrate from getEncodedMessage() to toEncodedMessage()" am: 23bbd41fde am: bf7c109ed6 am: 85f4d04ef2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671789

Change-Id: Iea60a39cb6fc3b2d5ed5732111b18fb64bf0bcdf
 2021-04-14 03:01:13 +00:00
Lorenzo Colitti
53ba814150 Merge "Add @RedactionType annotations to VpnTransportInfo." am: 97b4639efa am: b2087b4635 am: 1a4acce753 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674568

Change-Id: I1193382337088113bf64a636b0b70429d28f8be6
 2021-04-14 03:00:32 +00:00
Chiachang Wang
f2488fcc1a Merge "Add framework-connectivity-test-defaults into integration test" into sc-dev 2021-04-14 02:46:42 +00:00
Chiachang Wang
a12c1f150d Add framework-connectivity-test-defaults into integration test 
Bug: 182859030
Test: m
Change-Id: I4421a582782d1bc0acdec26e7c9f60d68d649028
 2021-04-14 02:46:21 +00:00
Bill Yi
4167bf213c Merge RQ2A.210405.006 to aosp-master - DO NOT MERGE 
Merged-In: I735b41ed53ce7d374b5d36c4aee79f73d0334234
Merged-In: I9999bfe514fffa9f300643e74942db5ae556670a
Change-Id: If4b670a158e561d8feb03e12aef2d295c5109d43
 2021-04-13 19:36:45 -07:00
Allen Su
85f4d04ef2 Merge "[RCS]Migrate from getEncodedMessage() to toEncodedMessage()" am: 23bbd41fde am: bf7c109ed6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671789

Change-Id: I02897bc33c500660aadf20a1aa198a9db10643b8
 2021-04-14 02:33:21 +00:00
Lorenzo Colitti
1a4acce753 Merge "Add @RedactionType annotations to VpnTransportInfo." am: 97b4639efa am: b2087b4635 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674568

Change-Id: I3c13a27c78cb824d366095edbf37d30527978def
 2021-04-14 02:33:11 +00:00
Bill Yi
9590cdab76 [automerger skipped] Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE am: d4df20e57f -s ours am: 4f15a7cf47 -s ours am: a747410776 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I66300e7dd5b9b36d4a05be95115cc100dcdfe0a8
 2021-04-14 01:49:27 +00:00
Shivam Agrawal
fda3eaa129 Merge "Device-Specific Display Settings Should Not Be Applied During Tests" into sc-dev am: 95a8c189bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14001275

Change-Id: I2fe2ac42dfd0f9762b9f01cc3c4a15b023ad0840
 2021-04-14 01:47:08 +00:00
Bill Yi
a747410776 [automerger skipped] Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE am: d4df20e57f -s ours am: 4f15a7cf47 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib1d72d31954f31f9f1cefa3bd557c5bce3fb6f9e
 2021-04-14 01:30:08 +00:00
Allen Su
bf7c109ed6 Merge "[RCS]Migrate from getEncodedMessage() to toEncodedMessage()" am: 23bbd41fde 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1671789

Change-Id: I735b41ed53ce7d374b5d36c4aee79f73d0334234
 2021-04-14 01:28:46 +00:00
Lorenzo Colitti
b2087b4635 Merge "Add @RedactionType annotations to VpnTransportInfo." am: 97b4639efa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1674568

Change-Id: I4febfa2d96c678decff23eb08e40ba0e33e4c7bf
 2021-04-14 01:24:19 +00:00
Shivam Agrawal
95a8c189bf Merge "Device-Specific Display Settings Should Not Be Applied During Tests" into sc-dev 2021-04-14 01:22:06 +00:00
Benedict Wong
ffc912dace Switch to using NetworkScore instead of legacy integer 
This change switches the VcnNetworkAgent from using the legacy score
integer, and switches to using the new NetworkScore, using the legacy
integer as a internal representation.

Bug: 185204197
Test: FrameworksVcnTests
Change-Id: Ib0690243f176a2f074358fcc8430f1fd7c3d0d3c
 2021-04-13 17:50:36 -07:00
Benedict Wong
fff0f8ba33 Remove use of network scores, and provider IDs in VcnNetworkProvider 
This change updates the VcnNetworkProvider and associated
requestListeners to no longer use the network score and provider IDs, in
order to match the new NetworkProvider APIs.

Bug: 185204197
Test: atest FrameworksVcnTests
Change-Id: I0cabce702cfd8457fd1a152af07a847b87d67028
 2021-04-13 17:50:36 -07:00
Benedict Wong
1ce20d65e0 Improve dump detail 
This change improves the formatting and detail provided by the VCN dump

Bug: 8675309
Test: atest FrameworksVcnTests
Change-Id: I8f13a0d8fe54e9bf8948e9576e9705024fe79611
 2021-04-13 17:50:31 -07:00
Benedict Wong
fcacb06752 Disable INTERNET/DUN when mobile data toggled off 
This change disables INTERNET and DUN capabilities once the mobile data
toggle is turned off. Additionally, when the toggle is flipped, any
existing networks advertising either of those two capabilities will be
restarted in order to remove the capabilities.

Bug: 184864726
Test: atest FrameworksVcnTests
Change-Id: I81efeaa4b129443b08a597ff45e0037ddefeb414
 2021-04-13 17:50:31 -07:00
Benedict Wong
2abc46ac29 Remove unused variable in MtuUtils 
Bug: 8675309
Test: atest FrameworksNetTests
Change-Id: If2abfec1e5755b3f8cc17fb307ec3e1633bb3e18
 2021-04-13 17:50:25 -07:00
Jeff DeCew
0628846bfa Merge "Add CallStyle.setIsVideo(boolean)" into sc-dev am: f9139ded2a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14130088

Change-Id: I443153869872912e785f56b98705fa0d8a2f4df5
 2021-04-14 00:48:34 +00:00
Jeff DeCew
f9139ded2a Merge "Add CallStyle.setIsVideo(boolean)" into sc-dev 2021-04-14 00:37:12 +00:00
Allen Su
23bbd41fde Merge "[RCS]Migrate from getEncodedMessage() to toEncodedMessage()" 2021-04-14 00:31:16 +00:00
Bill Yi
4f15a7cf47 [automerger skipped] Merge RQ2A.210405.006 to stage-aosp-master - DO NOT MERGE am: d4df20e57f -s ours 
am skip reason: skip tag Change-Id I9af489ae7bdd448c552c97d4478f1760a13fb970 with SHA-1 4aed3924ff is already in history

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

Change-Id: I9999bfe514fffa9f300643e74942db5ae556670a
 2021-04-14 00:31:09 +00:00
TreeHugger Robot
bbd27bcf1b Merge "InputMonitorCompat is no longer Parcelable" into sc-dev am: 14d6cdca25 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14177311

Change-Id: Idb8fd6d2d8fc4d8e6dc1fa7e15598b00220aed7b
 2021-04-14 00:29:57 +00:00
Lorenzo Colitti
97b4639efa Merge "Add @RedactionType annotations to VpnTransportInfo." 2021-04-14 00:29:48 +00:00
TreeHugger Robot
14d6cdca25 Merge "InputMonitorCompat is no longer Parcelable" into sc-dev 2021-04-14 00:14:36 +00:00
Suprabh Shukla
1698c0705e Merge "Suspend dialog improvememts" into sc-dev am: 9da117df72 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14150368

Change-Id: Icda2d764a05d9ec22cf7622a731cd94040e559c0
 2021-04-14 00:08:56 +00:00
TreeHugger Robot
664c65cba8 Merge "libhwui: Use wc instead of du to monitor file write" into sc-dev am: 522de6d8df 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14174124

Change-Id: Ia98614c55b6ebf7efd0cca2d2680e5fbfc81c93e
 2021-04-14 00:08:13 +00:00
Suprabh Shukla
9da117df72 Merge "Suspend dialog improvememts" into sc-dev 2021-04-13 23:57:38 +00:00
TreeHugger Robot
522de6d8df Merge "libhwui: Use wc instead of du to monitor file write" into sc-dev 2021-04-13 23:54:06 +00:00