Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
716,439 Commits 3 Branches 0 Tags
cd94acab0c82e9b2eeeb62dc3d0187716fe07502
Commit Graph

716439 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SongFerng Wang
cd94acab0c Merge "VoNR toggle" into sc-qpr1-dev am: f36dd3cc76 am: 567a727d2a am: 8002c6e57b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15645594

Change-Id: I98eeaa0b0ff5b8279e3aafb2bf39797d7c8b3ff1
 2021-09-08 21:19:40 +00:00
SongFerng Wang
310d93011c Merge "VoNR toggle" into sc-qpr1-dev am: f36dd3cc76 am: 16049eeb91 am: 20ca4489d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15645594

Change-Id: Id84987f0ab9a1fbe852574737c1bb69cadd3a4fe
 2021-09-08 21:17:49 +00:00
Arc Wang
1ec3cc1fea Merge "Add the permissions for Settings deep link" into sc-v2-dev am: bf989b80c0 am: ffa9c730d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15612682

Change-Id: I38d556d6b7a35c0c5459796f12ccd0dea24ad6fc
 2021-09-08 21:17:11 +00:00
Arc Wang
373d04fc20 Merge "Add ACTION_LARGE_SCREEN_DEEP_LINK for large screen deep link pages." into sc-v2-dev am: e9a8c554c5 am: 0f0445155a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15607377

Change-Id: I5ca664bdbd9c4c7f8a0d4b38da8c693fadbfeda8
 2021-09-08 21:16:55 +00:00
shubang
055041176e TIF: fix issue of using caller-aware methods after clearCallingIdentity() am: 05363ef193 am: e55bc91578 am: 05d7f90c41 am: 1ba7b208c6 am: 53d4a43fac am: b4bd7095e9 am: 022ef5ff23 am: 84b8533b57 am: 74e333a5e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15752564

Change-Id: I78136c6d00fc3d2c6d4da253d055552d7cbe6457
 2021-09-08 21:15:50 +00:00
shubang
853a245f76 TIF: fix issue of using caller-aware methods after clearCallingIdentity() am: 05363ef193 am: e55bc91578 am: 05d7f90c41 am: 1ba7b208c6 am: 7c93ad5848 am: 0daba53082 am: 0b44bbcb47 am: 9d7f258608 am: 7e5e33b17a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15752564

Change-Id: Icac9c535faa2148f6db4dcb9813f128b87983659
 2021-09-08 21:15:24 +00:00
Vishnu Nair
9cd69f95f5 [automerger skipped] Merge "Surface: Release references to BlastBufferQueue and SurfaceControl on Surface#destroy" into sc-qpr1-dev am: 7219397532 -s ours am: 343ae6b623 -s ours am: 7a933b39fa -s ours 
am skip reason: Merged-In I5c7e43736f025fc0965eae2f19719ba40df3cb70 with SHA-1 26ed47443c is already in history

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

Change-Id: I3e3f6919e27015b5c495f093a0f39e8ee24fce02
 2021-09-08 21:15:05 +00:00
Vishnu Nair
18b1c04cdd [automerger skipped] Merge "Surface: Release references to BlastBufferQueue and SurfaceControl on Surface#destroy" into sc-qpr1-dev am: 7219397532 am: ea32ebf38a -s ours am: 1e95ef423d -s ours 
am skip reason: Merged-In I5c7e43736f025fc0965eae2f19719ba40df3cb70 with SHA-1 26ed47443c is already in history

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

Change-Id: I9dead31d775a69947bf2b77f07c0f67172d8c476
 2021-09-08 21:14:31 +00:00
Adam He
1ee68ced5b Merge "Fill in javadocs for translation feature." into sc-dev am: 1553fc7fad am: ed877ee1ac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15597859

Change-Id: I9ab6500fa6c8c64ca1c14383dbf1bb7b2a64f909
 2021-09-08 20:18:06 +00:00
TreeHugger Robot
4744ea9af0 Merge "Framework changes for Context Hub AIDL" 2021-09-08 20:01:15 +00:00
Adam He
ed877ee1ac Merge "Fill in javadocs for translation feature." into sc-dev am: 1553fc7fad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15597859

Change-Id: I9d0149f9a012fefa20264e01ef3b6e0f45285147
 2021-09-08 19:58:26 +00:00
Adam He
1553fc7fad Merge "Fill in javadocs for translation feature." into sc-dev 2021-09-08 19:47:26 +00:00
Automerger Merge Worker
e8d2979ef2 Merge "Merge "Change the ownership of CDM" into rvc-dev am: 231a42b77e am: 7522db5bd0 am: 67179b8e4f am: 62a140082c" 2021-09-08 18:15:34 +00:00
TreeHugger Robot
d7cbe3d827 Merge "In SkSL, replace 'sample' with '.eval'" 2021-09-08 18:15:20 +00:00
TreeHugger Robot
55671df084 Merge "Change the ownership of CDM" into rvc-dev am: 231a42b77e am: 7522db5bd0 am: 67179b8e4f am: 62a140082c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15779907

Change-Id: I6636674d0c68dbb2fece80e4fba6dc6ce7e7e370
 2021-09-08 18:15:15 +00:00
TreeHugger Robot
23da648dbf Merge "Change the ownership of CDM" into rvc-dev am: 231a42b77e am: 21886570d2 am: 3bfbd4b740 am: 4ebec21d96 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15779907

Change-Id: I19de76081937b68b4a374279c582aaba3bca4fd1
 2021-09-08 18:14:32 +00:00
TreeHugger Robot
62a140082c Merge "Change the ownership of CDM" into rvc-dev am: 231a42b77e am: 7522db5bd0 am: 67179b8e4f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15779907

Change-Id: I93637742add5b1e2487923497f959c4d1c305c15
 2021-09-08 18:02:14 +00:00
TreeHugger Robot
4ebec21d96 Merge "Change the ownership of CDM" into rvc-dev am: 231a42b77e am: 21886570d2 am: 3bfbd4b740 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15779907

Change-Id: I490f79064c5da308051b9c0556be03fe309a513c
 2021-09-08 18:01:55 +00:00
TreeHugger Robot
67179b8e4f Merge "Change the ownership of CDM" into rvc-dev am: 231a42b77e am: 7522db5bd0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15779907

Change-Id: I09bb486cef2020367861edba8709f8d2a9ca2c21
 2021-09-08 17:48:56 +00:00
TreeHugger Robot
3bfbd4b740 Merge "Change the ownership of CDM" into rvc-dev am: 231a42b77e am: 21886570d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15779907

Change-Id: Ibdb21157823b98cc976aa7801fd1a4ecd0dcd1ed
 2021-09-08 17:48:06 +00:00
TreeHugger Robot
7522db5bd0 Merge "Change the ownership of CDM" into rvc-dev am: 231a42b77e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15779907

Change-Id: I1ba849b0ec81f7ce59deadbb5e2fe3f2bd217129
 2021-09-08 17:34:30 +00:00
TreeHugger Robot
21886570d2 Merge "Change the ownership of CDM" into rvc-dev am: 231a42b77e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15779907

Change-Id: Id6c89667a9578925cb8c14f9e172c84ba05b00c0
 2021-09-08 17:34:30 +00:00
TreeHugger Robot
231a42b77e Merge "Change the ownership of CDM" into rvc-dev 2021-09-08 17:17:12 +00:00
Chavi Weingarten
da143d4a41 Merge "Call applyPendingTransactions when frame didn't draw" 2021-09-08 15:50:25 +00:00
Chavi Weingarten
8bd6b0d178 Merge "Remove flushShadowQueue" 2021-09-08 14:50:17 +00:00
TreeHugger Robot
82ffa76bd7 Merge "Make some ChooserActivity inner classes static." 2021-09-08 14:42:30 +00:00
Wu Ahan
b99812d08f [automerger skipped] Merge "Make sure the removeObservers be called correctly" into sc-dev am: 766eff7df1 am: 5431a82ce6 -s ours 
am skip reason: Merged-In Iec1eb82d1a4756a7b85c8fbdd05f4132a74c613c with SHA-1 7141ab2619 is already in history

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

Change-Id: I01f1d85c7c3534fc3ab9e149819dff155156ae36
 2021-09-08 12:32:34 +00:00
Wu Ahan
5431a82ce6 Merge "Make sure the removeObservers be called correctly" into sc-dev am: 766eff7df1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15747424

Change-Id: I9a6184601f7874fbe35a760cbce7b47f6dc414c5
 2021-09-08 12:23:17 +00:00
Wu Ahan
766eff7df1 Merge "Make sure the removeObservers be called correctly" into sc-dev 2021-09-08 12:05:21 +00:00
Automerger Merge Worker
fe17e6df62 Merge "Merge "[automerger skipped] Merge "Changed INTERACT_ACROSS_PROFILES appop to be set per UID" into rvc-dev am: 8114e1c1bd am: 12d71bb87b -s ours" into sc-dev am: 4d117fd380 -s ours am: 798f4e78f7 -s ours" 2021-09-08 11:48:23 +00:00
TreeHugger Robot
0bc1b6dba4 Merge "Fix typo in the word "notification"" 2021-09-08 11:48:20 +00:00
Automerger Merge Worker
b74d0fb4f3 Merge "[automerger skipped] Merge "Changed INTERACT_ACROSS_PROFILES appop to be set per UID" into rvc-dev am: 8114e1c1bd am: 12d71bb87b -s ours" into sc-dev am: 4d117fd380 -s ours am: 798f4e78f7 -s ours 
am skip reason: Merged-In I7a72c1d3abd1f83924865326797630ded2f2040f with SHA-1 f5e0e80312 is already in history

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

Change-Id: I476f94cd35e964f74e23c37ab81e0764688e5103
 2021-09-08 11:48:13 +00:00
Kholoud Mohamed
477f7ffca0 [automerger skipped] Merge "Changed INTERACT_ACROSS_PROFILES appop to be set per UID" into rvc-dev am: 8114e1c1bd -s ours am: 585320a3e1 -s ours am: 5361a95cf7 -s ours am: ec0d7f30f4 -s ours 
am skip reason: Merged-In I7a72c1d3abd1f83924865326797630ded2f2040f with SHA-1 f5e0e80312 is already in history

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

Change-Id: I18901472fcfd6c0ad7a76570fb370ccdf243dc24
 2021-09-08 11:47:55 +00:00
Kholoud Mohamed
55fc8d38de [automerger skipped] Merge "Changed INTERACT_ACROSS_PROFILES appop to be set per UID" into rvc-qpr-dev am: b4a530d83b -s ours am: 500b32ea3c -s ours am: 355e6e6943 -s ours 
am skip reason: Merged-In I7a72c1d3abd1f83924865326797630ded2f2040f with SHA-1 4670d1d855 is already in history

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

Change-Id: I7a700dc198477f4765c35e267970902ac9310881
 2021-09-08 11:47:29 +00:00
Automerger Merge Worker
798f4e78f7 Merge "[automerger skipped] Merge "Changed INTERACT_ACROSS_PROFILES appop to be set per UID" into rvc-dev am: 8114e1c1bd am: 12d71bb87b -s ours" into sc-dev am: 4d117fd380 -s ours 
am skip reason: Merged-In I7a72c1d3abd1f83924865326797630ded2f2040f with SHA-1 f5e0e80312 is already in history

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

Change-Id: I3c096f33cfc83ef30acee3e3743b62efa790b38d
 2021-09-08 11:33:42 +00:00
Kholoud Mohamed
ec0d7f30f4 [automerger skipped] Merge "Changed INTERACT_ACROSS_PROFILES appop to be set per UID" into rvc-dev am: 8114e1c1bd -s ours am: 585320a3e1 -s ours am: 5361a95cf7 -s ours 
am skip reason: Merged-In I7a72c1d3abd1f83924865326797630ded2f2040f with SHA-1 f5e0e80312 is already in history

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

Change-Id: I8b06264128519f6085a9771962dde9c666cbf1e5
 2021-09-08 11:33:23 +00:00
Kholoud Mohamed
355e6e6943 [automerger skipped] Merge "Changed INTERACT_ACROSS_PROFILES appop to be set per UID" into rvc-qpr-dev am: b4a530d83b -s ours am: 500b32ea3c -s ours 
am skip reason: Merged-In I7a72c1d3abd1f83924865326797630ded2f2040f with SHA-1 4670d1d855 is already in history

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

Change-Id: Ia7918317d395fd1e8612540a19f8ad39ec7f4e3a
 2021-09-08 11:33:06 +00:00
Automerger Merge Worker
4d117fd380 Merge "[automerger skipped] Merge "Changed INTERACT_ACROSS_PROFILES appop to be set per UID" into rvc-dev am: 8114e1c1bd am: 12d71bb87b -s ours" into sc-dev 2021-09-08 11:16:18 +00:00
Kholoud Mohamed
3e5f0789f3 [automerger skipped] Merge "Changed INTERACT_ACROSS_PROFILES appop to be set per UID" into rvc-dev am: 8114e1c1bd am: 12d71bb87b -s ours 
am skip reason: Merged-In I7a72c1d3abd1f83924865326797630ded2f2040f with SHA-1 f5e0e80312 is already in history

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

Change-Id: I7b6d46db63407aa37e4d925179c668b0b9bef169
 2021-09-08 11:15:59 +00:00
Kholoud Mohamed
5361a95cf7 [automerger skipped] Merge "Changed INTERACT_ACROSS_PROFILES appop to be set per UID" into rvc-dev am: 8114e1c1bd -s ours am: 585320a3e1 -s ours 
am skip reason: Merged-In I7a72c1d3abd1f83924865326797630ded2f2040f with SHA-1 f5e0e80312 is already in history

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

Change-Id: I8c3e4c32026bf39091319348f96c32cccf5bdb3b
 2021-09-08 11:15:40 +00:00
Kholoud Mohamed
500b32ea3c [automerger skipped] Merge "Changed INTERACT_ACROSS_PROFILES appop to be set per UID" into rvc-qpr-dev am: b4a530d83b -s ours 
am skip reason: Merged-In I7a72c1d3abd1f83924865326797630ded2f2040f with SHA-1 4670d1d855 is already in history

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

Change-Id: I7935e88f335b465ce36c2e5a639eb2d2f2fa3888
 2021-09-08 11:15:14 +00:00
TreeHugger Robot
584ce331bf [automerger skipped] Merge "Clean up ownership in frameworks/base/" into sc-dev am: 88c2fc9cea am: 168f6c2d56 -s ours 
am skip reason: Merged-In I04bee764bf50734523ff2210d30ed052dcb036bd with SHA-1 432e98eb50 is already in history

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

Change-Id: Icbb8a853cf7bbcb3ca57487a35428dcb621c2b9c
 2021-09-08 11:10:37 +00:00
Kholoud Mohamed
12d71bb87b Merge "Changed INTERACT_ACROSS_PROFILES appop to be set per UID" into rvc-dev am: 8114e1c1bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15454356

Change-Id: I7c9f0d9d10e268f70b969cf2615d6a6c97df0fbf
 2021-09-08 10:59:25 +00:00
Kholoud Mohamed
585320a3e1 [automerger skipped] Merge "Changed INTERACT_ACROSS_PROFILES appop to be set per UID" into rvc-dev am: 8114e1c1bd -s ours 
am skip reason: Merged-In I7a72c1d3abd1f83924865326797630ded2f2040f with SHA-1 f5e0e80312 is already in history

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

Change-Id: I537d3470aacb0ac16ce135fb9534b1dacd37a538
 2021-09-08 10:58:45 +00:00
Kholoud Mohamed
b4a530d83b Merge "Changed INTERACT_ACROSS_PROFILES appop to be set per UID" into rvc-qpr-dev 2021-09-08 10:56:21 +00:00
TreeHugger Robot
b55b8667e3 Merge "Add TestApi to clear organization Id" 2021-09-08 10:53:16 +00:00
TreeHugger Robot
168f6c2d56 Merge "Clean up ownership in frameworks/base/" into sc-dev am: 88c2fc9cea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15778521

Change-Id: Id26dfb36ad65e5774a660495c8ebc99b461245da
 2021-09-08 10:53:02 +00:00
Kholoud Mohamed
8114e1c1bd Merge "Changed INTERACT_ACROSS_PROFILES appop to be set per UID" into rvc-dev 2021-09-08 10:48:56 +00:00
TreeHugger Robot
88c2fc9cea Merge "Clean up ownership in frameworks/base/" into sc-dev 2021-09-08 10:35:56 +00:00
Pablo Gamito
3a7c2de26d Merge changes from topics "consistent-frame-number-type", "metrics-callback-surface-id", "remove-asc-from-fmcallback" 
* changes:
  Get rid of unused ASurfaceControl in frame metrics listener callback
  Set uninitialized frame number to 0
  Make frame number type consistent
  Add unit tests for FrameMetricsReporter
  Update JankTrackerTests to reflect API changes
  Pass surface control id to callback to accurately identify surface metrics belongs to
  Stop reporting frame stats from frames completed before observer was attached
 2021-09-08 09:09:37 +00:00