Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
688,851 Commits 3 Branches 0 Tags
ba6324d14165fbf3607041fad2cc74f4e1afa6dd
Commit Graph

688851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
ba6324d141 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96cc0364fe -s ours am: c96116bc39 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If806cb66fd87ab00855760f15c7999824e64a246
 2022-02-24 18:49:12 +00:00
Bill Yi
878d47755d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b6369db7e0 -s ours am: 8aa629ee77 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I20f557891eefa15dd242285967ec70286c9531b0
 2022-02-24 18:48:21 +00:00
Bill Yi
c96116bc39 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 96cc0364fe -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idbe58ad8fe1f08309158e0db3c3eef9a6aeecf19
 2022-02-24 18:40:16 +00:00
Bill Yi
8aa629ee77 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b6369db7e0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I56925eb8ce39a5e75baf55a8569f387facec8aef
 2022-02-24 18:38:16 +00:00
TreeHugger Robot
74cbc4fd20 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: abcbec2acd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I63b828e840dd2e020b6296d81ffaa0df3f9d48f1
 2022-02-24 18:37:50 +00:00
TreeHugger Robot
abcbec2acd Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-02-24 18:01:07 +00:00
TreeHugger Robot
3079759c9a Merge changes from topic "presubmit-am-9dbfc23173f94170a330beb0c673ef81" into sc-v2-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 06353761e6
  Import translations. DO NOT MERGE ANYWHERE
 2022-02-24 18:01:07 +00:00
Kevin Rocard
d96b16daa2 Merge "[Bugfix][Media] Fix ISessionControllerCallback leaks in the system_server when the far side died" am: 04eeb94b79 am: b882a036a2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1978026

Change-Id: Ib2232d4a8bfd571a6c6f4fc6b4a4a9f8d15a45f0
 2022-02-24 11:32:15 +00:00
Anton Hansson
4bd4bdf3a7 Merge "Expand comment about using a merge api base" am: 0cf86f5a44 am: c36460bc4c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1997110

Change-Id: Icb22a9f81c49df88b4a3170f31174112e1ca9d4c
 2022-02-24 11:31:53 +00:00
Kevin Rocard
b882a036a2 Merge "[Bugfix][Media] Fix ISessionControllerCallback leaks in the system_server when the far side died" am: 04eeb94b79 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1978026

Change-Id: I509b8529c4d22a7daaf8a8c8c5d7eb1f8faa504b
 2022-02-24 10:59:00 +00:00
Anton Hansson
c36460bc4c Merge "Expand comment about using a merge api base" am: 0cf86f5a44 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1997110

Change-Id: I25e88ca6d342d3a7c11afe002780d1c26138ac63
 2022-02-24 10:58:29 +00:00
Kevin Rocard
04eeb94b79 Merge "[Bugfix][Media] Fix ISessionControllerCallback leaks in the system_server when the far side died" 2022-02-24 10:38:36 +00:00
Anton Hansson
0cf86f5a44 Merge "Expand comment about using a merge api base" 2022-02-24 10:32:00 +00:00
Treehugger Robot
a72c59093b Merge "Add shell permission for CTS test" am: 94dd832f60 am: 24d521a6bb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1972639

Change-Id: Ib5e6052391cddcd2a466088b9ebe70e6a1d5466f
 2022-02-24 07:38:54 +00:00
Treehugger Robot
24d521a6bb Merge "Add shell permission for CTS test" am: 94dd832f60 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1972639

Change-Id: Iefb4d5932bbd0e3b2a3f80e8b23fc4f247bfdd63
 2022-02-24 07:17:26 +00:00
Treehugger Robot
94dd832f60 Merge "Add shell permission for CTS test" 2022-02-24 06:53:28 +00:00
George Burgess
5fdccc4578 Merge "bit: avoid calling strdup(NULL)" am: 589f3e4871 am: 96c1b4bd0e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1995590

Change-Id: Ia9ce5f63427a3ec9fdf92be93bd54b1f6be5f14f
 2022-02-24 04:24:56 +00:00
George Burgess
96c1b4bd0e Merge "bit: avoid calling strdup(NULL)" am: 589f3e4871 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1995590

Change-Id: I5524e43b77097f1bf2c7ac34c877a961cf61b5ad
 2022-02-24 04:01:27 +00:00
George Burgess
589f3e4871 Merge "bit: avoid calling strdup(NULL)" 2022-02-24 03:27:26 +00:00
Bill Yi
eea0986ff5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 7dab4a6ffc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2712781dd92aefa62ac36ece04e361f2fced73c7
 2022-02-24 02:29:58 +00:00
Bill Yi
6791de1e2f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 95a1ea0a49 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibec93874a113449f42ca8a60aa9afade3427b48c
 2022-02-24 02:29:49 +00:00
Bill Yi
7dab4a6ffc Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-02-24 02:03:55 +00:00
TreeHugger Robot
3424369d35 Merge changes from topic "presubmit-am-5482901e1a9f43f99964b507e3ad4959" into sc-v2-dev-plus-aosp 
* changes:
  [automerged blank] Don't set background color if TDA doesn't have a valid surface 2p: 62f69423c5
  Don't set background color if TDA doesn't have a valid surface
 2022-02-23 22:50:27 +00:00
TreeHugger Robot
84603031f6 Merge changes from topic "presubmit-am-34a8ba0b26b74d1daf2868b91d148909" into sc-v2-dev-plus-aosp 
* changes:
  [automerged blank] Use TDA for background color instead of new color layer 2p: dc4296e335
  Use TDA for background color instead of new color layer
 2022-02-23 22:50:27 +00:00
Brian Lindahl
ee41663e2c Add shell permission for CTS test 
The MEDIA_RESOURCE_OVERRIDE_PID permission is needed to create codecs on
behalf of other processes for correct MediaCodec resource reclaiming
behavior.

Bug: 217746837
Test: atest MediaCodecResourceTest
Change-Id: I75f2b33f7fee6d6e84ed7aec94eccd8aee5e4b20
 2022-02-23 20:29:53 +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
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
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
Yi Kong
e676492866 Merge "idmap2: Remove more redundant "using" statements" am: ee8e50ac1f am: a872a08411 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1991775

Change-Id: I736f4cec4d88b9cf3a742a916791e48c0956f2cd
 2022-02-23 18:44:43 +00:00
Yi Kong
a872a08411 Merge "idmap2: Remove more redundant "using" statements" am: ee8e50ac1f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1991775

Change-Id: I029e6c4037a86993923a3e204df4fef60a4de2bf
 2022-02-23 18:20:44 +00:00
Pablo Gamito
a094a8146b [automerged blank] Don't set background color if TDA doesn't have a valid surface 2p: 62f69423c5 
Blank merge reason: Change-Id I9881453ba14cba4f219861ec4449f2baa8058b57 with SHA-1 da737e7149 is in history

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

Bug: 207667555
Bug: 209936970
Change-Id: I0e178138c6cb64d6fe2ae4f88b3ef6125d8f52d7
Merged-In: I9881453ba14cba4f219861ec4449f2baa8058b57
 2022-02-23 18:05:45 +00:00
Presubmit Automerger Backend
38bb1b2fcd [automerged blank] Use TDA for background color instead of new color layer 2p: dc4296e335 
Blank merge reason: Change-Id I57fa88c6f45adca9e3301b39e868bd127644b76f with SHA-1 975e9ab45b is in history

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

Bug: 205274345
Bug: 202856837
Bug: 203567491
Bug: 209936970
Change-Id: I1c37d3f66e7927c248d4fe526880dc6dd97ae5e6
Merged-In: I57fa88c6f45adca9e3301b39e868bd127644b76f
 2022-02-23 18:05:45 +00:00
Pablo Gamito
62f69423c5 Don't set background color if TDA doesn't have a valid surface 
This is something that sometimes occurs in tests since the detaching of the TDA in not necesseraily synchronized with animations

Test: atest CtsWindowManagerDeviceTestCases:MultiDisplaySystemDecorationTests
Bug: 207667555
Bug: 209936970
Merged-In: I9881453ba14cba4f219861ec4449f2baa8058b57
Change-Id: I9881453ba14cba4f219861ec4449f2baa8058b57
(cherry picked from commit e644ff6102)
 2022-02-23 19:03:02 +01:00
Pablo Gamito
dc4296e335 Use TDA for background color instead of new color layer 
Bug: 205274345
Bug: 202856837
Bug: 203567491
Bug: 209936970
Test: Run task animations and make sure background color shows
Merged-In: I57fa88c6f45adca9e3301b39e868bd127644b76f
Change-Id: I57fa88c6f45adca9e3301b39e868bd127644b76f
(cherry picked from commit 93850bd00d)
 2022-02-23 19:01:36 +01:00
Yi Kong
ee8e50ac1f Merge "idmap2: Remove more redundant "using" statements" 2022-02-23 17:49:42 +00:00
Neil Fuller
02eebf4399 Merge "Switch "UTC time" to "Unix epoch time"" am: 1ecf1d2462 am: b78dfa9ee9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1979487

Change-Id: Ideb71c913dda192e7557e5f665fae6bb1f39ae8a
 2022-02-23 17:06:42 +00:00
Anton Hansson
b75c50107c Merge "Revert "Disable ChangedThrows"" am: ea2c2589ab am: 1f453c7572 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1994710

Change-Id: I84b7174bce3c032c32346d2706c7f9b56cedff7a
 2022-02-23 17:04:02 +00:00
Treehugger Robot
fd64ffbe30 Merge "AudioService: fix regression on hearing aid profile" am: 350176393c am: 69bce647f5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1994851

Change-Id: Iad49273782d6072821b91c5c42cccb2bfd19d07e
 2022-02-23 17:00:13 +00:00
Neil Fuller
b78dfa9ee9 Merge "Switch "UTC time" to "Unix epoch time"" am: 1ecf1d2462 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1979487

Change-Id: I87481e4d54250097a306a1e7a0c48c0223f37f37
 2022-02-23 16:43:27 +00:00
Anton Hansson
1f453c7572 Merge "Revert "Disable ChangedThrows"" am: ea2c2589ab 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1994710

Change-Id: Iafd429f1ede540f19fa0250894ca44adcfac5ebe
 2022-02-23 16:39:29 +00:00
Treehugger Robot
69bce647f5 Merge "AudioService: fix regression on hearing aid profile" am: 350176393c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1994851

Change-Id: Ib5637a4297ff86f34f1cd57705ed09167b72f67b
 2022-02-23 16:34:07 +00:00
Issei Suzuki
ef310224aa Merge "Keep showing wallpaper when starting an app immediatly after unlock." into sc-v2-dev am: efcf2e8553 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16978905

Change-Id: Ibb6b5b032cfa06b1c6c0e6527396c93c2fb05f21
 2022-02-23 16:31:44 +00:00
Justin McClain
0770b040f0 Add vendor_required_attestation_certificates to be used by Attestation 
Verification Framework and Partner overlay.

Test: m
Change-Id: Ieb8049e6c1372ea82ee45bcbaec769619cab1a70
 2022-02-23 16:24:25 +00:00
xi yu
918eb4f031 [Bugfix][Media] Fix ISessionControllerCallback leaks in the system_server when the far side died 
When the far side died unexpectedly, it will not call unregisterCallback, resulting in callbacks leak in system_server. Eventually, the system_server will reboot because of too many BinderProxies leaks.

Test: manual

Change-Id: I1d99ea35b8bbbb92db648bbf68c267dce435110c
 2022-02-23 16:14:00 +00:00
Issei Suzuki
efcf2e8553 Merge "Keep showing wallpaper when starting an app immediatly after unlock." into sc-v2-dev 2022-02-23 16:03:22 +00:00
Neil Fuller
1ecf1d2462 Merge "Switch "UTC time" to "Unix epoch time"" 2022-02-23 16:02:48 +00:00
Anton Hansson
ea2c2589ab Merge "Revert "Disable ChangedThrows"" 2022-02-23 15:06:46 +00:00
Treehugger Robot
350176393c Merge "AudioService: fix regression on hearing aid profile" 2022-02-23 13:00:26 +00:00
Anton Hansson
9d34e31877 Expand comment about using a merge api base 
A bit more context for the next person looking into improving this
check (it's not straightforward).

Test: No
Change-Id: Ie389bc10dcc307a996dc3a7fad55405fe12a09b9
 2022-02-23 11:24:00 +00:00
Presubmit Automerger Backend
ef17fbb23d [automerge] Keep showing wallpaper when starting an app immediatly after unlock. 2p: f0a9429cc2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16978905

Bug: 215685199
Change-Id: I04f28289f660042f90ca515c403916828ebedd2e
 2022-02-23 10:44:25 +00:00