Commit Graph

637451 Commits

Author SHA1 Message Date
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
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
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
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
Benedict Wong
2527e8e270 Merge "Add null pointer check for mConfig in onSessionLost" am: 9fe8fcdb37
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675749

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

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

Change-Id: Icfdc3dbaa4d62abe20cb54e518db4f5ae1e8da91
2021-04-22 19:19:02 +00:00
Kweku Adams
3d7ff0a8d3 Merge "Ensure SyncManager doesn't schedule an EJ with a delay." into sc-dev 2021-04-22 19:17:49 +00:00
Varun Shah
3cb4aa35a9 Merge "Use direct-callback alarms in AppTimeLimitController." into sc-dev 2021-04-22 19:17:36 +00:00
Treehugger Robot
741bd0cf46 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 0774753984 -s ours
am skip reason: subject contains skip directive

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

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

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

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

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

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

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

Change-Id: I46b0b0913de426b20ef57891d91def45fbb6df4c
2021-04-22 18:54:36 +00:00
Chavi Weingarten
0498394f3e Merge "Use BLAST layer for snapshot starting windows" into sc-dev 2021-04-22 18:52:39 +00:00
Treehugger Robot
7645d47660 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ea6d47bd95 -s ours am: cd548ffab2 -s ours am: 5519d32d4b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idd3f8ea3a73eba9763b1577741b3930ec5a3fee7
2021-04-22 18:52:01 +00:00
Eric Laurent
4d1a47aa84 [automerger skipped] Merge changes from topic "startAudioSource_issues" am: 45da2609b7 am: 28ccf9bf8e am: 22483664c9 -s ours
am skip reason: skip tag Change-Id Iaa920c073885c2556a93a1b5ae23467fa6ffad4f with SHA-1 5253a31c7a is already in history

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

Change-Id: Ia108c87d279431e8feaad7e9c938afd3d7580627
2021-04-22 18:51:25 +00:00
Francois Gaffie
5f3161c103 [automerger skipped] AudioSystem: startAudioSource: ensure port handle initialized am: 523571c3e8 am: 0f0651384c am: 2c8ec7bba6 -s ours
am skip reason: skip tag Change-Id I4eb8046a1263aeb7d464d35a360a8adb77c4b1a5 with SHA-1 81b0519f04 is already in history

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

Change-Id: I8b833d0675fecdd9bf8c303128d1de4c6838b304
2021-04-22 18:51:16 +00:00
Treehugger Robot
72c49f5bc3 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 18:51:06 +00:00
Treehugger Robot
80cca06027 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 18:48:45 +00:00
Treehugger Robot
ba3a4a3680 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 18:44:26 +00:00
Treehugger Robot
0033ce1b28 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 18:39:56 +00:00
Treehugger Robot
1cb2c100e5 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-22 18:37:13 +00:00