Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
749,628 Commits 3 Branches 0 Tags
faf705d030fa913d6d05ccfff23ecdca5dc2758f
Commit Graph

749628 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
faf705d030 Merge "Support ANRs from windows that are not tracked by WM" 2022-02-23 23:41:29 +00:00
TreeHugger Robot
f5a00efeb5 Merge "Listen to battery saver changes." into tm-dev am: d42478e1ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16988632

Change-Id: Ib91ccec0e555004ae29791d3711e2ff159381e27
 2022-02-23 23:40:56 +00:00
Julia Reynolds
2d2a0c4bb0 Merge "Add missing userId arg" into tm-dev am: b0ff7c86df 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16989049

Change-Id: I59e082a0907b62c8be1b7d082100e41a41923238
 2022-02-23 23:39:24 +00:00
Justin McClain
e8cd70fba2 Merge "Add vendor_required_attestation_certificates to be used by Attestation Verification Framework and Partner overlay." am: 9e70a83ea0 am: 75b5c61d45 am: 10e148d78a am: 455a973dca 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1965239

Change-Id: I6a26884aac4f55bf631ce490aba23bf87620b1f7
 2022-02-23 23:13:08 +00:00
TreeHugger Robot
57135bf899 Merge "Fix the bug on APP_CERTIFICATE_LINEAGE rule as we forgot to modify the binary rule parser to support the new rule." into tm-dev am: f084f35b7a am: 5d018607f6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16988947

Change-Id: Ia08cbfa1a0f71c3e8870747436989a745e809c89
 2022-02-23 22:44:00 +00:00
Ömer Yaveroğlu
3c088e3fa5 Fix the bug on APP_CERTIFICATE_LINEAGE rule as we forgot to modify the 
binary rule parser to support the new rule.

Bug: 218486995
Test: atest services/core/java/com/android/server/integrity/parser/RuleBinaryParser.java
Change-Id: Icd964b376829bfe04a1c06e5d86b73515eced8a7
 2022-02-23 22:41:16 +00:00
TreeHugger Robot
461cb38abc Merge "[CDM bug] Fix CDM crash when there's no CDM service" into tm-dev am: e2a47a2c3a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16988949

Change-Id: I9a1e51d7da578a5fc684fb2f772286f6110c13bf
 2022-02-23 22:31:55 +00:00
TreeHugger Robot
7a8cf63d49 Merge "Fix the bug on APP_CERTIFICATE_LINEAGE rule as we forgot to modify the binary rule parser to support the new rule." into tm-dev am: f084f35b7a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16988947

Change-Id: If461674a1665807fcb4e5bd16b67c42589b8ce53
 2022-02-23 22:20:03 +00:00
Sharon Su
7d1d33b11c Merge "Update WallpaperEffectsGeneration api, including annotations on data classes and allow the same uid process to call returnCinematicResponse API." 2022-02-23 21:42:38 +00:00
TreeHugger Robot
d42478e1ca Merge "Listen to battery saver changes." into tm-dev 2022-02-23 21:41:13 +00:00
Julia Reynolds
b0ff7c86df Merge "Add missing userId arg" into tm-dev 2022-02-23 21:34:20 +00:00
Aaron Liu
607921c6c5 Merge "Home Controls: Add Device Controls settings" 2022-02-23 21:12:26 +00:00
Ben Miles
f7dceda2b8 Merge "Fix Process-Runtime field in crash dropbox headers" 2022-02-23 21:07:24 +00:00
Mateusz Cicheński
0b003f708c Merge "Moving the resources related to PiP to the WindowManager/Shell." into tm-dev am: 429c0a9769 am: a89ff2a53a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16943049

Change-Id: I3dd2280aeed049a8b702a7a0c9762c7a93b81138
 2022-02-23 20:55:23 +00:00
TreeHugger Robot
fae8d3e271 Merge "Don't lock VibrationStepConductor state only executed by VibrationThread." into tm-dev am: efc2678c50 am: cf2f6c6147 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16988383

Change-Id: I11ea31d6bc380516f6de260e60dc81d8b3321f34
 2022-02-23 20:54:11 +00:00
Ytai Ben-tsvi
2dd5ff3a9f [automerger skipped] Merge "Explicitly close sound model file descriptors" into tm-dev am: 4b5f06df78 am: 1015449bf2 -s ours 
am skip reason: Merged-In I43bd43ca80eadf97f0254678b0e817fc6f8a06b2 with SHA-1 8dc40270b7 is already in history

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

Change-Id: Ie91c100951aa6b7bc218497b80f7190774f66e6d
 2022-02-23 20:52:57 +00:00
Yi Kong
b08513899e Merge "idmap2: Remove more redundant "using" statements" am: ee8e50ac1f am: a872a08411 am: e676492866 am: 0a1eeefb0d am: 08823b82aa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1991775

Change-Id: I7fc4cbf1b09a894585d7842f69d7738ebdf3ee27
 2022-02-23 20:52:14 +00:00
TreeHugger Robot
ee262e5d5d Merge changes I3de63438,I671517b9 into tm-dev am: bfdb2defa9 am: 70e242df64 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16970008

Change-Id: Ic3d37162d322212910a4e0ca1021801a35dfb9ac
 2022-02-23 20:50:43 +00:00
Automerger Merge Worker
44698439d3 Merge "Merge "Moving the resources related to PiP to the WindowManager/Shell." into tm-dev am: 429c0a9769" 2022-02-23 20:49:36 +00:00
Mateusz Cicheński
6f9591cc07 Merge "Moving the resources related to PiP to the WindowManager/Shell." into tm-dev am: 429c0a9769 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16943049

Change-Id: I655635ac90e891e68c85eebd3feef6ea31d2f060
 2022-02-23 20:49:12 +00:00
Kweku Adams
614f1c3d89 Merge "Open up getCloudMediaProvider to mainline modules." into tm-dev am: 872eecc6a7 am: cbe1f92202 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16980672

Change-Id: Ie460fbfedf4b136f0dc43ecbea6b9db57ccec1cf
 2022-02-23 20:48:41 +00:00
Mady Mellor
091d63f71f Merge changes from topic "floating_dismiss" into tm-dev am: ba688138fb am: d72c6589bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16943594

Change-Id: I22032fab2a8b6505cefac16018431dbae820d22c
 2022-02-23 20:47:01 +00:00
TreeHugger Robot
26249369fe Merge "Don't lock VibrationStepConductor state only executed by VibrationThread." into tm-dev am: efc2678c50 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16988383

Change-Id: I55ab9d5ef06146d70f86001c4e14794f97010b56
 2022-02-23 20:46:22 +00:00
Automerger Merge Worker
24071092d0 Merge "Merge "Adjustments to expanded view size and position" into tm-dev am: 014c25967b am: 7ec132afb1" 2022-02-23 20:46:00 +00:00
Justin McClain
455a973dca Merge "Add vendor_required_attestation_certificates to be used by Attestation Verification Framework and Partner overlay." am: 9e70a83ea0 am: 75b5c61d45 am: 10e148d78a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1965239

Change-Id: I63611cf1ca569ce8abb98dbcbbab9433986dacd3
 2022-02-23 20:45:48 +00:00
Automerger Merge Worker
7c0a54df71 Merge changes from topic "am-f3a26fcccac54218a482ff18c8bc3ad8" 
* changes:
  [automerger skipped] Merge "Explicitly close sound model file descriptors" into tm-dev am: 4b5f06df78 -s ours
  [automerger skipped] Explicitly close sound model file descriptors am: 8dc40270b7 -s ours
 2022-02-23 20:45:48 +00:00
Ytai Ben-tsvi
aa18ed6624 [automerger skipped] Merge "Explicitly close sound model file descriptors" into tm-dev am: 4b5f06df78 -s ours 
am skip reason: Merged-In I43bd43ca80eadf97f0254678b0e817fc6f8a06b2 with SHA-1 578eadd1b4 is already in history

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

Change-Id: I466169a53caf1ff8c1b0a5d8bd92d5094ea372d4
 2022-02-23 20:45:19 +00:00
Mady Mellor
55ce2f1ffc Merge "Adjustments to expanded view size and position" into tm-dev am: 014c25967b am: 7ec132afb1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16941876

Change-Id: I85df146dd76503ac72cf13a4bdf02df053bf14a2
 2022-02-23 20:45:12 +00:00
TreeHugger Robot
670d75fd34 Merge "Replace LinkedList by a more performant collection" 2022-02-23 20:45:04 +00:00
Ytai Ben-Tsvi
741da0ca58 [automerger skipped] Explicitly close sound model file descriptors am: 8dc40270b7 -s ours 
am skip reason: Merged-In I43bd43ca80eadf97f0254678b0e817fc6f8a06b2 with SHA-1 578eadd1b4 is already in history

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

Change-Id: Iea0a2441881dd9a556f6d81d8500ee9a80990087
 2022-02-23 20:44:57 +00:00
Yi Kong
206bd671be Merge "idmap2: Remove more redundant "using" statements" am: ee8e50ac1f am: a872a08411 am: e676492866 am: 0a1eeefb0d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1991775

Change-Id: I35885a21d227ba0597e3d16d58c363f124465d97
 2022-02-23 20:42:10 +00:00
TreeHugger Robot
e2a47a2c3a Merge "[CDM bug] Fix CDM crash when there's no CDM service" into tm-dev 2022-02-23 20:34:17 +00:00
TreeHugger Robot
bc8adee5c5 Merge changes I3de63438,I671517b9 into tm-dev am: bfdb2defa9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16970008

Change-Id: I66f3201edac5e660349787b955a917aff2997ff9
 2022-02-23 20:33:08 +00:00
TreeHugger Robot
5d018607f6 Merge "Fix the bug on APP_CERTIFICATE_LINEAGE rule as we forgot to modify the binary rule parser to support the new rule." into tm-dev am: f084f35b7a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16988947

Change-Id: I71182894aa2f20cbbb5b1a29fa97ed1ac5e683bb
 2022-02-23 20:25:08 +00:00
Justin McClain
10e148d78a Merge "Add vendor_required_attestation_certificates to be used by Attestation Verification Framework and Partner overlay." am: 9e70a83ea0 am: 75b5c61d45 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1965239

Change-Id: Ie8184942cf5b7516a6595abc44e8f13cb6254389
 2022-02-23 20:21:52 +00:00
Mateusz Cicheński
a89ff2a53a Merge "Moving the resources related to PiP to the WindowManager/Shell." into tm-dev am: 429c0a9769 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16943049

Change-Id: If3b857e87849cc54cc26eab522c4eb13e3fd1f26
 2022-02-23 20:21:15 +00:00
Kweku Adams
cb8da6dcf2 Merge "Open up getCloudMediaProvider to mainline modules." into tm-dev am: 872eecc6a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16980672

Change-Id: I59d95f91c3b33d77acd423b3d5ed01e737c9947a
 2022-02-23 20:09:36 +00:00
Michael Wachenschwanz
ebfbf8edab Merge "Smear ModemActivityInfo across multiple stats" 2022-02-23 20:00:00 +00:00
Mady Mellor
b0ce39320b Merge changes from topic "floating_dismiss" into tm-dev am: ba688138fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16943594

Change-Id: Ic8d8e30b06baca6973b766c0c60cf8643d3707f2
 2022-02-23 19:58:17 +00:00
TreeHugger Robot
f084f35b7a Merge "Fix the bug on APP_CERTIFICATE_LINEAGE rule as we forgot to modify the binary rule parser to support the new rule." into tm-dev 2022-02-23 19:56:44 +00:00
Mateusz Cicheński
429c0a9769 Merge "Moving the resources related to PiP to the WindowManager/Shell." into tm-dev 2022-02-23 19:49:36 +00:00
Mady Mellor
c797e8672f Merge "Adjustments to expanded view size and position" into tm-dev am: 014c25967b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16941876

Change-Id: Ia8f18e6558ef1e9f88c1271c135e582f25ab3853
 2022-02-23 19:48:21 +00:00
Neil Fuller
a795a5485f [automerger skipped] Merge "Switch "UTC time" to "Unix epoch time"" am: 1ecf1d2462 am: b78dfa9ee9 am: 02eebf4399 -s ours am: 14a9a37227 -s ours am: 99c8bbc5af -s ours 
am skip reason: Merged-In Ic477c021529a94b4a3665426b7daaf6567fa311a with SHA-1 115132dbaa is already in history

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

Change-Id: If779f3585474fb4159d8d3f315347e0b3927b02a
 2022-02-23 19:45:53 +00:00
Justin McClain
75b5c61d45 Merge "Add vendor_required_attestation_certificates to be used by Attestation Verification Framework and Partner overlay." am: 9e70a83ea0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1965239

Change-Id: Ibfcd4cb5a913d6766cf6f4fad5beea4f7eeba22b
 2022-02-23 19:45:12 +00:00
TreeHugger Robot
cf2f6c6147 Merge "Don't lock VibrationStepConductor state only executed by VibrationThread." into tm-dev am: efc2678c50 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16988383

Change-Id: Ib6e6822f4b5b08be63add574556266e74cc6d585
 2022-02-23 19:34:32 +00:00
Ytai Ben-tsvi
1015449bf2 Merge "Explicitly close sound model file descriptors" into tm-dev am: 4b5f06df78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16942437

Change-Id: I30d2deaa03e030e3ca6c5ac24582fba927f91f11
 2022-02-23 19:33:39 +00:00
Yi Kong
08823b82aa Merge "idmap2: Remove more redundant "using" statements" am: ee8e50ac1f am: a872a08411 am: e676492866 am: 0a1eeefb0d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1991775

Change-Id: If38514dff5f4fe5bd49f7ce548bd0feedf626278
 2022-02-23 19:32:40 +00:00
TreeHugger Robot
efc2678c50 Merge "Don't lock VibrationStepConductor state only executed by VibrationThread." into tm-dev 2022-02-23 19:20:03 +00:00
Justin McClain
9e70a83ea0 Merge "Add vendor_required_attestation_certificates to be used by Attestation Verification Framework and Partner overlay." 2022-02-23 19:18:29 +00:00
Anton Hansson
bf0167a437 Merge "Revert "Disable ChangedThrows"" am: ea2c2589ab am: 1f453c7572 am: b75c50107c am: 1e48ea5c6c am: 199b33147c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1994710

Change-Id: I90a7766b0ca77484344fce5435e479ad4cd19c77
 2022-02-23 19:17:59 +00:00