Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
627,846 Commits 3 Branches 0 Tags
397e520f7944b321e010c17efbc132a0ddf634a6
Commit Graph

627846 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
397e520f79 Merge "Shortcut integration with AppSearch (part 4)" into sc-dev 2021-03-05 23:31:59 +00:00
TreeHugger Robot
68d8cb07dd Merge "Add 1.extras, 2.recording session, 3.ID wrapper to MediaMetrics" into sc-dev 2021-03-05 23:31:50 +00:00
Pinyao Ting
945823240a Shortcut integration with AppSearch (part 4) 
To prevent starving binder thread over synchrounous operation, following
changes were made in this CL:
1, Create oneway apis in aidl
2. Annotation to ensure existing api call are running in WorkerThread

Bug: 180558621
NoNonSdkCheck: ShortcutService is for internal use, not a public api.
It should have been put in block-list in the first place.
Test: no change in functionality, covered by existing unit/cts tests
Change-Id: I17ecbaa7f2da30babec9fd58af7f07d5c0594054
 2021-03-05 23:31:25 +00:00
Hongwei Wang
5632ba9ee0 Merge "Defer onTaskInfoChanged while transitioning to PiP" into sc-dev 2021-03-05 23:26:49 +00:00
TreeHugger Robot
f50b232944 Merge "Add local service interface for app hibernation" into sc-dev 2021-03-05 23:26:40 +00:00
Suren Baghdasaryan
6162e8bcd5 Eliminate memtrack variability in Lost RAM when ION is being used 
Modify lost RAM calculation to account unmapped ION buffers as part of
kernel memory and mapped ION buffers as PSS. Because mapped ION buffers
might be accounted in memtrack HAL's reported Graphics memory, we
need to replace it with the mapped dmabufs representing mapped ION
buffers.

Bug: 174546244
Test: dumpsys meminfo
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: Ia7f5fc2ca95389a5f2ae78d4cdbf8ba3ef8e3972
 2021-03-05 23:08:41 +00:00
TreeHugger Robot
e79f709c62 Merge "Update notification title/content text" into sc-dev 2021-03-05 23:07:40 +00:00
TreeHugger Robot
a14342934e Merge "Guard CDM watch profile behind its permission" into sc-dev 2021-03-05 22:52:10 +00:00
TreeHugger Robot
a807683a65 Merge "Add @RequiresPermission for CDM watch profile use" into sc-dev 2021-03-05 22:46:29 +00:00
TreeHugger Robot
a9171adcbe Merge "Correct API for new sizes in App Widgets." into sc-dev 2021-03-05 22:44:57 +00:00
James Mattis
c4b1e28957 Merge "Applying OEM network pref to all users" am: c1a548b132 am: b6625e5976 am: a5e243419a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612760

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9988f9ecac19976dd78dbcf9a749adba5daa578c
 2021-03-05 22:37:45 +00:00
Jeff Sharkey
bb107f0d53 Merge "Add per-file OWNERS for ChargeCalculators" am: e191d88136 am: 7526d5687c am: 77229abe61 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1621724

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3cfbb9ce3f4257cc676d24bcd0cb71b07279e56b
 2021-03-05 22:36:55 +00:00
Treehugger Robot
0d7618a835 Merge "Update OWNER for team's files under content" am: 1b2163d9e8 am: 4de3cb8fae am: 393cc313f0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620579

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie3b2e9ca75dbe9d1d2ecfffe371900df011ec5be
 2021-03-05 22:36:32 +00:00
Danny Epstein
04a92b0029 [automerger skipped] Merge "Configure privapp perms for rotary service" into rvc-qpr-dev am: 43c4add74a am: c4090831af -s ours 
am skip reason: Change-Id Ib0596f87c81fda75c830989ecc57059392b7fc42 with SHA-1 ffe2cfcffa is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I62107cfa5c0cab45c87ac9f632f8476ec11d22fb
 2021-03-05 22:36:05 +00:00
TreeHugger Robot
c67f558c74 Merge "Implement AppIoBlocked counter per uid" into sc-dev 2021-03-05 22:31:20 +00:00
James Mattis
a5e243419a Merge "Applying OEM network pref to all users" am: c1a548b132 am: b6625e5976 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612760

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5ec8289855a810504e82b8828a4160929f13d19b
 2021-03-05 22:11:25 +00:00
Jeff Sharkey
77229abe61 Merge "Add per-file OWNERS for ChargeCalculators" am: e191d88136 am: 7526d5687c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1621724

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib8b1efe14f542d922614121c4f9b1ffd4f2a61a6
 2021-03-05 22:11:10 +00:00
Treehugger Robot
393cc313f0 Merge "Update OWNER for team's files under content" am: 1b2163d9e8 am: 4de3cb8fae 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620579

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie0b43e183d27bbf958e64d850a085311bfad90ae
 2021-03-05 22:10:52 +00:00
Alexander Dorokhine
db7aecbc3a Merge "Update Framework from Jetpack." into sc-dev 2021-03-05 22:01:56 +00:00
Alexander Dorokhine
73fb4da96d Update Framework from Jetpack. 
Included changes:
* 509ebe: Rename getSchemasNotVisibleToSystemUi to setSchemaTypeDisplayedBySystem
* a532fe: Resolve merge conflicts from upstream sync.

Bug: 179143575
Bug: 175146044
Bug: 179160886
Bug: 175255572
Bug: 181887768
Test: Presubmit

Change-Id: I977baf47f6188e4c182a5cf96af4873d0e5284e0
 2021-03-05 22:01:32 +00:00
Danny Epstein
c4090831af Merge "Configure privapp perms for rotary service" into rvc-qpr-dev am: 43c4add74a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13745810

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia811576d0f6c0a62631e8d694f4f232b4ab21223
 2021-03-05 21:51:55 +00:00
Hui Yu
3e651250c7 Merge "callingUid needs to be passed from AMS to DeviceIdleController." into sc-dev 2021-03-05 21:41:24 +00:00
Alex Buynytskyy
18a94794d6 Merge "Check if IncFs supports fs-verity before trying to enable it." into sc-dev 2021-03-05 21:39:26 +00:00
James Mattis
b6625e5976 Merge "Applying OEM network pref to all users" am: c1a548b132 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1612760

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id805612e7b807dd789c4ff88a933660fb11b12cf
 2021-03-05 21:39:23 +00:00
TreeHugger Robot
4379d99c29 Merge "Trace vsync id" into sc-dev 2021-03-05 21:37:02 +00:00
Julia Reynolds
3ae88ec931 Merge "Register conversation listeners" into sc-dev 2021-03-05 21:35:10 +00:00
Jeff Sharkey
7526d5687c Merge "Add per-file OWNERS for ChargeCalculators" am: e191d88136 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1621724

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ief5ba28883b57ac8f251f78ac2ab3e73e95d12a1
 2021-03-05 21:32:03 +00:00
Treehugger Robot
4de3cb8fae Merge "Update OWNER for team's files under content" am: 1b2163d9e8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1620579

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7bbf9b18386227c3ba8fe3a831ac1a246564dae5
 2021-03-05 21:23:24 +00:00
Danny Epstein
43c4add74a Merge "Configure privapp perms for rotary service" into rvc-qpr-dev 2021-03-05 21:14:22 +00:00
TreeHugger Robot
466661da29 Merge "Add LightsRequest.Builder#setLight back to SystemApi as Deprecated." into sc-dev 2021-03-05 21:13:31 +00:00
TreeHugger Robot
7660d7402d Merge "Use compose duration returned from HAL" into sc-dev 2021-03-05 21:08:47 +00:00
Eugene Susla
2db826decf Add @RequiresPermission for CDM watch profile use 
Bug: 165951651
Test: presubmit
Change-Id: Id1c3b2656875de07cfc3fd936d528d0410a62aee
 2021-03-05 12:34:50 -08:00
Maurice Lam
fd8f4ae270 Merge "Add missing display ID" into sc-dev 2021-03-05 20:29:57 +00:00
Ahaan Ugale
ed0d866aa7 Merge "AF: Add a passwordsActivity attribute." into sc-dev 2021-03-05 20:16:53 +00:00
Ahaan Ugale
bb18870659 Merge "AF: Add a helper method for querying available services." into sc-dev 2021-03-05 20:16:53 +00:00
TreeHugger Robot
71ecb60a5a Merge "Camera: Add multi-resolution image reader and reprocessing support" into sc-dev 2021-03-05 20:14:08 +00:00
Jeff DeCew
55f7019463 Merge "Fix image crossfade animation of left icon in groups." into sc-dev 2021-03-05 20:12:14 +00:00
Eugene Susla
f31443e224 Guard CDM watch profile behind its permission 
Bug: 165951651
Test: manual
Change-Id: If6aa1c2513bc2f3edf4fd9c83f2f1090a2907bed
 2021-03-05 12:08:34 -08:00
Kevin Chyn
0a989d79fc Merge changes I91d720d3,Ibfdc40d4 into sc-dev 
* changes:
  Update Udfps fingerprint icon size
  Add UDFPS enrollment moving target
 2021-03-05 20:02:58 +00:00
Beth Thibodeau
926c5490cd Update notification title/content text 
Fixes: 181688580
Test: manual
Change-Id: I09f98a0e1ba656c0d3af6de48a5447c32239232b
 2021-03-05 14:58:07 -05:00
TreeHugger Robot
c8f4f70efd Merge "Fix NPE crashes during UDFPS BiometricPrompt" into sc-dev 2021-03-05 19:52:19 +00:00
Terry Wang
42bac3b186 Merge "Split getAppSearchImpl and createAppSearchImpl in AppSearchImpl" into sc-dev 2021-03-05 19:27:31 +00:00
Danny Epstein
7a3134cd7a Merge "Configure privapp perms for rotary service" into sc-dev 2021-03-05 19:26:51 +00:00
Zim
827a95e153 Implement AppIoBlocked counter per uid 
This allows us track AppIoBlocked status correctly for a uid with
several threads concurrently blocked on IO.

This would have been cleaner to track per tid of uid, but
unfortunately, we don't know the calling tid via binder

Test: Manual
Bug: 170486601
Change-Id: I4df5cb2e99726739059d962915c7488df98a0f05
 2021-03-05 19:24:16 +00:00
James Mattis
c1a548b132 Merge "Applying OEM network pref to all users" 2021-03-05 19:09:24 +00:00
Winson Chung
88c5179965 Merge "Revert "Add nav bar case to RemoteAnimationTarget of non-app window"" into sc-dev 2021-03-05 19:03:30 +00:00
TreeHugger Robot
d6973bfc1e Merge "Fix some legacy-transition timing issues in split-screen" into sc-dev 2021-03-05 18:58:34 +00:00
Hongwei Wang
c504ed49fd Defer onTaskInfoChanged while transitioning to PiP 
The ApiDemos app triggers onTaskInfoChanged when transitioning from
landscape to portrait PiP due to its implementation (fixed in a separate
CL in same topic). Here we defer applying the TaskInfo received in
onTaskInfoChanged till the entering transition finishes.

Video: http://rcll/aaaaaabFQoRHlzixHdtY/c1n3cqwBydRxDrwxKHqI0H
Bug: 180630127
Test: enter PiP w/ autoEnter from landscape in button navigation
Test: atest WMShellUnitTests:com.android.wm.shell.pip.PipTaskOrganizerTest
Change-Id: I3bc07dbb45a281d5c9b0bbfff7478e57b8944c60
 2021-03-05 10:19:59 -08:00
Treehugger Robot
91fb524a4f Merge "Don't crash if the MediaCodecList is null." am: f80c56df73 am: ac569866d9 am: e0c584e656 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556749

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6ef505c00d87f48c5af36d37a9570906d559889b
 2021-03-05 18:13:34 +00:00
TreeHugger Robot
5cb735bfb6 Merge "Clean up dead code in NetInitiatedActivity" into rvc-qpr-dev am: 91568eb50e am: 485249abd1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13288128

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I566259b63f76a79795f604d3409ff2547995f9ba
 2021-03-05 18:12:43 +00:00