Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
583,098 Commits 3 Branches 0 Tags
f1e4da1e1995cc0258a5abdfa32a4b428d75e6a7
Commit Graph

583098 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
f1e4da1e19 Merge "Update language to comply with Android's inclusive language guidance" am: 558a921d81 am: 927f0f7453 am: 1ff037880a am: 6671acef6e am: 8513ac2afc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382388

Change-Id: I78e18d9c1490523aeeac4c720f4588bdacd45d2c
 2020-09-11 23:50:25 +00:00
Treehugger Robot
6ccbcbe71f Merge "Use a concurrent hash map to access VolumeDialogControllerImpl's callbacks" am: ce7d32096e am: 333fdf8c59 am: 19797c2dd6 am: 3f0535c610 am: e805a77383 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1247026

Change-Id: I1b868fed6f3b46e95d737f349d8476aea5804041
 2020-09-11 23:50:09 +00:00
Narayan Kamath
6e51a31b43 Merge "AppOpsService: Add a special case for OP_RECORD_AUDIO_HOTWORD." into rvc-qpr-dev am: 76cf584185 am: 2ddb682b95 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12470810

Change-Id: I8054ffe449c12077d75b3a3f2e84e61522c0f848
 2020-09-11 23:49:20 +00:00
Treehugger Robot
1b4d361a4f [automerger skipped] Merge "Add '-unstable' to solve ODR violation" am: 68ca4e10b0 am: ee0cc87d07 -s ours am: 5de3899f44 -s ours am: 590d59c39c -s ours am: 8f58cc1e9e -s ours 
am skip reason: Change-Id I3a9ae6e17e49c731e825ef00b9b9574c3f2e2719 with SHA-1 b3288fbdd5 is in history

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

Change-Id: I9c8660ad77e9c9fbeabbbaf0146dfaf61e372819
 2020-09-11 23:30:45 +00:00
Automerger Merge Worker
7bc37457ac Merge "Merge "Comply with inclusive language guidance in media session and browser" am: 93a807bcf7 am: 75fa27a100 am: aa1edf9312 am: 0a0c1ce8bb am: 4d52c486fb" 2020-09-11 23:23:29 +00:00
Evan Rosky
7412e8e399 Merge "Reset Task surface to fullscreen when appeared" 2020-09-11 23:21:19 +00:00
Gyumin Sim
b775801eb6 Merge "Comply with inclusive language guidance in media session and browser" am: 93a807bcf7 am: 75fa27a100 am: aa1edf9312 am: 0a0c1ce8bb am: 4d52c486fb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1425508

Change-Id: I7adf4d8f3be325fc6fd220a03dc11dadf20e8cd8
 2020-09-11 23:20:44 +00:00
TreeHugger Robot
cb00aa3386 Merge "Use cursor position from mouse events for hit test" 2020-09-11 23:19:53 +00:00
Yi Kong
3585c1625b [automerger skipped] Merge changes I10ab56a8,I7e437c3d,I0413c52f am: bece59741a am: 3979981b2d am: 70d4f9abc9 am: 70833656a8 am: a47bb4fae8 -s ours 
am skip reason: Change-Id Ibb50fb1d05e52be76a63dbf95884b788965eb979 with SHA-1 828dc724d8 is in history

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

Change-Id: I303cc037ef625deafef8e72cfb6ebf5f00e52e5b
 2020-09-11 23:13:59 +00:00
Yi Kong
7c799ff1b4 [automerger skipped] profcollectd: Rename config env to persist.* am: b6bb23ce27 am: 790ac8d3b2 am: bdf21de769 am: 99e8bf8ddb am: 0d3c868631 -s ours 
am skip reason: Change-Id I7e437c3df425ff0f604d24502d49a15050b5279d with SHA-1 0b7cedd240 is in history

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

Change-Id: Ib9dfce76f8ba38358b7bc4881f8b19ddc13ea601
 2020-09-11 23:12:00 +00:00
Yi Kong
f5e9c6f25f [automerger skipped] Introduce ProfcollectForwardingService am: a0bd2a99ee am: fbeb0d8002 am: 4914fdc68c am: 4e400a6f4e am: ab6c5c191b -s ours 
am skip reason: Change-Id I0413c52f08b930b1e42971acc7f50e2e2da52f99 with SHA-1 86f85936a1 is in history

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

Change-Id: I29addd263ddf594de446ee05dd146f7005f8454b
 2020-09-11 23:10:04 +00:00
Treehugger Robot
1561b8a012 [automerger skipped] Merge "RESTRICT AUTOMERGE Remove alarms from mPendingNonWakeupAlarms" am: 87a85276a9 am: 72b4976c66 am: f22a7ac463 am: 9baaf89491 am: c7645ff3ca -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I98f42f149f2379bcf9cd17ddda5528d9f2d14033
 2020-09-11 22:48:46 +00:00
Suprabh Shukla
727a5d84cd [automerger skipped] RESTRICT AUTOMERGE Remove alarms from mPendingNonWakeupAlarms am: ac3d84392a am: 19411410c5 am: 706e8792eb am: 58748edc02 am: e2e6c8e0e9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia350378b4087e78c0d4a96b3907a3fad0fee5056
 2020-09-11 22:47:07 +00:00
Kelly Rossmoyer
0ebb3b81e1 [automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" am: f8476d358f am: 779a1aedd5 am: 9f1608f214 am: c19fd3c4cb am: 641b9da421 -s ours 
am skip reason: Change-Id I26ef8e079bf13f19bdc3bbc8219f572a43b68090 with SHA-1 1e57db95a1 is in history

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

Change-Id: Ibd2f158f0ea802be5f633528ca81a6bb18fdc084
 2020-09-11 22:34:44 +00:00
Treehugger Robot
5ab2b0f175 Merge "Expose some carrier config keys for RTT" am: 4fb19f1550 am: 56f0f3a67b am: 370924cafc am: b2474e5f88 am: 5a2cd5617d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1423856

Change-Id: Ia6c3cd4f2b0d272fc05a269cbdbd8766e81754f5
 2020-09-11 22:28:24 +00:00
Xin Li
5dc4e52e20 [automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours am: b9db5b54f6 -s ours am: a9f9ccbc9a -s ours am: 8db7491422 -s ours am: a0c9117211 -s ours 
am skip reason: Change-Id Ice3e441cc9c0df8d0a6acc016bb74375e081bd67 with SHA-1 ec82033d3e is in history

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

Change-Id: Iaa8c8357dffc8b79db12607cf6bf182ed6a62e74
 2020-09-11 21:27:28 +00:00
[1;3C
30233c6fbd Reset Task surface to fullscreen when appeared 
Some other modes leave the task surface in a bad state, so if
fullscreen gets onTaskAppeared, reset everything to fullscreen

Bug: 168278812
Test: Open an app, put it into pip, close pip by dragging to X,
      open the app from recents.
Change-Id: Icf4df30eb44fa0a589e7d0bd9be1eb2e72fc492a
 2020-09-11 14:26:24 -07:00
Garfield Tan
d1bf6f87ea Use cursor position from mouse events for hit test 
Otherwise user may accidentally trigger task resizing when performing
multi-finger gestures on touchpads.

Bug: 166337994
Test: handleTapOutsideTask() is skipped on touchpad gestures.
Change-Id: I5251623addb3d10af4c1735ce2a6b919a511460f
 2020-09-11 20:56:46 +00:00
TreeHugger Robot
1043401f94 Merge "Minor improvements on DevicePolicyManagerService." 2020-09-11 20:53:11 +00:00
Kevin Chyn
3988ed7df9 Merge "Add maxTemplatesAllowed to Fingerprint/Face SensorProperties" 2020-09-11 20:28:10 +00:00
Sudheer Shanka
b60c823aab Merge "Include batterystats constants in the service dump." 2020-09-11 20:11:58 +00:00
Julia Reynolds
04a0cec28b Merge "Expand logging for notifications" 2020-09-11 20:02:58 +00:00
Youngjun Kwak
9fed742034 Merge "Fix subclass/superclass check for NotificationPanelViewMediator." 2020-09-11 19:59:08 +00:00
TreeHugger Robot
b3bd7b4508 Merge "Handle duplicate Uris in DND rules" 2020-09-11 19:50:55 +00:00
Felipe Leme
e4dc3ec0b6 Minor improvements on DevicePolicyManagerService. 
- Add @UserIdInt on some methods.
- Log reason for provisioning failure.
- Inline logIfVerbose so the code is removed when the constant is false.

Test: manual verification
Bug: 151119006

Change-Id: I4889521e973391cb5149098541302e34d78b9a22
 2020-09-11 12:25:35 -07:00
Jing Ji
8353fe0064 Merge "Move PSS/RSS/CPU sampling to AppProfiler" 2020-09-11 19:12:54 +00:00
Julia Reynolds
947f40c71c Handle duplicate Uris in DND rules 
If a user creates 2 DND rules of the same type with the same criteria,
DND would either not start properly or end properly when that criteria
started/ended.

This makes sure all rules with matching criteria have their Conditions
updated.

Test: atest
Fixes: 141343447
Change-Id: Id8c56433ec3f238d3bfc08deb70212c8a7f27843
 2020-09-11 18:30:36 +00:00
Treehugger Robot
8513ac2afc Merge "Update language to comply with Android's inclusive language guidance" am: 558a921d81 am: 927f0f7453 am: 1ff037880a am: 6671acef6e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382388

Change-Id: Icb0ab4bed8a74674fcfbdd7c8e0885a2994ec0cb
 2020-09-11 18:17:49 +00:00
Treehugger Robot
e805a77383 Merge "Use a concurrent hash map to access VolumeDialogControllerImpl's callbacks" am: ce7d32096e am: 333fdf8c59 am: 19797c2dd6 am: 3f0535c610 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1247026

Change-Id: I032cdc7bf9972a3c990db8e3bef396ee14795690
 2020-09-11 18:17:30 +00:00
kwaky
e77c1a0f2f Fix subclass/superclass check for NotificationPanelViewMediator. 
Bug: 165806308
Test: Manual + Unit Tests Passing
Change-Id: I8f443762f1b487ab9d3fe4f6f84b0aa86e3d0c8a
 2020-09-11 11:09:12 -07:00
Treehugger Robot
6671acef6e Merge "Update language to comply with Android's inclusive language guidance" am: 558a921d81 am: 927f0f7453 am: 1ff037880a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382388

Change-Id: I4ec82de3182802b71ebe8c5a9ac2b9bdaaa58cdf
 2020-09-11 17:29:36 +00:00
Treehugger Robot
3f0535c610 Merge "Use a concurrent hash map to access VolumeDialogControllerImpl's callbacks" am: ce7d32096e am: 333fdf8c59 am: 19797c2dd6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1247026

Change-Id: I727723ed6f0685b43b499453256ae3de8c7d65e5
 2020-09-11 17:29:18 +00:00
TreeHugger Robot
b5671dc8ba Merge "Fix thread safety issue on clearing cache" 2020-09-11 17:16:39 +00:00
Lucas Dupin
bf95b70f91 Merge "Add gyro effect to glass prototype" 2020-09-11 17:00:45 +00:00
Lucas Dupin
bf97afb5d5 Merge "Add file picker support to glass proto" 2020-09-11 17:00:10 +00:00
TreeHugger Robot
cdb296c461 Merge "Suppress group changes in group pruning" 2020-09-11 16:52:06 +00:00
Treehugger Robot
1ff037880a Merge "Update language to comply with Android's inclusive language guidance" am: 558a921d81 am: 927f0f7453 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382388

Change-Id: I03a1373dcc1cdcf0d73536d98d5205317183cdef
 2020-09-11 16:48:39 +00:00
Treehugger Robot
19797c2dd6 Merge "Use a concurrent hash map to access VolumeDialogControllerImpl's callbacks" am: ce7d32096e am: 333fdf8c59 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1247026

Change-Id: I88f4bab6d15ae71456f85f51391c942dc9c8875f
 2020-09-11 16:48:21 +00:00
Chavi Weingarten
854bcaa60b Merge "Revert "Send ScreenCaptureListener to native screen capture requ..."" 2020-09-11 16:10:26 +00:00
Julia Kawano
5260d2d73e Merge "Fix crash from UserNameViewController.removeAll()" 2020-09-11 16:07:26 +00:00
Treehugger Robot
927f0f7453 Merge "Update language to comply with Android's inclusive language guidance" am: 558a921d81 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1382388

Change-Id: If839338c8ea8a34afd896aac93e1118e8e2685bb
 2020-09-11 16:06:45 +00:00
Treehugger Robot
558a921d81 Merge "Update language to comply with Android's inclusive language guidance" 2020-09-11 15:57:59 +00:00
Treehugger Robot
333fdf8c59 Merge "Use a concurrent hash map to access VolumeDialogControllerImpl's callbacks" am: ce7d32096e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1247026

Change-Id: I7a106fa19d96b16e1c7a3ee05e6055abb624271e
 2020-09-11 15:50:07 +00:00
Beverly
f9e82999d6 Suppress group changes in group pruning 
If they are suppressed by the visual stability manager
Also fix VSM logic - actually remove the notifications from its parent
when we're suppressing its new group

Test: atest ShadeListBuilderTest
Test: atest VisualStabilityCoordinatorTest
Test: manual, atest SystemUITest
Change-Id: I4ca9905a2347173a3871de43c11df3a2a1da623b
 2020-09-11 11:31:32 -04:00
Treehugger Robot
ce7d32096e Merge "Use a concurrent hash map to access VolumeDialogControllerImpl's callbacks" 2020-09-11 15:14:07 +00:00
Lais Andrade
e5c953b7ec Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

BUG: 162536543
Test: N/A
Change-Id: Ied240c486df4072ca6301511aa3419f746404afa
 2020-09-11 14:31:20 +00:00
TreeHugger Robot
88da930ca8 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-11 14:13:01 +00:00
TreeHugger Robot
0ec89573aa Merge "VT: MediaPlayer: Add IMS Rx event listener" 2020-09-11 13:35:58 +00:00
Jeff Blattman
2ab3cc241e Use a concurrent hash map to access VolumeDialogControllerImpl's callbacks 
The issue is that the VolumeDialogControllerImpl.C's mCallbackMap is
accessed from two different threads. Instrumentation shows that via
add() and remove() it is modified on the main thread, and methods like
C.onConfigurationChanged() are called from
VolumeDialogControllerImpl.Receiver, which registers with
on a handler tied to a background thread
(VolumeDialogControllerImpl.W/mWorker). C.onConfigurationChanged()
is called directly from that thread.

Use a concurrent hash map in place of hash map to avoid the
concurrent modification exception.

Test: manual. Ensure device boots. Ensure basic volume control
functions. Ensure a configuration change (via locale change)
does not result in any crash.

Bug: https://issuetracker.google.com/issues/150402778

Change-Id: I26bb8533c30d57e48f500e6863d0f522e1559567
 2020-09-11 13:33:57 +00:00
Narayan Kamath
2ddb682b95 Merge "AppOpsService: Add a special case for OP_RECORD_AUDIO_HOTWORD." into rvc-qpr-dev am: 76cf584185 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12470810

Change-Id: I2ff7b7ba4c4dc40deb1c87aad98879b4a41710ad
 2020-09-11 13:10:30 +00:00