Commit Graph

640958 Commits

Author SHA1 Message Date
James Lin
86cb5eeb1c Merge "Remove unnecessary UCE APIs because some of UCE APIs change." 2021-04-22 20:25:39 +00:00
Treehugger Robot
843c4eecc3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 7dbd97e972 -s ours am: 975541d9f0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0e38349750ff4882412782fe3838ab1ffe5f7dad
2021-04-22 20:23:33 +00:00
Treehugger Robot
40b26445f4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 4bdc1121da -s ours am: d6a61eed90 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifddfddc2607ab5cae8e1d5554bddd2d22cdc7251
2021-04-22 20:23:24 +00:00
Treehugger Robot
b8322e46bd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 59464d6fa9 -s ours am: d0d8f77e5c -s ours
am skip reason: subject contains skip directive

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

Change-Id: If92c275ed43c726844681d8173d47ff0f864c5f3
2021-04-22 20:23:15 +00:00
Treehugger Robot
e18a6f61b1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2b348a40ae -s ours am: e908f88308 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I08348f0bef425e1dfc89181a752ed2d5f2e30d8d
2021-04-22 20:22:59 +00:00
Garfield Tan
0ce27fdffe Merge "Add a method to obtain task info with intent extra" into sc-dev 2021-04-22 20:22:50 +00:00
TreeHugger Robot
7c2b1d57db Merge "Add null check around mImeRequester.getWindow()" into sc-dev 2021-04-22 20:18:37 +00:00
Treehugger Robot
975541d9f0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 7dbd97e972 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib6d35e5bf97a186da9fb918566b4d26b0f1cac17
2021-04-22 20:17:10 +00:00
Treehugger Robot
d6a61eed90 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 4bdc1121da -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iffc7d715b07cc5ec84af713d4de75fc9de71e15c
2021-04-22 20:12:07 +00:00
Hui Yu
8cbc974070 Move postFgsNotificationLocked() to outer block.
Some apps call Service.startForeground() multiple times with different
Notification objects to update the notification.

The change I049070f343f578fa3e9f6bb4dab914da5b23672a moved postFgsNotificationLocked()
from outer block to inner block for the purpose of updating mFgsNotificationDeferred and mFgsNotificationShown fields
before the logForegroundServiceStateChanged() call. This has changed the
behavior and apps can not use multiple Service.startForeground() calls to
update notification any more.

To avoid breaking apps, move postFgsNotificationLocked() to outer block.

Bug: 185523487
Test: b/185523487 test.
Change-Id: Idc6ea831cc8943dc24b85de9989c3aa3d99e2ffa
2021-04-22 20:09:42 +00:00
Treehugger Robot
d0d8f77e5c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 59464d6fa9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iebf66a73b57236bae54223f653d0160e20790aac
2021-04-22 20:09:24 +00:00
Anna Zappone
1889a57132 Polish updates
- Fix strings for accessibility
- Use newly added targetCellHeight and reduce placeholder padding to fit
the lower cell heights of some devices
- Remove shadow from Work Profile badged icon

Bug: 184857890, 185137298, 185891880
Test: local
Change-Id: Ia0b93c80b1019c805b9644bb1d51b009fc529ebe
2021-04-22 20:08:59 +00:00
Treehugger Robot
6769aa516c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 72c49f5bc3 -s ours am: 0e2edade62 -s ours am: 42bc2d9653 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I502ef99ae32a3b9eb9253eca9fae027012a123eb
2021-04-22 20:07:04 +00:00
Treehugger Robot
7df6b59fa2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 80cca06027 -s ours am: a78ee12818 -s ours am: 2bbc0da8b4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If811e587e36ab126ecc07a76b4fb33f101093666
2021-04-22 20:06:46 +00:00
Treehugger Robot
3bc4c76778 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ba3a4a3680 -s ours am: ff69663245 -s ours am: 7cef228686 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0874cfbb4c036840c8cdb45378b3d558c81b9d1a
2021-04-22 20:06:30 +00:00
Treehugger Robot
d832dd7673 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 0033ce1b28 -s ours am: 1689cdd1cb -s ours am: a3ccedb3fc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2d8dbb303634ff82a0a6b28e85e74bef62152de9
2021-04-22 20:06:13 +00:00
Treehugger Robot
45c197af87 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 1cb2c100e5 -s ours am: abed9825c4 -s ours am: 0d7dda110f -s ours
am skip reason: subject contains skip directive

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

Change-Id: If306a9a8b310dbaa96ead75b71265c7514ff6b9f
2021-04-22 20:05:46 +00:00
Treehugger Robot
4dac21d271 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 7852f2af80 -s ours am: b4ffd38e63 -s ours am: 2426528e62 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I103ee2db86675aee6235e8bd37b09b8adc0554fb
2021-04-22 20:05:28 +00:00
Treehugger Robot
a5fb776779 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b5b6d3680a -s ours am: 167d95bed7 -s ours am: 235f6a230b -s ours
am skip reason: subject contains skip directive

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

Change-Id: If8ecea335810d656f52e7fdd2fb9f44f5e1faba6
2021-04-22 20:05:11 +00:00
Benedict Wong
f6577d0312 Merge "Add null pointer check for mConfig in onSessionLost" am: 9fe8fcdb37 am: 2527e8e270 am: 7b894e329f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675749

Change-Id: I22101e585fc93c1fdb77bb7e3774255856ebf6f1
2021-04-22 20:04:50 +00:00
Treehugger Robot
fe8334c170 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 199b0018ff -s ours am: 550e92d020 -s ours am: 7fa68a87da -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic0f55ab884323690ee0b7004884add1d7a46e663
2021-04-22 20:04:25 +00:00
Treehugger Robot
15610a4273 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 0774753984 -s ours am: 741bd0cf46 -s ours am: 31268e08d2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5cc5c0221b7636ef89f63eaef1a3aa34070f8c1f
2021-04-22 20:03:58 +00:00
Treehugger Robot
1580b0b34a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 4152a1944e -s ours am: 9cc37c9c2a -s ours am: d2fdb0c7df -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic68c63af46acc52c07e8491a8dcecf03b3d559f6
2021-04-22 20:03:39 +00:00
Treehugger Robot
a8f040000a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 9a162a8125 -s ours am: 9cc9dfb807 -s ours am: 7234450a5c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iee64623f84a886d5d8eb5d71f87c934cfb59cf7c
2021-04-22 20:03:11 +00:00
Treehugger Robot
244ea94916 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 898529212a -s ours am: c2777a19e1 -s ours am: 1eca47e3cb -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iafe4b15be35347cc1d97576e5207a7e9688a6d29
2021-04-22 20:02:51 +00:00
Treehugger Robot
42bc2d9653 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 72c49f5bc3 -s ours am: 0e2edade62 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieaec599473c4ef091a76a36df954bda1d8b540a3
2021-04-22 20:01:53 +00:00
Treehugger Robot
2bbc0da8b4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 80cca06027 -s ours am: a78ee12818 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id7c733b7e4058e73b068a01330ec2db9a7674efa
2021-04-22 20:01:31 +00:00
Treehugger Robot
7cef228686 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ba3a4a3680 -s ours am: ff69663245 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6bf6a845125d1d3eb9f2cf927f004cd7ed2944c4
2021-04-22 20:01:19 +00:00
Treehugger Robot
e908f88308 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2b348a40ae -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2eb3a67276276504d359ae9051a070cd5c620663
2021-04-22 20:01:14 +00:00
Treehugger Robot
0e2edade62 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 72c49f5bc3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I91c0650f286ea0cdfdd318f76435ecc059edfe53
2021-04-22 19:56:24 +00:00
Treehugger Robot
a78ee12818 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 80cca06027 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iabfb45aab57cb25662373e6a26795759abf4f759
2021-04-22 19:51:27 +00:00
Treehugger Robot
07587bd2f7 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 19:44:50 +00:00
Treehugger Robot
f975580f62 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 19:39:00 +00:00
Treehugger Robot
a3ccedb3fc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 0033ce1b28 -s ours am: 1689cdd1cb -s ours
am skip reason: subject contains skip directive

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

Change-Id: If7bec524c6ce6e3c0500e1e3750ed5372a28a9fe
2021-04-22 19:38:51 +00:00
Treehugger Robot
ff69663245 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ba3a4a3680 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifdf9131467b08d2c6e2b26c43b9b6e2f4e6b019e
2021-04-22 19:38:46 +00:00
Treehugger Robot
0d7dda110f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 1cb2c100e5 -s ours am: abed9825c4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7e223e27fed7eb8247b351faaf049c2e81d7fbde
2021-04-22 19:38:42 +00:00
Treehugger Robot
2426528e62 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 7852f2af80 -s ours am: b4ffd38e63 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6f5383e1e74e9a3921ddbaf7663d51afc08d1862
2021-04-22 19:38:33 +00:00
Treehugger Robot
235f6a230b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b5b6d3680a -s ours am: 167d95bed7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0862eafc027bb50fd23e2298fee01f890a66ea0b
2021-04-22 19:38:14 +00:00
Treehugger Robot
1689cdd1cb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 0033ce1b28 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4cf3d26b3954922bbef445b591bb8732fa7baa83
2021-04-22 19:35:33 +00:00
Treehugger Robot
abed9825c4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 1cb2c100e5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I25b8e4a3383a2baf7ffd7b182a3a6cddd9b08f1c
2021-04-22 19:34:29 +00:00
Treehugger Robot
b4ffd38e63 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 7852f2af80 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idfc126c48f20b75ba1601054810a35eca8f5e98f
2021-04-22 19:30:13 +00:00
Benedict Wong
7b894e329f Merge "Add null pointer check for mConfig in onSessionLost" am: 9fe8fcdb37 am: 2527e8e270
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675749

Change-Id: Ifc0d61734ef46bd488b51b55c7697c1db08d62c3
2021-04-22 19:29:04 +00:00
Treehugger Robot
7fa68a87da [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 199b0018ff -s ours am: 550e92d020 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibf50492d1985909d6ab532e9f488ee9bdf3f9006
2021-04-22 19:28:34 +00:00
Ilya Matyukhin
c94f83d9c5 Add HAL-to-framework constant conversion
This CL adds functions to fingerprint's and face's AidlConversionUtils
that map HAL-level constants to the framework constants. This makes the
layers independent from the numerical values of the constants,
which makes it easier to add new constants in the future.

Bug: 181358178
Test: atest CtsBiometricsTestCases
Change-Id: Ia9864eb7dae7933cc02b2019117bc590d3f30184
2021-04-22 12:28:29 -07:00
Treehugger Robot
31268e08d2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 0774753984 -s ours am: 741bd0cf46 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ica9380254943a042c06e941f3649e1003855bbd4
2021-04-22 19:27:59 +00:00
Treehugger Robot
d2fdb0c7df [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 4152a1944e -s ours am: 9cc37c9c2a -s ours
am skip reason: subject contains skip directive

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

Change-Id: If77259a3c3f971e9900baf3e24259b7c8f45dc80
2021-04-22 19:27:50 +00:00
Treehugger Robot
7234450a5c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 9a162a8125 -s ours am: 9cc9dfb807 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0f600c2ddbf42cc3cc723c0e517b1284f009dfc5
2021-04-22 19:27:40 +00:00
Treehugger Robot
1eca47e3cb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 898529212a -s ours am: c2777a19e1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I25af803a1c701519f9d6eb19c0ac5e6610ffcae4
2021-04-22 19:27:17 +00:00
Treehugger Robot
167d95bed7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b5b6d3680a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I15f1d3b2196972713765f0570793b6e71f3bd1a1
2021-04-22 19:25:20 +00:00
Treehugger Robot
6670c24067 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 19:23:19 +00:00