Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
641,633 Commits 3 Branches 0 Tags
af2cacc032c19b8e85c903c6ed1d8a941aa991ba
Commit Graph

641633 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Riddle Hsu
af2cacc032 Merge "Consolidate filling of window frames and config for client" into sc-dev am: 1d55f8ecbe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14099052

Change-Id: Icb8a2b9881c70d3a0132bf80400647d02845206b
 2021-04-13 12:14:55 +00:00
Riddle Hsu
1d55f8ecbe Merge "Consolidate filling of window frames and config for client" into sc-dev 2021-04-13 11:59:06 +00:00
Marin Shalamanov
fe4ecd518a Merge "Rename helper function" into sc-dev am: 3bd70615ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14102693

Change-Id: Ia3ad03a18f4f5c601ff824ff51e706c488c54913
 2021-04-13 11:55:52 +00:00
Anton Hansson
7a6a51859f Merge "Move build modules from top-level to core/java/" into sc-dev am: 797d8fffc5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14161627

Change-Id: I20357886550b9c3fc073a56f769f5be8875675a6
 2021-04-13 11:55:26 +00:00
Naomi Musgrave
7753d5fd93 Merge "Shell command to toggle sandboxing" into sc-dev am: f636fcb38e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13754186

Change-Id: I45ccf0dd430ceca23ef373d06291c2953b31c1da
 2021-04-13 11:54:45 +00:00
Marin Shalamanov
3bd70615ae Merge "Rename helper function" into sc-dev 2021-04-13 10:36:18 +00:00
Anton Hansson
797d8fffc5 Merge "Move build modules from top-level to core/java/" into sc-dev 2021-04-13 09:57:10 +00:00
Naomi Musgrave
f636fcb38e Merge "Shell command to toggle sandboxing" into sc-dev 2021-04-13 09:11:26 +00:00
Nathalie Le Clair
c3f6c4ec8e Merge "Rename send_standby_on_sleep" into sc-dev am: a13c9782b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14160187

Change-Id: I26a9c667c495d553d144641b01e9227109552c89
 2021-04-13 08:04:11 +00:00
Nathalie Le Clair
a13c9782b8 Merge "Rename send_standby_on_sleep" into sc-dev 2021-04-13 07:26:07 +00:00
Chiachang Wang
f3c2b866a4 Merge "Add SDK version check to skip S added API test" am: 739195c5b0 am: a8ae705499 am: b92605cc81 am: d2c062b8f0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673167

Change-Id: I279752e8c436e53a4012afc25c439dd19126e381
 2021-04-13 07:13:11 +00:00
Chiachang Wang
d2c062b8f0 Merge "Add SDK version check to skip S added API test" am: 739195c5b0 am: a8ae705499 am: b92605cc81 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673167

Change-Id: I0cdc2e50246204925590ba556b6b67a7499140ee
 2021-04-13 06:59:05 +00:00
Shawn Lin
3bcac96c91 Merge "Fixed the flickering of the nav bar" into sc-dev am: 1aeb8f54f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14150472

Change-Id: I187d66b8ec7c731010e4daffe91bb39e336f96a2
 2021-04-13 06:53:55 +00:00
Shawn Lin
1aeb8f54f8 Merge "Fixed the flickering of the nav bar" into sc-dev 2021-04-13 06:24:25 +00:00
Chiachang Wang
b92605cc81 Merge "Add SDK version check to skip S added API test" am: 739195c5b0 am: a8ae705499 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673167

Change-Id: I057a0d7c6a8697e301f6aa1b37088140d0cc8bb6
 2021-04-13 06:02:20 +00:00
Automerger Merge Worker
d62635fc0f Merge "[automerger skipped] Merge "Allow Descrambler.add/removePid to pass a nullable optional filter" am: 0b8ff8e00e am: 012a4243cd am: 3ae46e50ab -s ours" into sc-dev am: b6a266158d -s ours 
am skip reason: skip tag Change-Id Icf7d9526fa15dc11b23e9f73dbfceee748640772 with SHA-1 316b045b9a is already in history

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

Change-Id: Ia5afddf36a27e508bdb088d2e493766584ca1d6e
 2021-04-13 05:39:14 +00:00
Daniel Sandler
e2daf647a2 Merge "Power + Volume up key chord can now be configured." into sc-dev am: f34519a523 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14116607

Change-Id: I3ad9a5b7d503d790b0b039b3b2251162c60dbfa4
 2021-04-13 05:39:01 +00:00
Wonsik Kim
6102640dac Merge "MediaCodec: minor revision of APIs for vendor parameters" am: 5d41bf1b65 am: 69814e45a1 am: 50f0fc71e3 am: 369a920b58 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673760

Change-Id: I439b721111d5a688018b8e564ee291ffe77338e7
 2021-04-13 05:38:31 +00:00
Chiachang Wang
a8ae705499 Merge "Add SDK version check to skip S added API test" am: 739195c5b0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673167

Change-Id: I40516d56f9ca477d62c362dbdf11aad713c620ae
 2021-04-13 05:17:53 +00:00
Automerger Merge Worker
b6a266158d Merge "[automerger skipped] Merge "Allow Descrambler.add/removePid to pass a nullable optional filter" am: 0b8ff8e00e am: 012a4243cd am: 3ae46e50ab -s ours" into sc-dev 2021-04-13 04:56:34 +00:00
Daniel Sandler
f34519a523 Merge "Power + Volume up key chord can now be configured." into sc-dev 2021-04-13 04:56:27 +00:00
Amy Zhang
593666abfa [automerger skipped] Merge "Allow Descrambler.add/removePid to pass a nullable optional filter" am: 0b8ff8e00e am: 012a4243cd am: 3ae46e50ab -s ours 
am skip reason: skip tag Change-Id Icf7d9526fa15dc11b23e9f73dbfceee748640772 with SHA-1 316b045b9a is already in history

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

Change-Id: I4d720c8bd56533013c935d3629106335d91a44ba
 2021-04-13 04:56:16 +00:00
Wonsik Kim
369a920b58 Merge "MediaCodec: minor revision of APIs for vendor parameters" am: 5d41bf1b65 am: 69814e45a1 am: 50f0fc71e3 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673760

Change-Id: I7050200724896046e042c310f6e5f3e6431759bb
 2021-04-13 04:54:57 +00:00
Chiachang Wang
739195c5b0 Merge "Add SDK version check to skip S added API test" 2021-04-13 04:30:36 +00:00
Junyu Lai
5110a1f95e Merge "Fix nascent timer never get removed" into sc-dev am: ea3d717053 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14060609

Change-Id: I1ea9133133dadb7a4c2f271e551336f003121417
 2021-04-13 04:28:29 +00:00
Amy Zhang
3ae46e50ab Merge "Allow Descrambler.add/removePid to pass a nullable optional filter" am: 0b8ff8e00e am: 012a4243cd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1672265

Change-Id: I47f5ad2ac00ce65055b603fa27b8f21dd3729f27
 2021-04-13 04:06:23 +00:00
Wonsik Kim
50f0fc71e3 Merge "MediaCodec: minor revision of APIs for vendor parameters" am: 5d41bf1b65 am: 69814e45a1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673760

Change-Id: Ic35494916ed8795a5809349f422482cb8aae00f3
 2021-04-13 04:05:31 +00:00
Junyu Lai
ea3d717053 Merge "Fix nascent timer never get removed" into sc-dev 2021-04-13 03:34:49 +00:00
Amy Zhang
012a4243cd Merge "Allow Descrambler.add/removePid to pass a nullable optional filter" am: 0b8ff8e00e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1672265

Change-Id: Ifdbe40af2a6e8e6b70ad9689a819e4c5b793a978
 2021-04-13 03:17:31 +00:00
Varun Shah
092e5a6642 Merge "Don't hold the CPH lock while installing providers." into sc-dev am: 4e974ce20d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14162426

Change-Id: I30909771c1a2bc38851769fcf0d677596f98b18b
 2021-04-13 03:03:06 +00:00
Wonsik Kim
69814e45a1 Merge "MediaCodec: minor revision of APIs for vendor parameters" am: 5d41bf1b65 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673760

Change-Id: I4e6a062210c5e08ca207d26c5c39667c2f26a1d8
 2021-04-13 03:02:43 +00:00
Zoey Chen
3fc3a2099f Merge "[Telephony] API Review: getMergedImsisFromGroup" into sc-dev am: e2f123e1a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14125151

Change-Id: Ib31efe5c6bcf4902c29c183217e2737488863c4e
 2021-04-13 03:02:36 +00:00
Amy Zhang
0b8ff8e00e Merge "Allow Descrambler.add/removePid to pass a nullable optional filter" 2021-04-13 02:59:06 +00:00
Varun Shah
4e974ce20d Merge "Don't hold the CPH lock while installing providers." into sc-dev 2021-04-13 02:58:47 +00:00
Zoey Chen
e2f123e1a4 Merge "[Telephony] API Review: getMergedImsisFromGroup" into sc-dev 2021-04-13 02:50:51 +00:00
Riddle Hsu
bac0061273 Merge "Revert "Clear controls and animations in temp arrays after using them"" into sc-dev am: 5a71c4f7fa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14161093

Change-Id: I09dc7fb29bcb927c30bff2c4671c842811d9b2b4
 2021-04-13 02:41:55 +00:00
Riddle Hsu
b335bf1179 Merge "Remove obsolete test APIs of split screen" into sc-dev am: a77a0600cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14159585

Change-Id: Id81fb990ddb876c767e01232b4e8c70e2cf3f201
 2021-04-13 02:41:06 +00:00
Wonsik Kim
5d41bf1b65 Merge "MediaCodec: minor revision of APIs for vendor parameters" 2021-04-13 02:23:35 +00:00
Riddle Hsu
5a71c4f7fa Merge "Revert "Clear controls and animations in temp arrays after using them"" into sc-dev 2021-04-13 02:21:57 +00:00
Riddle Hsu
a77a0600cf Merge "Remove obsolete test APIs of split screen" into sc-dev 2021-04-13 02:20:37 +00:00
Chiachang Wang
c35a8165bb Add SDK version check to skip S added API test 
NetworkAgentConfigTest is a part of CtsNetTestCasesLatestSdk.
It will be used in mainline test with a R build. Test will
fail with method not found error. Add a version check to skip
the S added API tests.

Test: atest NetworkAgentConfigTest in R and S device
Fix: 185151127
Change-Id: Ib372e68afa99af455eb2713c8f6f1c8ef1d4cfdf
 2021-04-13 10:18:36 +08:00
Ahaan Ugale
d88fae8ed9 Merge "Fix UiTranslation for ListView." into sc-dev am: 44dccdbe1a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14064892

Change-Id: I8634683d1373e25cd8dd5dce52430a9649d3a1b1
 2021-04-13 02:18:07 +00:00
Paul Hu
65bc303fa8 Merge "Rename FIRST_SDK_INT to DEVICE_INITIAL_SDK_INT" into sc-dev am: 036d189a8d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14134967

Change-Id: Iaae05598a4d39e4706a5cbbaf2dbc7e6f85de35b
 2021-04-13 02:17:42 +00:00
Ahaan Ugale
44dccdbe1a Merge "Fix UiTranslation for ListView." into sc-dev 2021-04-13 02:11:07 +00:00
Paul Hu
036d189a8d Merge "Rename FIRST_SDK_INT to DEVICE_INITIAL_SDK_INT" into sc-dev 2021-04-13 02:05:21 +00:00
Kevin Chyn
84face646c Merge "Revert "Revert "Update face detectInteraction""" into sc-dev am: d01ed12c5d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14147116

Change-Id: Iaa5a9d1abddfe1e1c94f8e87b6094704bd0a2bde
 2021-04-13 01:54:33 +00:00
Chalard Jean
6d1777d8bb Merge "Fix a bug where updates of offers won't find existing offers" into sc-dev am: f8300427d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14125149

Change-Id: I7200938e84975231117979d2a2d904878d18f2b5
 2021-04-13 01:54:19 +00:00
Nader Jawad
ac6b4a4d0c Merge "Fixed issue with invalid stretch params" into sc-dev am: 93ea53bbe2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14163043

Change-Id: I1bd1c4e41c582ab7e7df09aad853e6d710b5208a
 2021-04-13 01:53:57 +00:00
Arthur Hung
2f67e870c1 Merge "Power button press behavior should account for default display state" into sc-dev am: d914330cfc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14134526

Change-Id: I5b82d0cafc58b75ff0f8d76e0460acce1ce9b873
 2021-04-13 01:52:59 +00:00
Kevin Chyn
d01ed12c5d Merge "Revert "Revert "Update face detectInteraction""" into sc-dev 2021-04-13 01:50:59 +00:00