Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
754,203 Commits 3 Branches 0 Tags
172a02ec19ecd417aa4bb16d28dc19f6ffce3107
Commit Graph

754203 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kweku Adams
172a02ec19 Merge "Adjust queue for test jobs." into tm-dev 2022-03-24 21:13:04 +00:00
Antonio Kantek
f9cb8fa27b Merge "Update setInTouchMode javadoc" into tm-dev 2022-03-24 21:07:40 +00:00
Grace Cheng
837443e700 Merge "Resolving duplicate “Fingerprint Sensor” talkback in Side-FPS SUW" into tm-dev 2022-03-24 20:57:25 +00:00
Kweku Adams
b83faa12d7 Merge "Update debug printing." into tm-dev 2022-03-24 20:44:09 +00:00
Rambo Wang
d3c1e7b7f7 [automerger skipped] Merge "Clear up CarrierPrivilegesListener APIs" am: d25623ae62 am: d1ca6ed04a am: 86a6fc7f04 -s ours 
am skip reason: Merged-In I89df21764d3b9945219d810d0dd9bfe3cf5fbea4 with SHA-1 5a4bcc0a9c is already in history

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

Change-Id: Ieafa5527401137d56b128a28b1ab5458c4040fd9
Signed-off-by: Automerger Merge Worker
 2022-03-24 20:42:30 +00:00
Hawkwood Glazier
4c07041a1b Merge "Add Play/Pause Icon & Background Animations" into tm-dev 2022-03-24 20:34:26 +00:00
Beverly Tai
1620daee63 Merge "Add Keyguard DPM state change callback" into tm-dev 2022-03-24 20:30:55 +00:00
Sudheer Shanka
f0692adb89 Merge "Ensure standby bucket of an unused app gets treated correctly." into tm-dev 2022-03-24 20:30:31 +00:00
Bryce Lee
574ae112d9 Merge "Remove complication id from entry mapping on removal." into tm-dev 2022-03-24 20:28:46 +00:00
Rambo Wang
86a6fc7f04 Merge "Clear up CarrierPrivilegesListener APIs" am: d25623ae62 am: d1ca6ed04a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2040804

Change-Id: I036d6a6612a32e87f371a36c8233a43c049e5c52
Signed-off-by: Automerger Merge Worker
 2022-03-24 20:23:09 +00:00
Robert Wu
477735ae40 Merge "BluetoothMidiService: Remove target version" into tm-dev 2022-03-24 20:12:16 +00:00
Rambo Wang
d1ca6ed04a Merge "Clear up CarrierPrivilegesListener APIs" am: d25623ae62 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2040804

Change-Id: I8b4527c292650ed2d315db29011508738c82d871
 2022-03-24 20:01:03 +00:00
TreeHugger Robot
4bf66d6e90 Merge "Fix ongoing autogenerated summaries" into tm-dev 2022-03-24 19:49:18 +00:00
Rambo Wang
d25623ae62 Merge "Clear up CarrierPrivilegesListener APIs" 2022-03-24 19:48:30 +00:00
Brad Ebinger
c2c9fbe61e Merge "Re-Introduce synchronization locking" into tm-dev 2022-03-24 19:43:11 +00:00
Mateusz Cicheński
34fd7c525e Merge "Pass the keep clear areas through proper implementation. The PipController is not registered as DisplayWindowListener, but this inner implementation is." into tm-dev 2022-03-24 19:36:53 +00:00
Oscar Azucena
cb7a1fe954 Merge "Added logic to reset assistant UIDs on audio crash" into tm-dev 2022-03-24 19:22:21 +00:00
Joe Bolinger
e6b724422d Merge "Re-enable biometric prompt tests." into tm-dev 2022-03-24 19:16:31 +00:00
Matt Casey
2c0cd3c641 Merge "Update BroadcastDispatcher docs to say not to call goAsync()" into tm-dev 2022-03-24 19:01:56 +00:00
Fabian Kozynski
0fe996258f Merge "Fix media clipping bounds" into tm-dev 2022-03-24 18:51:58 +00:00
Eric Laurent
baa08295b2 [automerger skipped] Merge "audioservice: improve SCO audio control logic" into sc-v2-dev am: 0c19f57c37 -s ours am: 369fedb4dd -s ours 
am skip reason: Merged-In I5ddeaffac4fe26316f084505d692d2fc80cff467 with SHA-1 a0b2ee74b2 is already in history

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

Change-Id: Iff8ddf4c93e4c906f78bb6a6cc619367af6169ef
 2022-03-24 18:43:35 +00:00
Eric Laurent
7372e21e02 Merge changes from topic "presubmit-am-ff7699f855c14d1ca2c8a3438a9402f0" into sc-v2-dev-plus-aosp am: 85162b651b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17348714

Change-Id: Iab47a68e04c6db84708998e35cac91d30fe136f2
 2022-03-24 18:43:17 +00:00
Eric Laurent
369fedb4dd [automerger skipped] Merge "audioservice: improve SCO audio control logic" into sc-v2-dev am: 0c19f57c37 -s ours 
am skip reason: Merged-In I5ddeaffac4fe26316f084505d692d2fc80cff467 with SHA-1 a0b2ee74b2 is already in history

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

Change-Id: I892d12716ef3877aed7d197eabc294f6522b9dca
 2022-03-24 18:42:33 +00:00
Ameer Armaly
a100d07018 Merge "Service Gesture Detection: don't lock when executing double tap in the framework." into tm-dev 2022-03-24 18:41:58 +00:00
Eric Laurent
85162b651b Merge changes from topic "presubmit-am-ff7699f855c14d1ca2c8a3438a9402f0" into sc-v2-dev-plus-aosp 
* changes:
  [conflict] audioservice: improve SCO audio control logic 2p: a0b2ee74b2
  audioservice: improve SCO audio control logic
 2022-03-24 18:23:50 +00:00
Eric Laurent
0c19f57c37 Merge "audioservice: improve SCO audio control logic" into sc-v2-dev 2022-03-24 18:23:49 +00:00
Shan Huang
116b6300d0 Merge "Migrate MediaController to use OnBackInvokedDispatcher" into tm-dev 2022-03-24 18:14:27 +00:00
Rob Carr
14c5e3d34d Merge changes from topic "release_buffer_cache_id" into tm-dev 
* changes:
  Async BLAST Sync[3/N]: Push sync-id around
  Replace VRI and SV sync logic with SurfaceSyncer
 2022-03-24 18:06:21 +00:00
Christian Göllner
0f3393a461 Merge "[Motion] Split-shade transition on LS: add an overshoot/overscroll effect" into tm-dev 2022-03-24 17:39:37 +00:00
Ricky Wai
9914f1c659 Merge "Update PackageInstaller.setPackageSource() API docs." into tm-dev 2022-03-24 17:39:01 +00:00
Alex Johnston
c7df8de886 Merge "Require TRIGGER_LOST_MODE permission for sendLostModeLocationUpdate" into tm-dev 2022-03-24 17:20:56 +00:00
TreeHugger Robot
ce24f91981 Merge "Update the strings to match the Figma mock" into tm-dev 2022-03-24 17:18:35 +00:00
Hui Yu
63258db33d Merge "[Bugfix] Don't delete mPendingUids if PendingTopPid is added later than updateOomAdj started" am: 8f321a616b am: c9c23976a9 am: a0be2d5cc5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2036403

Change-Id: I278a9e0c7cf4f42431a40c054738873888bf033f
 2022-03-24 17:17:09 +00:00
Robert Wu
abe6b486b6 BluetoothMidiService: Remove target version 
Platform APIs should not explicitly define the API version.
In Android.bp, platform_apis is set to true so the correct API
version will be chosen automatically.

Bug: 215743611
Change-Id: Ie974cbb41a1c2cb2d59991970d3d632a831c4462
Test: Verified Echo and Identity tests with MIDIMatrix
 2022-03-24 17:16:52 +00:00
Aaron Liu
d1700b3355 Merge "Scrim: Do not interact with scrim with hint" into tm-dev 2022-03-24 17:15:32 +00:00
Kweku Adams
55a8837390 Update debug printing. 
The debug was printing the context assignments based on the old
mechanism instead of the new one, which meant it wasn't printing
anything.

Bug: 141645789
Test: enable logging and view logcat
Change-Id: I53b2f166cc2c891ef222f35c0889f26dbbf4ccb2
 2022-03-24 16:55:25 +00:00
Hui Yu
a0be2d5cc5 Merge "[Bugfix] Don't delete mPendingUids if PendingTopPid is added later than updateOomAdj started" am: 8f321a616b am: c9c23976a9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2036403

Change-Id: Ie87188285f12c8d533ce053c1626a8080e04b67c
 2022-03-24 16:46:13 +00:00
Kweku Adams
f2e02b8ab0 Adjust queue for test jobs. 
Test jobs should always be pulled first, so optimizing the iteration for
batching won't work with tests. Skip the optimization when dealing with
test jobs.

Bug: 226554375
Test: atest FrameworksServicesTests:PendingJobQueueTest
Change-Id: Icd55cb7f2f6efe00c87272f851661a964fb7c4d0
 2022-03-24 16:29:04 +00:00
TreeHugger Robot
95387ac862 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-03-24 16:28:32 +00:00
Bill Yi
0f95356a44 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-03-24 16:28:07 +00:00
Bill Yi
553068e973 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: b77e0a0811 -s ours am: d336d881bb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia79cb1db1d1dbdb480c3e41b87e5bda7587d98eb
 2022-03-24 16:14:17 +00:00
Bill Yi
1515a3d261 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0b189ccc07 -s ours am: 60efef9e57 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8baf9da9db84e6b46feab50c54da2da04818272f
 2022-03-24 16:14:04 +00:00
Bill Yi
4577b300a5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a4a6495c48 -s ours am: 56fee92327 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I832385611ee3418e4aef30caaf8791dda0a05ea7
 2022-03-24 16:13:49 +00:00
Bill Yi
c5682c10de [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3fbffa2052 -s ours am: df02d83684 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie40c811ca354f4114463754db55964baefd95634
 2022-03-24 16:13:37 +00:00
Bill Yi
08540dce60 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 1ee47eedbd -s ours am: 954cc41de5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0a6b31ff265ce874d1a7c2838aa3f2b21e3360b5
 2022-03-24 16:13:18 +00:00
Bill Yi
50c6379a75 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 7a3dbc57e3 -s ours am: b1bdca893a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idf08fffd8bab18945060c2140583471d076d8bd6
 2022-03-24 16:12:44 +00:00
Bill Yi
530902d163 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: ee70f7b335 -s ours am: da5e91cfd8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id27ecd6b7f40312dd5c7eb8887e25539accc02c1
 2022-03-24 16:11:59 +00:00
Lucas Dupin
d69ab74e7e Merge "Skip theme application if it's already current" into tm-dev 2022-03-24 16:08:17 +00:00
TreeHugger Robot
e61854471e Merge "RESTRICT AUTOMERGE Rename PermissionController resource constants" into tm-dev 2022-03-24 16:05:32 +00:00
TreeHugger Robot
50c8a48d3a Merge "Limit broadcast by user" into tm-dev 2022-03-24 15:59:03 +00:00