Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
635,329 Commits 3 Branches 0 Tags
bf05d0ee6d121e684ca5693ca8ae1db106e36430
Commit Graph

635329 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paul Duffin
bf05d0ee6d Merge "Export monolithic hidden api files to the dist" am: f94ff5a36e am: 26efc48ba8 am: 62f16e59e1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673385

Change-Id: I250937c71dfcf7868c6074eae28d3ecbf2892e79
 2021-04-13 13:08:09 +00:00
Chiachang Wang
6a6a5e776c Merge "Make getUid a method on UserHandle itself instead of static" am: bd1cc4f2a2 am: 6b7167e807 am: 155b09614e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669185

Change-Id: Ic0b7887630c00404ff354c193b82a96930940556
 2021-04-13 13:06:43 +00:00
Fiona Campbell
e5c8cea568 Merge "Pass Immutable flag to vr intent" into sc-dev 2021-04-13 13:02:44 +00:00
Paul Duffin
62f16e59e1 Merge "Export monolithic hidden api files to the dist" am: f94ff5a36e am: 26efc48ba8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673385

Change-Id: I85a771a4c64241a93a48de8161722e2700047b96
 2021-04-13 12:15:17 +00:00
Anton Hansson
5683fda342 Merge changes from topics "based", "jref" into sc-dev 
* changes:
  Inline usage of jarjar_rules.txt
  Move defaults closer to their targets
  Move framework proto build rules to separate file
  Move font tool build rules to subdir
 2021-04-13 12:10:22 +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
Paul Duffin
26efc48ba8 Merge "Export monolithic hidden api files to the dist" am: f94ff5a36e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1673385

Change-Id: Ifeabdabd6b6b75ee7da1f067b2db1b66b15bfdf7
 2021-04-13 11:55:07 +00:00
Chiachang Wang
155b09614e Merge "Make getUid a method on UserHandle itself instead of static" am: bd1cc4f2a2 am: 6b7167e807 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669185

Change-Id: Icc006ab751a1a03aa3c09c1999a6141ff061081d
 2021-04-13 11:54:57 +00:00
Marin Shalamanov
3bd70615ae Merge "Rename helper function" into sc-dev 2021-04-13 10:36:18 +00:00
Paul Duffin
f94ff5a36e Merge "Export monolithic hidden api files to the dist" 2021-04-13 09:57:12 +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
Chiachang Wang
6b7167e807 Merge "Make getUid a method on UserHandle itself instead of static" am: bd1cc4f2a2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1669185

Change-Id: If47dccc346aa78c7cb49aafbd5e07d35d3403c6a
 2021-04-13 08:51:12 +00:00
Chiachang Wang
bd1cc4f2a2 Merge "Make getUid a method on UserHandle itself instead of static" 2021-04-13 08:15:47 +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
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
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
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
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
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
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
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
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
d01ed12c5d Merge "Revert "Revert "Update face detectInteraction""" into sc-dev 2021-04-13 01:50:59 +00:00
Chalard Jean
f8300427d4 Merge "Fix a bug where updates of offers won't find existing offers" into sc-dev 2021-04-13 01:33:21 +00:00
Nader Jawad
93ea53bbe2 Merge "Fixed issue with invalid stretch params" into sc-dev 2021-04-13 01:29:31 +00:00
Amy Zhang
93b3dd7fb0 Allow Descrambler.add/removePid to pass a nullable optional filter 
Test: make
Bug: 184851519
Change-Id: I5457150579e57cc2c39a3bd390bbef62de73520b
Merged-In: Icf7d9526fa15dc11b23e9f73dbfceee748640772
 2021-04-13 01:09:45 +00:00
Arthur Hung
d914330cfc Merge "Power button press behavior should account for default display state" into sc-dev 2021-04-13 01:05:32 +00:00
Mady Mellor
7d27c36db3 Merge "Fix bubbles appearing in recent task list" into sc-dev 2021-04-13 00:07:55 +00:00
Andy Hung
e81308eec6 Merge "audio: add device constants for HDMI EARC" into sc-dev 2021-04-13 00:01:49 +00:00
Pinyao Ting
55c108fdb1 Merge changes from topic "shortcut-app-search" into sc-dev 
* changes:
  Shortcut integration with AppSearch (Part 10)
  Shortcut integration with AppSearch (Part 9)
  Shortcut integration with AppSearch (Part 8)
  Shortcut integration with AppSearch (Part 7)
  Shortcut integration with AppSearch (Part 5)
 2021-04-12 23:29:34 +00:00
Josh Gao
60ef47b378 Merge "Increase DropBox size to 10MiB." am: e1b4e1d594 am: 95949aed66 am: e0d085e8a7 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1651533

Change-Id: Ia4623936e3440d6b70a153d29c9e0c170489b857
 2021-04-12 23:26:44 +00:00
TreeHugger Robot
70bc4757b5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 1678346f96 -s ours am: e84e3c9919 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ice87d59e125bd29469f598ea0ac0dcd4755f672c
 2021-04-12 23:26:26 +00:00
Meng Wang
6517e68d15 Merge "Revert "PasswordPolicy.getMinMetrics PIN"" into sc-dev 2021-04-12 23:22:21 +00:00
Kevin Chyn
05a37fac59 Merge "Add logs when addAuthToken is invoked" into sc-dev 2021-04-12 23:02:38 +00:00