Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
648,700 Commits 3 Branches 0 Tags
7d6151c61ede945a1b29154fd658a425818db049
Commit Graph

648700 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Winson Chung
7d6151c61e Cancel the existing recents animation before any initialization 
- In the rare case that we are canceling the recents animation as a
  part of starting another recents animation, ensure that we do it
  before we move the target activity to be visible, otherwise the
  cancelation will undo the previous work.

Bug: 193851085
Test: atest RecentsAnimationControllerTest
Change-Id: I22589a034eab3b1fab10f4b677f777b282305bbd
Merged-In: I22589a034eab3b1fab10f4b677f777b282305bbd
(cherry picked from commit 4ebdbc9db1)
 2021-12-15 05:45:33 +00:00
Tomasz Wasilczyk
2555c0e410 [automerger skipped] Don't crash if default supervision profile owner is not set am: b5fa0a6c5e am: d9537a765e -s ours 
am skip reason: Merged-In If441946fa278c04ae88122f6243f5a7dedd96ebc with SHA-1 b5fa0a6c5e is already in history

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

Change-Id: Ib957cf4f2aded2bd2ea10ba2ca43b029c1f88308
 2021-12-14 20:35:05 +00:00
Tomasz Wasilczyk
c9e264737b [automerger skipped] Don't crash if default supervision profile owner is not set am: b5fa0a6c5e am: cb447a87bc -s ours 
am skip reason: Merged-In If441946fa278c04ae88122f6243f5a7dedd96ebc with SHA-1 bcb5ee6f43 is already in history

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

Change-Id: I58cc9d3a50a829e1eb9a9bc5625bc894fa099d97
 2021-12-14 20:25:00 +00:00
Tomasz Wasilczyk
d9537a765e Don't crash if default supervision profile owner is not set am: b5fa0a6c5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16460072

Change-Id: I8a1c43b4f43cee5c88f05eafed4b71a5b1144445
 2021-12-14 20:07:05 +00:00
Tomasz Wasilczyk
cb447a87bc Don't crash if default supervision profile owner is not set am: b5fa0a6c5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16460072

Change-Id: I553dd02243dbebc7267bff208a644ae41151dc92
 2021-12-14 20:05:04 +00:00
Tomasz Wasilczyk
b5fa0a6c5e Don't crash if default supervision profile owner is not set 
Bug: 175430552
Bug: 197399948
Test: build, flash, watch logcat

Change-Id: If441946fa278c04ae88122f6243f5a7dedd96ebc
Merged-In: If441946fa278c04ae88122f6243f5a7dedd96ebc
(cherry picked from commit bd27c36591)
(cherry picked from commit bcb5ee6f43)
 2021-12-14 19:18:47 +00:00
Remi NGUYEN VAN
7814c61670 [automerger skipped] Merge "Disable the test (1/n)" into rvc-dev am: d994d146c2 am: 33a0a408f4 -s ours 
am skip reason: Merged-In Ibb921b8e718c5c9cd86c5580010cb163125d8fae with SHA-1 50aa93d6af is already in history

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

Change-Id: Ic69427a4aadcbead09d1efef2ad866a2db4f977f
 2021-12-10 02:38:41 +00:00
Remi NGUYEN VAN
58a85e0738 [automerger skipped] Merge "Disable the test (1/n)" into rvc-dev am: d994d146c2 am: d793b3396e -s ours 
am skip reason: Merged-In Ibb921b8e718c5c9cd86c5580010cb163125d8fae with SHA-1 50aa93d6af is already in history

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

Change-Id: I99cdc5614f62c59aefa5ed900d7346732803137f
 2021-12-10 02:27:31 +00:00
Remi NGUYEN VAN
33a0a408f4 Merge "Disable the test (1/n)" into rvc-dev am: d994d146c2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16375870

Change-Id: I0608080ff7ed174d3456c2b2b2ab8783cf83bdcc
 2021-12-10 02:05:12 +00:00
Remi NGUYEN VAN
d793b3396e Merge "Disable the test (1/n)" into rvc-dev am: d994d146c2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16375870

Change-Id: I7f65b792e08ac5d9d3ae95d7cbb829bd86c0932e
 2021-12-10 02:05:08 +00:00
Remi NGUYEN VAN
d994d146c2 Merge "Disable the test (1/n)" into rvc-dev 2021-12-10 01:47:56 +00:00
Ganesh Olekar
336d802268 [automerger skipped] Merge "DO NOT MERGE Re-implement reading/writing Throwables from/to Parcel, without Parcel private APIs." into rvc-dev am: 5b0fc9279c am: 0ce5f01cbe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I74da75e64940b81aef9dd92ba5cb914d5841d0a8
 2021-12-09 17:49:56 +00:00
Hai Zhang
2cbcda5198 [automerger skipped] DO NOT MERGE Re-implement reading/writing Throwables from/to Parcel, without am: 562f1bd91f am: c761c3a511 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2c7655e7f7ee109515b9e349c115453156547ecc
 2021-12-09 17:49:30 +00:00
Ganesh Olekar
6590d4b563 [automerger skipped] Merge "DO NOT MERGE Re-implement reading/writing Throwables from/to Parcel, without Parcel private APIs." into rvc-dev am: 5b0fc9279c am: a7ec803849 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7b70afc8f7e38d6039d14f2452aa471af72d6f17
 2021-12-09 17:48:34 +00:00
Hai Zhang
2ecd6d628a [automerger skipped] DO NOT MERGE Re-implement reading/writing Throwables from/to Parcel, without am: 562f1bd91f am: b641a97b4d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id1e1926577304e8cd2485044305db696cc25126c
 2021-12-09 17:48:14 +00:00
Ganesh Olekar
a7ec803849 Merge "DO NOT MERGE Re-implement reading/writing Throwables from/to Parcel, without Parcel private APIs." into rvc-dev am: 5b0fc9279c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16406531

Change-Id: I343a75e0c797203429cbf4b329dca66d72d65f77
 2021-12-09 17:27:05 +00:00
Ganesh Olekar
0ce5f01cbe Merge "DO NOT MERGE Re-implement reading/writing Throwables from/to Parcel, without Parcel private APIs." into rvc-dev am: 5b0fc9279c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16406531

Change-Id: I59663369e7fc3a97d0dd90fa7c3eb3eecad9cc79
 2021-12-09 17:26:56 +00:00
Hai Zhang
b641a97b4d DO NOT MERGE Re-implement reading/writing Throwables from/to Parcel, without am: 562f1bd91f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16406531

Change-Id: I64c3dd7fc5f7b48b70144b4ff4f9a25aa300efad
 2021-12-09 17:26:56 +00:00
Hai Zhang
c761c3a511 DO NOT MERGE Re-implement reading/writing Throwables from/to Parcel, without am: 562f1bd91f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16406531

Change-Id: I8d0d29e2e6fd16a01a33022532ff59e2c4a0a584
 2021-12-09 17:26:51 +00:00
Ganesh Olekar
5b0fc9279c Merge "DO NOT MERGE Re-implement reading/writing Throwables from/to Parcel, without Parcel private APIs." into rvc-dev 2021-12-09 17:06:48 +00:00
Matt Pietal
151e1ff45e [automerger skipped] Merge "[DO NOT MERGE] Controls - Do not recreate intent" into rvc-dev am: 2cc3ce9885 am: 920d225e72 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I06a1e741f5830e11e97f7c3a9ddf13e88c68b7b2
 2021-12-09 14:09:24 +00:00
Matt Pietal
86b98bc25d [automerger skipped] [DO NOT MERGE] Controls - Do not recreate intent am: d7b16dd2a5 am: 9b02d83a06 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib3772d35e0009e1f6662717292a4bcdc7fc9bda2
 2021-12-09 14:09:04 +00:00
Matt Pietal
731c282334 [automerger skipped] Merge "[DO NOT MERGE] Controls - Do not recreate intent" into rvc-dev am: 2cc3ce9885 am: 7c7026dca2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibf44c2c55a86afe80e3cf42a96520c177241aba9
 2021-12-09 13:59:34 +00:00
Matt Pietal
d37968687f [automerger skipped] [DO NOT MERGE] Controls - Do not recreate intent am: d7b16dd2a5 am: f738919e90 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I64c221298cfbd1f02dc9fd44edf3cc2427721515
 2021-12-09 13:59:15 +00:00
Matt Pietal
920d225e72 Merge "[DO NOT MERGE] Controls - Do not recreate intent" into rvc-dev am: 2cc3ce9885 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16012418

Change-Id: I44b00d64b67ad140d274446f2cbbc86d52a4044c
 2021-12-09 13:44:12 +00:00
Matt Pietal
9b02d83a06 [DO NOT MERGE] Controls - Do not recreate intent am: d7b16dd2a5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16012418

Change-Id: I7d17da929ecd548c21c0d088557ff20209952efe
 2021-12-09 13:44:10 +00:00
Matt Pietal
7c7026dca2 Merge "[DO NOT MERGE] Controls - Do not recreate intent" into rvc-dev am: 2cc3ce9885 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16012418

Change-Id: I232dbc1a373277e5afee90aba19467cebf73c6d9
 2021-12-09 13:42:53 +00:00
Matt Pietal
f738919e90 [DO NOT MERGE] Controls - Do not recreate intent am: d7b16dd2a5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16012418

Change-Id: I1908d840a1afd4654656cf3165a0e7b540479804
 2021-12-09 13:42:41 +00:00
TreeHugger Robot
060ab6630b Merge "Controls - Do not recreate intent" into sc-dev 2021-12-09 13:25:32 +00:00
Matt Pietal
2cc3ce9885 Merge "[DO NOT MERGE] Controls - Do not recreate intent" into rvc-dev 2021-12-09 13:23:41 +00:00
Wu Ahan
862c1c871a [automerger skipped] DO NOT MERGE: Decode the input of both setStream and setResource calls first am: c2188d60ee -s ours am: 5e154e8d5b -s ours am: c47c8f1b83 -s ours am: 712a05c34b -s ours am: bf23a64da9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icb029fe09d9ed08ed83dba0acaca9d40fbc2c2ce
 2021-12-09 02:41:18 +00:00
Wu Ahan
d2a7720607 [automerger skipped] DO NOT MERGE: Decode the input of both setStream and setResource calls first am: 4d91b5aa0b am: 6910c87745 -s ours am: 87bdfa2e73 -s ours am: d6e95039fd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I38d0ff61f43327d105bc994333a11a2217d17023
 2021-12-09 02:40:27 +00:00
Wu Ahan
b1eac463c2 [automerger skipped] DO NOT MERGE: Decode the input of both setStream and setResource calls first am: c2188d60ee -s ours am: 5e154e8d5b -s ours am: c47c8f1b83 -s ours am: 712a05c34b -s ours am: 30bc37e513 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifd4e1cf6b0799cdd262db762fa86507e286689e8
 2021-12-09 02:30:23 +00:00
Wu Ahan
e14cbc8d3b [automerger skipped] DO NOT MERGE: Decode the input of both setStream and setResource calls first am: 4d91b5aa0b am: 6910c87745 -s ours am: 87bdfa2e73 -s ours am: 6a6a36aa0d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5826395674470b827ae4af51bbff58294660f0b9
 2021-12-09 02:30:09 +00:00
Wu Ahan
bf23a64da9 [automerger skipped] DO NOT MERGE: Decode the input of both setStream and setResource calls first am: c2188d60ee -s ours am: 5e154e8d5b -s ours am: c47c8f1b83 -s ours am: 712a05c34b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic3b410a55cabae5936c92c8a6f71cfb5ca75b973
 2021-12-09 02:16:45 +00:00
Wu Ahan
d6e95039fd [automerger skipped] DO NOT MERGE: Decode the input of both setStream and setResource calls first am: 4d91b5aa0b am: 6910c87745 -s ours am: 87bdfa2e73 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iae030b6ec70c1971502b806b2d78d21d53988ee4
 2021-12-09 02:16:32 +00:00
Wu Ahan
30bc37e513 [automerger skipped] DO NOT MERGE: Decode the input of both setStream and setResource calls first am: c2188d60ee -s ours am: 5e154e8d5b -s ours am: c47c8f1b83 -s ours am: 712a05c34b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id5f7904f92448ca37d0aabd78f141e487c8211eb
 2021-12-09 02:15:22 +00:00
Wu Ahan
6a6a36aa0d [automerger skipped] DO NOT MERGE: Decode the input of both setStream and setResource calls first am: 4d91b5aa0b am: 6910c87745 -s ours am: 87bdfa2e73 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1ed7cbc58f7ff9c409cea2c9ed0f0fd0a2eeac2c
 2021-12-09 02:15:02 +00:00
Wu Ahan
fe082e2419 [automerger skipped] DO NOT MERGE: Decode the input of both setStream and setResource calls first am: fa9c73975e am: ab3c7eb753 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I11f3e864bb515f9a11bf12ee13d6bed4afe10814
 2021-12-09 02:00:43 +00:00
Wu Ahan
fd6b42db79 [automerger skipped] DO NOT MERGE: Decode the input of both setStream and setResource calls first am: fa9c73975e am: 3b44a185d6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id7cf51a6499acf21c1ec9b4a34b0a784d5dc7a06
 2021-12-09 01:59:37 +00:00
Wu Ahan
712a05c34b [automerger skipped] DO NOT MERGE: Decode the input of both setStream and setResource calls first am: c2188d60ee -s ours am: 5e154e8d5b -s ours am: c47c8f1b83 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icba229be82049ac6a10f78cff97d966b4b18da71
 2021-12-09 01:59:36 +00:00
Wu Ahan
87bdfa2e73 [automerger skipped] DO NOT MERGE: Decode the input of both setStream and setResource calls first am: 4d91b5aa0b am: 6910c87745 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia159ef8e86ed8a11d9801ad7161c1fdc8400e864
 2021-12-09 01:59:15 +00:00
Wu Ahan
c47c8f1b83 [automerger skipped] DO NOT MERGE: Decode the input of both setStream and setResource calls first am: c2188d60ee -s ours am: 5e154e8d5b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3e4cd98ac92190a74919f8c164716c813126e87a
 2021-12-09 01:51:31 +00:00
Wu Ahan
5e154e8d5b [automerger skipped] DO NOT MERGE: Decode the input of both setStream and setResource calls first am: c2188d60ee -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1c6e013a08bd36dd068fbea081c8d2c675b1499b
 2021-12-09 01:44:37 +00:00
Wu Ahan
ab3c7eb753 DO NOT MERGE: Decode the input of both setStream and setResource calls first am: fa9c73975e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16379914

Change-Id: Id032b0596422f2ce7de1e4e078c34bb61812cce7
 2021-12-09 01:44:21 +00:00
Wu Ahan
6910c87745 DO NOT MERGE: Decode the input of both setStream and setResource calls first am: 4d91b5aa0b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16379915

Change-Id: Id96d35b0fe3a31764221a584faed10dd8780f849
 2021-12-09 01:43:00 +00:00
Wu Ahan
3b44a185d6 DO NOT MERGE: Decode the input of both setStream and setResource calls first am: fa9c73975e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16379914

Change-Id: Ie69bb33c922f79bf535608a8d0f28086d1043438
 2021-12-09 01:42:51 +00:00
Wu Ahan
01fc465ef6 Merge "DO NOT MERGE: Decode the input of both setStream and setResource calls first" into sc-dev 2021-12-09 01:26:32 +00:00
Evan Severson
e1d8d04603 Merge "Finish SensorUse activity when dialog is dismissed" into sc-dev 2021-12-07 20:46:09 +00:00
TreeHugger Robot
d8d54c9aac Merge "Add missing size check when parsing staged aliases" into sc-dev 2021-12-07 19:45:56 +00:00