Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
673,711 Commits 3 Branches 0 Tags
090d3dfd8a019cc176a65c0641f91c75052cedec
Commit Graph

673711 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
653e6d8108 Merge "Partial revert "Wait for unlock to start jobs."" into sc-qpr1-dev am: 76849b6aea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15925291

Change-Id: Iedc1d581086ed9cc34bb99f801d6823b31767be8
 2021-09-29 17:00:15 +00:00
TreeHugger Robot
cbb7188ae0 Merge "API renaming asked by API Council" into stage-aosp-master am: d7cef086ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934238

Change-Id: Ie556f989ac6ce680b7de6caf37d71c6632ac927b
 2021-09-29 17:00:13 +00:00
Hui Wang
b27c280859 Merge "Match phoneId in the record if the subId is invalid" into sc-v2-dev am: e4c00f9abf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15897972

Change-Id: I6eab87254e34a0b880662a8515e7b57b171d8435
 2021-09-29 16:55:36 +00:00
TreeHugger Robot
76849b6aea Merge "Partial revert "Wait for unlock to start jobs."" into sc-qpr1-dev 2021-09-29 16:49:59 +00:00
TreeHugger Robot
d7cef086ca Merge "API renaming asked by API Council" into stage-aosp-master 2021-09-29 16:49:50 +00:00
Hui Wang
e4c00f9abf Merge "Match phoneId in the record if the subId is invalid" into sc-v2-dev 2021-09-29 16:46:15 +00:00
TreeHugger Robot
e46c5303f4 Merge "Centering clock on AOD in split shade mode" into sc-v2-dev am: 05f5356e39 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934862

Change-Id: I8c122891799d468c5594f38b5e02bb69b7b2a3de
 2021-09-29 15:45:13 +00:00
Beth Thibodeau
7e5e168c6e Merge "Fix error from null intent" into sc-v2-dev am: 4d7624e923 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15936109

Change-Id: I91d32c4fb2dbbd624a0fe9313c4ba5c4038b4371
 2021-09-29 15:43:53 +00:00
TreeHugger Robot
05f5356e39 Merge "Centering clock on AOD in split shade mode" into sc-v2-dev 2021-09-29 15:31:23 +00:00
Beth Thibodeau
4d7624e923 Merge "Fix error from null intent" into sc-v2-dev 2021-09-29 15:27:53 +00:00
TreeHugger Robot
432f79a9fb Merge "Check pending rotation change after recents animation" into sc-v2-dev am: 4a9d97b6ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15938862

Change-Id: I1b00530a891ecdc1c3989cd9b5e953708f4fd544
 2021-09-29 15:14:46 +00:00
TreeHugger Robot
4a9d97b6ea Merge "Check pending rotation change after recents animation" into sc-v2-dev 2021-09-29 15:01:37 +00:00
Caitlin Cassidy
cb21972d4b Merge "[Notifications] Notify NotifCollectionListeners when a pending entry has been removed." into sc-v2-dev am: cda31e829c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15924211

Change-Id: Ic249a093ef1477b9e04a0b1845dd80753df5abda
 2021-09-29 14:42:52 +00:00
Caitlin Cassidy
cda31e829c Merge "[Notifications] Notify NotifCollectionListeners when a pending entry has been removed." into sc-v2-dev 2021-09-29 14:30:57 +00:00
TreeHugger Robot
331ce67cd5 Merge "Separate refresh rate restrictions for different High Brightness Modes" into sc-qpr1-dev am: af5c64f76f am: 51b865a0ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15937366

Change-Id: Id56e066c5ed083a67d9494955e66e6d762ae1d61
 2021-09-29 13:50:38 +00:00
TreeHugger Robot
7df70492f8 Merge "Separate refresh rate restrictions for different High Brightness Modes" into sc-qpr1-dev am: af5c64f76f am: ac548fb61e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15937366

Change-Id: Idf0e29dc923174798da538de382612255b05c77c
 2021-09-29 13:50:05 +00:00
TreeHugger Robot
51b865a0ec Merge "Separate refresh rate restrictions for different High Brightness Modes" into sc-qpr1-dev am: af5c64f76f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15937366

Change-Id: I9dcfe5d51a3c48a39b3e06ce42d2b88368a08b8d
 2021-09-29 13:37:41 +00:00
TreeHugger Robot
ac548fb61e Merge "Separate refresh rate restrictions for different High Brightness Modes" into sc-qpr1-dev am: af5c64f76f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15937366

Change-Id: I7dcc13f83b31615c4f6acf88bf9c2c8a4ec9807a
 2021-09-29 13:37:38 +00:00
TreeHugger Robot
af5c64f76f Merge "Separate refresh rate restrictions for different High Brightness Modes" into sc-qpr1-dev 2021-09-29 13:18:54 +00:00
Matt Pietal
9b3c0a098a Merge "Update PIN colors" into sc-v2-dev am: c0d03ace54 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15934642

Change-Id: I6740c240eb962e011856d1a30a433585014ea52d
 2021-09-29 13:10:37 +00:00
Etienne Ruffieux
4c70432d82 API renaming asked by API Council 
Renamed all "cancelled" to "canceled" for PendingIntent.

Tag: #feature
Bug: 201405682
Test: atest android.app.cts.PendingIntentTest#testCancelListener
Change-Id: I0f5457f58836c6e80845dcd4d874a810008a320e
 2021-09-29 13:08:09 +00:00
Michal Brzezinski
94a8f252c5 Centering clock on AOD in split shade mode 
Fixes: 201419264
Test: NotificationPanelViewControllerTest
Change-Id: If0742883b429b4537eb4033fce06c64a32de20a8
Merged-In: If0742883b429b4537eb4033fce06c64a32de20a8
 2021-09-29 14:07:20 +01:00
Matt Pietal
c0d03ace54 Merge "Update PIN colors" into sc-v2-dev 2021-09-29 12:55:11 +00:00
Bernardo Rufino
95ace87925 Log.wtf in mismatch + tests 
Log mismatches as wtf to be able track those. Also added unit tests
around kindofEquals() and r/w mismatches.

Test: atest -d android.os.cts.ParcelTest android.os.cts.BundleTest android.os.BundleTest android.os.ParcelTest
Bug: 195622897
Change-Id: I361dd144b23975eedc8b19ed65457a1c5405936e
 2021-09-29 13:51:43 +01:00
Daniel Solomon
46fff422b4 Separate refresh rate restrictions for different High Brightness Modes 
Allow setting a different refresh rate for High Brightness Mode for HDR
and for Sunlight.

Bug: 196691596
Test: atest DisplayModeDirectorTest
Test: Manual:
      1. Ensure HBM for HDR takes presedence over HBM for Sunlight
      2. Ensure app refresh rate votes override bothHBM for Sunlight
Change-Id: I4a29c47f218046d0852178ad5dc7484a86ef8607
Merged-In: I4a29c47f218046d0852178ad5dc7484a86ef8607
 2021-09-29 12:40:20 +00:00
Jordan Demeulenaere
6bd5b1160a Merge changes from topics "dialog-launch", "launch-animator" into sc-v2-dev am: 3bf72bd3f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15663086

Change-Id: If7f060b1c162f27d9659a0f71448d9622cbe25f8
 2021-09-29 12:09:45 +00:00
Selim Cinek
12e0953ab8 Merge "Added new interpolator spec to be used throughout all of our motion" into sc-v2-dev am: 9637671938 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15920766

Change-Id: Ia2093511fd32721f728c205340f47c9ef1cd93ce
 2021-09-29 12:08:18 +00:00
Jordan Demeulenaere
3bf72bd3f9 Merge changes from topics "dialog-launch", "launch-animator" into sc-v2-dev 
* changes:
  Animate media dialogs
  Introduce DialogLaunchAnimator (1/2)
  Split ActivityLaunchAnimator (1/2)
 2021-09-29 11:58:24 +00:00
Selim Cinek
9637671938 Merge "Added new interpolator spec to be used throughout all of our motion" into sc-v2-dev 2021-09-29 11:48:04 +00:00
Ming-Shin Lu
a4f760bee7 RESTRICT AUTOMERGE: Fix snapshot starting window stuck if the task never gain focus 
The tasksnapshot starting window could stuck on task if the task never
gain focus, this could happen when launch multiple tasks to front, e.g.
split screen, or add snapshot starting window to a pip task.

As using task focus to judge the task snapshot removal may error-prone.
(i.e. unexpected window focus in/lost, non-focusable task window..)

To ensure the tasksnapshot removal works stable in this stage, extanding
MAX_DELAY_REMOVAL_TIME_IME_VISIBLE timeout from 450ms to 600ms
(Includes the worst time perviod from tasksnapshot drawn to the task window
focused around 150ms) would be safer and keeps the behavior of original
fixed Bug 192065018.

Bug: 201264769
Test: atest ActivityRecordTests
Test: manual launch apps from Recents.
Test: enter pip, power on/off, verify starting window is removed.
Test: manual enter split screen, verify starting window is removed.
Merged-In: Ieb5a5e781f5da4228cfc493031b4ad17f2d31a77
Change-Id: Ieb5a5e781f5da4228cfc493031b4ad17f2d31a77
 2021-09-29 19:20:36 +08:00
Riya Ghai
0ec28f5f60 Merge "Enabling ActivityTaskManagerService to retrieve PackageConfigUpdater for arbitrary packages." into sc-v2-dev am: 6825cd5941 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15777628

Change-Id: I03dbf606c0900bf07deca262ef058521b06e8d86
 2021-09-29 10:14:45 +00:00
Riya Ghai
6825cd5941 Merge "Enabling ActivityTaskManagerService to retrieve PackageConfigUpdater for arbitrary packages." into sc-v2-dev 2021-09-29 09:59:12 +00:00
TreeHugger Robot
a908eb6d4f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a63802001e -s ours am: 7cf80aea5a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I998c62d129c5bf746ffa8f8543ac354af8d6450c
 2021-09-29 08:55:50 +00:00
TreeHugger Robot
f88f853c63 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a63802001e -s ours am: 97b654d867 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0b9a700c39cc3fd3f8ca57b028c18feca0a8dd06
 2021-09-29 08:52:23 +00:00
Issei Suzuki
9ca9155783 Merge "Unify keygaurd occluded status variable." into sc-v2-dev am: c2d84da6ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15924835

Change-Id: Ic69c6ec93cfaf19d179f4ed488ca242a9b451692
 2021-09-29 08:52:09 +00:00
TreeHugger Robot
97b654d867 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a63802001e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I47ebefe75107406908e332cca6cc15b99b1e68ea
 2021-09-29 08:49:28 +00:00
TreeHugger Robot
7cf80aea5a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a63802001e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib8da71fdf18df035f970276c0380ed6afe58ee6c
 2021-09-29 08:46:20 +00:00
Issei Suzuki
2c6da6314c Merge "Refactor PhoneWindowManager#setKeyguardOccludedLw" into sc-v2-dev am: 6497a301fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15924832

Change-Id: If23ddebb3463e9560bc3ce8b4e396577d2473bdb
 2021-09-29 08:44:43 +00:00
Issei Suzuki
c2d84da6ee Merge "Unify keygaurd occluded status variable." into sc-v2-dev 2021-09-29 08:34:41 +00:00
Issei Suzuki
6497a301fd Merge "Refactor PhoneWindowManager#setKeyguardOccludedLw" into sc-v2-dev 2021-09-29 08:33:43 +00:00
TreeHugger Robot
a63802001e Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-09-29 08:27:06 +00:00
Riddle Hsu
36fd166302 Check pending rotation change after recents animation 
Rotation change was skipped while running recents animation to
avoid interrupting the animation and may apply unexpected
intermediate orientation to recents activity.

But the rotation change should be still applied after the animation
is finished. Otherwise the display may stay in old rotation. The
case may be more obvious since live tile is introduced, because
the animation keeps running until switch to app. E.g. enable auto
rotation and the top is a rotatable app in landscape, and then enter
recents and rotate the device to portrait. After going back to the
current app, the display is still in landscape.

Fix: 199371058
Test: RecentsAnimationControllerTest#testCheckRotationAfterCleanup

Change-Id: I5e7487b08e139b251d160bd0627326b83351640e
 2021-09-29 15:17:04 +08:00
TreeHugger Robot
d7df7b05bf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 4589b798fd -s ours am: ad0aaac0fe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3937ef45543b4ea05e58982912b9af43383e8faa
 2021-09-29 07:02:02 +00:00
TreeHugger Robot
56a19dcb27 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 4589b798fd -s ours am: 5fac21a0d4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6f394aa1e19cab677f14acb6f2bc9ae9499386df
 2021-09-29 07:01:30 +00:00
Edward Savage-Jones
46b4ba4201 Redact key value from log when DEBUG is false 
See bug for details

Bug: 170653379
Test: see bug
Change-Id: I713fd8c03444167faf35a170b885c38af5482e31
 2021-09-29 06:53:42 +00:00
TreeHugger Robot
ad0aaac0fe [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 4589b798fd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I46072261c7269d663ad5fb5d1e67820438277143
 2021-09-29 06:47:33 +00:00
TreeHugger Robot
5fac21a0d4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 4589b798fd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5ec6646989abe7f7ac54cde0e0483a3c05eb58c3
 2021-09-29 06:47:29 +00:00
TreeHugger Robot
828246482b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a0dfaa6f6f -s ours am: 854be1d16a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I99f4b079269f1dc0e40ed7706e0eedadd9d5fd3c
 2021-09-29 06:42:46 +00:00
TreeHugger Robot
4e6825a3cf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: a0dfaa6f6f -s ours am: 08aab19778 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia935b69e294002a15ed7dc86c13cba20e59ca351
 2021-09-29 06:42:10 +00:00
TreeHugger Robot
4589b798fd Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-09-29 06:32:42 +00:00