Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
762,413 Commits 3 Branches 0 Tags
4ef0a619dcbe2eebbca7d8ea9b9ed638b902de69
Commit Graph

762413 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hongwei Wang
4ef0a619dc Merge "Do not offset PiP when auto-enter-pip is ongoing" into tm-dev am: d05dbf68b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18357116

Change-Id: I9767b469e021e374368c2a6c9df00f9344de7d79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 00:37:15 +00:00
Hongwei Wang
d05dbf68b1 Merge "Do not offset PiP when auto-enter-pip is ongoing" into tm-dev 2022-05-13 00:28:35 +00:00
Chris Li
eb1a6f32bf Merge "Allow input during remote animation if the app is fully trusted" into tm-dev am: 6717425404 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18330767

Change-Id: Ib30b733fc0d354dc682ff82bdd17decef7bb277c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 00:28:03 +00:00
TreeHugger Robot
6c31143765 Merge "Fix alarm manager FGS reason codes" into tm-dev am: 3a015029c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18308543

Change-Id: Ie61e25d925e6880692bccd815eb586efc06c851a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 00:27:49 +00:00
TreeHugger Robot
83540503d1 [automerger skipped] Merge "DO NOT MERGE Crash invalid FGS notifications" into qt-dev am: e7da6dd26e am: 496cbf106c -s ours am: d5d87d85f3 -s ours am: dc535c71d1 -s ours am: b21a0dae0b -s ours am: a758eac912 -s ours am: 17389c0e03 -s ours am: f2d438e8d5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3eca05617a7c2ae38477143dfa159ca79b19d086
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 00:27:40 +00:00
Julia Reynolds
a0f2256785 [automerger skipped] DO NOT MERGE Crash invalid FGS notifications am: b6b2906ea6 am: bf6983a9ea -s ours am: cec8c138ed -s ours am: c822f7cd66 -s ours am: 86064a5284 -s ours am: b864b585ec -s ours am: 7b0e35612b -s ours am: e2b9b0e7f6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4915e219c750d7f3890eb906a7bc24ca0a54614a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-13 00:27:39 +00:00
Chris Li
6717425404 Merge "Allow input during remote animation if the app is fully trusted" into tm-dev 2022-05-13 00:11:15 +00:00
TreeHugger Robot
3a015029c5 Merge "Fix alarm manager FGS reason codes" into tm-dev 2022-05-13 00:04:55 +00:00
TreeHugger Robot
f2d438e8d5 [automerger skipped] Merge "DO NOT MERGE Crash invalid FGS notifications" into qt-dev am: e7da6dd26e am: 496cbf106c -s ours am: d5d87d85f3 -s ours am: dc535c71d1 -s ours am: b21a0dae0b -s ours am: a758eac912 -s ours am: 17389c0e03 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I40a126532ed6ade3d879a09604c0f311212cfd8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 23:57:45 +00:00
Julia Reynolds
e2b9b0e7f6 [automerger skipped] DO NOT MERGE Crash invalid FGS notifications am: b6b2906ea6 am: bf6983a9ea -s ours am: cec8c138ed -s ours am: c822f7cd66 -s ours am: 86064a5284 -s ours am: b864b585ec -s ours am: 7b0e35612b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I87513e0105b32a84569c7e219c4288e10ef0d804
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 23:57:28 +00:00
Shan Huang
19220d853a Merge "Fix IME callback not being re-registered on screen off / on." into tm-dev am: bd7ac0c646 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18310689

Change-Id: I48b28b3c6e1ed6c44b73e055b675f38638080f81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 23:30:32 +00:00
TreeHugger Robot
17389c0e03 [automerger skipped] Merge "DO NOT MERGE Crash invalid FGS notifications" into qt-dev am: e7da6dd26e am: 496cbf106c -s ours am: d5d87d85f3 -s ours am: dc535c71d1 -s ours am: b21a0dae0b -s ours am: a758eac912 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2fc605f9fa90c12a64fc83e2e38ac814ca357aa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 23:30:17 +00:00
Julia Reynolds
7b0e35612b [automerger skipped] DO NOT MERGE Crash invalid FGS notifications am: b6b2906ea6 am: bf6983a9ea -s ours am: cec8c138ed -s ours am: c822f7cd66 -s ours am: 86064a5284 -s ours am: b864b585ec -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idb18ede2de837160282b96d700669116dc232c31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 23:30:16 +00:00
Shan Huang
bd7ac0c646 Merge "Fix IME callback not being re-registered on screen off / on." into tm-dev 2022-05-12 23:22:07 +00:00
James O'Leary
b185ee027b Merge changes from topic "colorSchemeChanges" into tm-dev am: e320ce441d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18164075

Change-Id: I3e7cc5987a4f420ffea98b8e387cbe5d1c5b4eb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 23:06:05 +00:00
TreeHugger Robot
f046fedfe7 Merge "Don't trigger active unlock on udfps-down" into tm-dev am: ea4839b80c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18350522

Change-Id: I3a41ee966608dc68ac71758e359b1654e990292e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 23:05:40 +00:00
Alex Buynytskyy
30375852fb Merge "Addressing CL feedback." into tm-dev am: 4ced90c38a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18339383

Change-Id: I22e242c3f39f4b8087fb498e4372c55ca2b0d901
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 23:05:20 +00:00
Winson Chiu
79d42a23bc Merge changes I78cd6a32,I99656d57 into tm-dev am: c16c6a2a78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18351504

Change-Id: If47fd705a81f3cc3b5d98df3ca28780c0ac2d2eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 23:05:01 +00:00
Miranda Kephart
bc0edaae72 Merge "Ignore repeated dismissals for clipboard" into tm-dev am: 3ffed0bca8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18349555

Change-Id: Id54d80e6604d911654a0c5dbb9d96028a9a516d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 23:04:39 +00:00
James O'Leary
e320ce441d Merge changes from topic "colorSchemeChanges" into tm-dev 
* changes:
  Add 2 chroma to vibrant theme's specification
  Fix color scheme rotation
  Add content color scheme for media
 2022-05-12 23:04:10 +00:00
Jing Ji
66abf4d225 Merge "Always construct the UidProcessState instance in ProcessStats" into tm-dev am: 317e43a1ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18331909

Change-Id: I657f3737de42d8b0e81017f7f4d8da41b32b8cb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 23:03:34 +00:00
TreeHugger Robot
ea4839b80c Merge "Don't trigger active unlock on udfps-down" into tm-dev 2022-05-12 22:56:57 +00:00
TreeHugger Robot
a758eac912 [automerger skipped] Merge "DO NOT MERGE Crash invalid FGS notifications" into qt-dev am: e7da6dd26e am: 496cbf106c -s ours am: d5d87d85f3 -s ours am: dc535c71d1 -s ours am: b21a0dae0b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I06e5dd8fcb8f289486e3b182b3dd767ba60db299
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 22:40:47 +00:00
Julia Reynolds
b864b585ec [automerger skipped] DO NOT MERGE Crash invalid FGS notifications am: b6b2906ea6 am: bf6983a9ea -s ours am: cec8c138ed -s ours am: c822f7cd66 -s ours am: 86064a5284 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9220afa706e268c8b623d759b16f8f84b2c509bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 22:40:46 +00:00
Alex Buynytskyy
4ced90c38a Merge "Addressing CL feedback." into tm-dev 2022-05-12 22:35:36 +00:00
Winson Chiu
c16c6a2a78 Merge changes I78cd6a32,I99656d57 into tm-dev 
* changes:
  Fix PMS recordInitialState on retry
  Avoid taking PMS snapshot lock when snapshot is still valid
 2022-05-12 22:33:45 +00:00
Miranda Kephart
3ffed0bca8 Merge "Ignore repeated dismissals for clipboard" into tm-dev 2022-05-12 22:16:33 +00:00
Jing Ji
317e43a1ff Merge "Always construct the UidProcessState instance in ProcessStats" into tm-dev 2022-05-12 22:15:18 +00:00
TreeHugger Robot
7c38017d3f Merge "Crash invalid FGS notifications" into rvc-dev am: 97fc7b179e am: afc2de4708 am: c85f627e2b am: 005285a1ae am: e6b1e10c96 am: 2bdaacec70 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17864680

Change-Id: Iab5a2428fcf96d25a193a25d84fc6725a32691b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 22:07:45 +00:00
TreeHugger Robot
5c623433d2 Merge "Crash invalid FGS notifications" into rvc-qpr-dev am: e91ae52a85 am: 67d1edb349 am: 33a1ce86ec am: 3953a6a498 am: 44ffcf545b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17865553

Change-Id: I0d33c7c5723a58b99b465da116b3b9340105a5eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 22:07:31 +00:00
TreeHugger Robot
b062ef504b [automerger skipped] [conflict] Merge "Update ServiceState broadcast for location permissions" into sc-dev am: 0d2e7006ce am: 547648c23c -s ours am: a2c2b98770 -s ours am: d6dffa9fed -s ours 
am skip reason: Merged-In I9784527d6d79235830f562c1944562f5a6ac1fb3 with SHA-1 ac5f03c07f is already in history

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

Change-Id: Ic519d7c64487018e2b66c00da1479c2629321e3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 22:07:09 +00:00
Shaowei Shen
894dbdf988 Merge "[Output Switcher] Not using advanced icon for bt device" into tm-dev am: 9c87ea6261 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18309447

Change-Id: I24aae2fff63da247e4c6280d40a21d9f4215c603
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 22:06:58 +00:00
TreeHugger Robot
2bdaacec70 Merge "Crash invalid FGS notifications" into rvc-dev am: 97fc7b179e am: afc2de4708 am: c85f627e2b am: 005285a1ae am: e6b1e10c96 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17864680

Change-Id: Ic9d51a83b6dba513d5b1ff740ec1834cd02fa19f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 22:06:25 +00:00
TreeHugger Robot
44ffcf545b Merge "Crash invalid FGS notifications" into rvc-qpr-dev am: e91ae52a85 am: 67d1edb349 am: 33a1ce86ec am: 3953a6a498 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17865553

Change-Id: I83e6eb952dac0bd995eaf3ef2d3d1387adbbb0c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 22:05:45 +00:00
TreeHugger Robot
d6dffa9fed [automerger skipped] [conflict] Merge "Update ServiceState broadcast for location permissions" into sc-dev am: 0d2e7006ce am: 547648c23c -s ours am: a2c2b98770 -s ours 
am skip reason: Merged-In I9784527d6d79235830f562c1944562f5a6ac1fb3 with SHA-1 ac5f03c07f is already in history

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

Change-Id: I62b24fc8c5e95139ae7e205f17fce5a8ff4dac3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 22:05:04 +00:00
Shaowei Shen
9c87ea6261 Merge "[Output Switcher] Not using advanced icon for bt device" into tm-dev 2022-05-12 21:59:18 +00:00
TreeHugger Robot
b21a0dae0b [automerger skipped] Merge "DO NOT MERGE Crash invalid FGS notifications" into qt-dev am: e7da6dd26e am: 496cbf106c -s ours am: d5d87d85f3 -s ours am: dc535c71d1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6a301679549c6559ff6bb8ff88065fb1b00e70c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:47:25 +00:00
Julia Reynolds
86064a5284 [automerger skipped] DO NOT MERGE Crash invalid FGS notifications am: b6b2906ea6 am: bf6983a9ea -s ours am: cec8c138ed -s ours am: c822f7cd66 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7a121f0e365dbee6611b76f18fba86d83664aa3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:47:07 +00:00
Hasini Gunasinghe
106d0442aa Merge "Update the StatsPullAtomsService to accommodate RkpErrorStats." into tm-dev am: 54c3414ab9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18350707

Change-Id: I5f813c6d9ca9f44197a275a4a7502b2de3684a16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:40:31 +00:00
TreeHugger Robot
e6b1e10c96 Merge "Crash invalid FGS notifications" into rvc-dev am: 97fc7b179e am: afc2de4708 am: c85f627e2b am: 005285a1ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17864680

Change-Id: Ic9587032c75cc94a783e5b0c7dcb67143b2bf808
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:39:48 +00:00
TreeHugger Robot
3953a6a498 Merge "Crash invalid FGS notifications" into rvc-qpr-dev am: e91ae52a85 am: 67d1edb349 am: 33a1ce86ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17865553

Change-Id: I32bede8e58566632e5eccb62f4e98e458b9b8158
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:39:34 +00:00
TreeHugger Robot
a2c2b98770 [automerger skipped] [conflict] Merge "Update ServiceState broadcast for location permissions" into sc-dev am: 0d2e7006ce am: 547648c23c -s ours 
am skip reason: Merged-In I9784527d6d79235830f562c1944562f5a6ac1fb3 with SHA-1 ac5f03c07f is already in history

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

Change-Id: Idc41ebe7f73e96b9da99c88be7a1fc3b9a6ac0fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:39:10 +00:00
Hasini Gunasinghe
54c3414ab9 Merge "Update the StatsPullAtomsService to accommodate RkpErrorStats." into tm-dev 2022-05-12 21:34:14 +00:00
TreeHugger Robot
7e085870ef Merge "[Media] Add logs for potential memory leaks in MediaCarouselController." into tm-dev am: eccd61221b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18320596

Change-Id: If39fd14111ba7b1e5beb63371faa469116100a75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:30:12 +00:00
TreeHugger Robot
dc535c71d1 [automerger skipped] Merge "DO NOT MERGE Crash invalid FGS notifications" into qt-dev am: e7da6dd26e am: 496cbf106c -s ours am: d5d87d85f3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8f5ca43565f031130ea9b50017ff97fcd5a76301
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:28:31 +00:00
Julia Reynolds
c822f7cd66 [automerger skipped] DO NOT MERGE Crash invalid FGS notifications am: b6b2906ea6 am: bf6983a9ea -s ours am: cec8c138ed -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0515b68504ea8211a27595c6f2e415df11e033d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:28:27 +00:00
TreeHugger Robot
eccd61221b Merge "[Media] Add logs for potential memory leaks in MediaCarouselController." into tm-dev 2022-05-12 21:23:42 +00:00
Mark Renouf
fcb64ad8cd Use System.nanoTime(), avoid desyncing frame times am: 7ab7a81845 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18322679

Change-Id: I6c21c5783d30f1c19961582b66000cb4f49ebc26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:22:01 +00:00
TreeHugger Robot
ccf62fa523 Merge "Keystore: Wire X25519 key agreement" into tm-dev am: 1c0a4f1cee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18280945

Change-Id: Ic00928a20edcd2c2231ff3ed08770d8571b8c953
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:20:02 +00:00
TreeHugger Robot
005285a1ae Merge "Crash invalid FGS notifications" into rvc-dev am: 97fc7b179e am: afc2de4708 am: c85f627e2b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17864680

Change-Id: I5fa5de00bbc0e2301ebdc15c1405f8f01e25b416
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-12 21:12:02 +00:00