Winson Chung
33af631266
Merge "Catch all exceptions in onFrameDraw" into qt-dev am: cff24b878d
...
am: 26ccc92307
Change-Id: Icda8f8915955e5d074e575039366a54f4029119b
2019-06-25 16:08:56 -07:00
Android Build Merger (Role)
9447a9d930
Merge "Fixed screen decor layout frames am: 0d83376433 am: 22d2c963c3" into qt-r1-dev-plus-aosp
2019-06-25 23:04:13 +00:00
chaviw
e5d357dd2e
Fixed screen decor layout frames am: 0d83376433
...
am: 22d2c963c3
Change-Id: If36916cee2a808e2b1e65cb6f3bfb0d3d68c6172
2019-06-25 16:02:47 -07:00
Android Build Merger (Role)
f1e576bfd2
Merge "Fixed screen decor layout frames am: 0d83376433 am: 4f19e40705" into qt-r1-dev-plus-aosp
2019-06-25 23:01:40 +00:00
chaviw
82c1c02220
Fixed screen decor layout frames am: 0d83376433
...
am: 4f19e40705
Change-Id: Ie8ac026070ad258df899a5aa6bcc91a775aca2a0
2019-06-25 16:00:05 -07:00
Bryan Ferris
1a502f0f71
[automerger skipped] Merge changes from topic "bp-real-calling-(p|u)id-merge-first" into oc-dev am: 46c0bc9407 am: 752d4f8e96 -s ours am: 4a115b747b -s ours am: 9c0efabb3a -s ours am: 1b967b2e4d -s ours
...
am: 208a16fd15 -s ours
am skip reason: change_id I0ef42c2f89b537a720f1ad5aefac756b0ccac52e with SHA1 216f65bf60 is in history
Change-Id: Iee5ef697cc117143b8a0d0c4ae5041ad7972ddf2
2019-06-25 15:57:20 -07:00
Bryan Ferris
c174148d30
[automerger skipped] [automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am: 216f65bf60 am: 0984de50e3 am: 36fdca0a65 skipped: 37ce2010d9 am: 51bb716332 am: ff8be5d87a -s ours am: dcfb327071 -s ours am: 5d0bf5af37 -s ours am: 2348d22874 -s ours
...
am: 1b7c48cfb6 -s ours
am skip reason: change_id I0ef42c2f89b537a720f1ad5aefac756b0ccac52e with SHA1 216f65bf60 is in history
Change-Id: Ic17243ceb7f29e810f481aa9bc8388966ee37639
2019-06-25 15:56:45 -07:00
Adam He
11b0164f71
Merge "Fixed autofill compat mode regression caused by DecorContext" into qt-dev am: 2f54cf120e
...
am: 209c597aba
Change-Id: I6686d808575b41429082469a67b249ca3e177571
2019-06-25 15:50:05 -07:00
Bryan Ferris
0166c744e0
[automerger skipped] Merge changes from topic "bp-real-calling-(p|u)id-merge-first" into oc-dev am: 46c0bc9407 am: 752d4f8e96 -s ours am: 4a115b747b -s ours am: 9c0efabb3a -s ours am: 1b967b2e4d -s ours
...
am: 87d7d58f02 -s ours
am skip reason: change_id I0ef42c2f89b537a720f1ad5aefac756b0ccac52e with SHA1 f5e5af7f3d is in history
Change-Id: I797e3f1c9e39a7d2a260aee0b9f69bb46d1abda1
2019-06-25 15:46:08 -07:00
Bryan Ferris
b041b8e6bd
[automerger skipped] [automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am: 216f65bf60 am: 0984de50e3 am: 36fdca0a65 skipped: 37ce2010d9 am: 51bb716332 am: ff8be5d87a -s ours am: dcfb327071 -s ours am: 5d0bf5af37 -s ours am: 2348d22874 -s ours
...
am: 4e6061c4be -s ours
am skip reason: change_id I0ef42c2f89b537a720f1ad5aefac756b0ccac52e with SHA1 f5e5af7f3d is in history
Change-Id: I52c80a11e490c7c4b591facc58adecb7ef8aceb0
2019-06-25 15:45:36 -07:00
Adam He
5ab9ecd701
Merge "Fixed autofill compat mode regression caused by DecorContext" into qt-dev am: 2f54cf120e
...
am: f44f4f9832
Change-Id: Ia24fdec8d709a36c7948e4e37ed55a9a1946e977
2019-06-25 15:39:47 -07:00
chaviw
4f19e40705
Fixed screen decor layout frames
...
am: 0d83376433
Change-Id: Idd8f66c0b783add12affb0147983375ceab39e6f
2019-06-25 15:38:43 -07:00
Winson Chung
26ccc92307
Merge "Catch all exceptions in onFrameDraw" into qt-dev
...
am: cff24b878d
Change-Id: I485cc8af4e6180adebb31235b43191e467b393bc
2019-06-25 15:36:26 -07:00
chaviw
22d2c963c3
Fixed screen decor layout frames
...
am: 0d83376433
Change-Id: I41e8cd13067d2d46968068b53dfb17de9f95fcf7
2019-06-25 15:31:02 -07:00
Bryan Ferris
208a16fd15
[automerger skipped] Merge changes from topic "bp-real-calling-(p|u)id-merge-first" into oc-dev am: 46c0bc9407 am: 752d4f8e96 -s ours am: 4a115b747b -s ours am: 9c0efabb3a -s ours
...
am: 1b967b2e4d -s ours
am skip reason: change_id I0ef42c2f89b537a720f1ad5aefac756b0ccac52e with SHA1 f5e5af7f3d is in history
Change-Id: I1898a7118841520bf169f68a9817f02b7dbf9ff6
2019-06-25 15:25:34 -07:00
Bryan Ferris
1b7c48cfb6
[automerger skipped] [automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am: 216f65bf60 am: 0984de50e3 am: 36fdca0a65 skipped: 37ce2010d9 am: 51bb716332 am: ff8be5d87a -s ours am: dcfb327071 -s ours am: 5d0bf5af37 -s ours
...
am: 2348d22874 -s ours
am skip reason: change_id I0ef42c2f89b537a720f1ad5aefac756b0ccac52e with SHA1 f5e5af7f3d is in history
Change-Id: Ia433db63db2aec829614a16267fb61aab4ebcb08
2019-06-25 15:24:48 -07:00
Adam He
209c597aba
Merge "Fixed autofill compat mode regression caused by DecorContext" into qt-dev
...
am: 2f54cf120e
Change-Id: Idbb78b3f2455346d08370f189ad0289745f28a51
2019-06-25 15:17:19 -07:00
Winson Chung
cff24b878d
Merge "Catch all exceptions in onFrameDraw" into qt-dev
2019-06-25 22:07:44 +00:00
Bryan Ferris
87d7d58f02
[automerger skipped] Merge changes from topic "bp-real-calling-(p|u)id-merge-first" into oc-dev am: 46c0bc9407 am: 752d4f8e96 -s ours am: 4a115b747b -s ours am: 9c0efabb3a -s ours
...
am: 1b967b2e4d -s ours
am skip reason: change_id I0ef42c2f89b537a720f1ad5aefac756b0ccac52e with SHA1 f5e5af7f3d is in history
Change-Id: Ibbc4830bf416da23c3b254c27cfa0c55ece4d495
2019-06-25 15:07:19 -07:00
Bryan Ferris
4e6061c4be
[automerger skipped] [automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am: 216f65bf60 am: 0984de50e3 am: 36fdca0a65 skipped: 37ce2010d9 am: 51bb716332 am: ff8be5d87a -s ours am: dcfb327071 -s ours am: 5d0bf5af37 -s ours
...
am: 2348d22874 -s ours
am skip reason: change_id I0ef42c2f89b537a720f1ad5aefac756b0ccac52e with SHA1 f5e5af7f3d is in history
Change-Id: Icff1f4fa576a1954652060b3912bc0c7c0b8a384
2019-06-25 15:06:54 -07:00
Adam He
f44f4f9832
Merge "Fixed autofill compat mode regression caused by DecorContext" into qt-dev
...
am: 2f54cf120e
Change-Id: I74b50f6b2cb4d229c2f952da3848a5d0ecff88db
2019-06-25 15:02:21 -07:00
chaviw
0d83376433
Fixed screen decor layout frames
...
The initial frames for the screen decor were set to the dock frame. This
is incorrect because it incorporates the status bar, preventing
the frame from starting at the corners. Instead, set the frame to
unrestricted to allow frames in the status bar region.
This bug was introduced with the refactor ag/4525486
Fixes: 135706131
Test: No visible change on phone. Fixes issue with auto
Test: DisplayPolicyLayoutTests#testScreenDecorWindows
Change-Id: I6782a3585252df505b43d3e706b0332c609c7414
2019-06-25 22:00:24 +00:00
Bryan Ferris
1b967b2e4d
[automerger skipped] Merge changes from topic "bp-real-calling-(p|u)id-merge-first" into oc-dev am: 46c0bc9407 am: 752d4f8e96 -s ours am: 4a115b747b -s ours
...
am: 9c0efabb3a -s ours
am skip reason: change_id I0ef42c2f89b537a720f1ad5aefac756b0ccac52e with SHA1 f5e5af7f3d is in history
Change-Id: I11efe1d70dd1b943f03984ad8187e8c62fef9494
2019-06-25 14:46:37 -07:00
Bryan Ferris
2348d22874
[automerger skipped] [automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am: 216f65bf60 am: 0984de50e3 am: 36fdca0a65 skipped: 37ce2010d9 am: 51bb716332 am: ff8be5d87a -s ours am: dcfb327071 -s ours
...
am: 5d0bf5af37 -s ours
am skip reason: subject contains skip directive
Change-Id: I201e44fe5dac5340b6fceb40b6b82284fc9b67df
2019-06-25 14:45:53 -07:00
TreeHugger Robot
2f54cf120e
Merge "Fixed autofill compat mode regression caused by DecorContext" into qt-dev
2019-06-25 21:32:01 +00:00
Anthony Chen
db4e2d41cc
Merge "Allow trust agents to actively unlock for automotive." into qt-dev am: 0f347bbc3c
...
am: 003eb76b4c
Change-Id: I8e4074930541b1353b41c229f2912a8b0f6b758f
2019-06-25 14:27:21 -07:00
Anthony Chen
618021d901
Merge "Allow trust agents to actively unlock for automotive." into qt-dev am: 0f347bbc3c
...
am: 0b8cb86fc8
Change-Id: I7c35a94a7b58ff2fac4493d175882972cf3129be
2019-06-25 14:24:06 -07:00
Eugene Susla
991d652547
Merge "[DO NOT MERGE] Don't throw from PooledLambdaImpl#toString" into qt-dev am: 224b4c761d
...
am: dbf88b0ff7
Change-Id: If346e3628f285e9c48414de025265bbb922a83f3
2019-06-25 14:20:46 -07:00
Bryan Ferris
9c0efabb3a
[automerger skipped] Merge changes from topic "bp-real-calling-(p|u)id-merge-first" into oc-dev am: 46c0bc9407 am: 752d4f8e96 -s ours
...
am: 4a115b747b -s ours
am skip reason: change_id I0ef42c2f89b537a720f1ad5aefac756b0ccac52e with SHA1 f5e5af7f3d is in history
Change-Id: I8c930161bbda0cee1ca364852d5c358930106b07
2019-06-25 14:18:25 -07:00
Bryan Ferris
5d0bf5af37
[automerger skipped] [automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am: 216f65bf60 am: 0984de50e3 am: 36fdca0a65 skipped: 37ce2010d9 am: 51bb716332 am: ff8be5d87a -s ours
...
am: dcfb327071 -s ours
am skip reason: subject contains skip directive
Change-Id: I97c51aa6973d9b89e304385e2e082b8d1689e279
2019-06-25 14:18:01 -07:00
Eugene Susla
4edb40158e
Merge "[DO NOT MERGE] Don't throw from PooledLambdaImpl#toString" into qt-dev am: 224b4c761d
...
am: 0ff26f6905
Change-Id: Id776a9d7925c3e1cea5902f39a1329e0a5fd7ded
2019-06-25 14:17:29 -07:00
Android Build Merger (Role)
801276ca71
Merge "[DO NOT MERGE] Don't throw from PooledLambdaImpl#toString am: 75632d616d am: 2fd77c3ce9" into qt-r1-dev-plus-aosp
2019-06-25 21:15:55 +00:00
Eugene Susla
24d8accec1
[DO NOT MERGE] Don't throw from PooledLambdaImpl#toString am: 75632d616d
...
am: 2fd77c3ce9
Change-Id: Id07bbbdd9b40f7b33c16969de5132b598d9a5d07
2019-06-25 14:14:22 -07:00
Android Build Merger (Role)
dd449901e6
Merge "[DO NOT MERGE] Don't throw from PooledLambdaImpl#toString am: 75632d616d am: d6e398761e" into qt-r1-dev-plus-aosp
2019-06-25 21:13:34 +00:00
Eugene Susla
057fd5fd0d
[DO NOT MERGE] Don't throw from PooledLambdaImpl#toString am: 75632d616d
...
am: d6e398761e
Change-Id: I4f650c25bd38c6d3a21895623c0b4b6ef3d54b3b
2019-06-25 14:11:59 -07:00
Android Build Merger (Role)
8d24863bba
Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() if provided by PendingIntentRecord#sendInner()" into oc-mr1-dev am: 97111a1cb6 -s ours am: 1a3f859c78 -s ours am: bf0e0a04dd am: a804eab848" into qt-r1-dev-plus-aosp
2019-06-25 21:10:50 +00:00
Bryan Ferris
312fdcb409
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() if provided by PendingIntentRecord#sendInner()" into oc-mr1-dev am: 97111a1cb6 -s ours am: 1a3f859c78 -s ours am: bf0e0a04dd
...
am: a804eab848
Change-Id: I71fbe9f0619154fdb9e904448e19a1c5b6fe8d67
2019-06-25 14:09:28 -07:00
Bryan Ferris
64838ba31d
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() if provided by PendingIntentRecord#sendInner()" into oc-mr1-dev am: 97111a1cb6 -s ours am: 1a3f859c78 -s ours am: bf0e0a04dd
...
am: 0037242945
Change-Id: I17c361e368685e570e0d8af838b8fd4d6887b3c2
2019-06-25 14:07:06 -07:00
Android Build Merger (Role)
66f2e6ec7b
Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() if provided by PendingIntentRecord#sendInner()" into pi-dev am: 138f85570c -s ours am: ad8680bfcb am: d914b96814" into qt-r1-dev-plus-aosp
2019-06-25 21:03:15 +00:00
Bryan Ferris
ef35b74e30
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() if provided by PendingIntentRecord#sendInner()" into pi-dev am: 138f85570c -s ours am: ad8680bfcb
...
am: d914b96814
Change-Id: Iab6bfe78425df6d5ec4a3c53d683bfc9b05d2638
2019-06-25 14:01:56 -07:00
Bryan Ferris
9317856dd1
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() if provided by PendingIntentRecord#sendInner()" into pi-dev am: 138f85570c -s ours am: ad8680bfcb
...
am: cc499ed88e
Change-Id: I28b00d95c8637da380d0775d7b9ecdbae27313dd
2019-06-25 14:01:52 -07:00
Android Build Merger (Role)
c28ebd70bd
Merge "Merge "Sharesheet: Make max shortcut targets configurable" into qt-dev am: 8f09cd3de1 am: 6e97b7bd29" into qt-r1-dev-plus-aosp
2019-06-25 20:57:00 +00:00
Matt Pietal
fd47ff1592
Merge "Sharesheet: Make max shortcut targets configurable" into qt-dev am: 8f09cd3de1
...
am: 6e97b7bd29
Change-Id: Id7030885f04338500eb528e5ec09ed957f36ec9f
2019-06-25 13:55:42 -07:00
Matt Pietal
9c9b26fba6
Merge "Sharesheet: Make max shortcut targets configurable" into qt-dev am: 8f09cd3de1
...
am: 9c9c561e8b
Change-Id: I1548b82c8363db4f35efcf468f84f5aa3a56f14d
2019-06-25 13:55:32 -07:00
Michael Wright
3a0f715588
Merge "Ignore DND when FLAG_BYPASS_INTERRUPTION_POLICY is set." into qt-r1-dev
...
am: 3af0a7b5e5
Change-Id: I4942abf90c783c67f0a32dbbc018a6a3e4d1c76e
2019-06-25 13:50:46 -07:00
Lucas Dupin
5b432e94f0
Merge "Do no play hint animation when retrying auth" into qt-r1-dev
...
am: dfba874730
Change-Id: I819160e8ac018568db34d917f0bf15057a6dcac4
2019-06-25 13:45:54 -07:00
Anthony Chen
0b8cb86fc8
Merge "Allow trust agents to actively unlock for automotive." into qt-dev
...
am: 0f347bbc3c
Change-Id: If80f214173316772c000fe30f676f09faa4a64aa
2019-06-25 13:38:40 -07:00
Anthony Chen
003eb76b4c
Merge "Allow trust agents to actively unlock for automotive." into qt-dev
...
am: 0f347bbc3c
Change-Id: If6fbede6a865470e138b0023392653ec0e437b8a
2019-06-25 13:32:41 -07:00
Bryan Ferris
4a115b747b
[automerger skipped] Merge changes from topic "bp-real-calling-(p|u)id-merge-first" into oc-dev am: 46c0bc9407
...
am: 752d4f8e96 -s ours
am skip reason: change_id I0ef42c2f89b537a720f1ad5aefac756b0ccac52e with SHA1 f5e5af7f3d is in history
Change-Id: I309479f61253fa6cefec4377e000a3ab173a39c0
2019-06-25 13:32:26 -07:00
Bryan Ferris
dcfb327071
[automerger skipped] [automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am: 216f65bf60 am: 0984de50e3 am: 36fdca0a65 skipped: 37ce2010d9 am: 51bb716332
...
am: ff8be5d87a -s ours
am skip reason: change_id I0ef42c2f89b537a720f1ad5aefac756b0ccac52e with SHA1 f5e5af7f3d is in history
Change-Id: I730d970d5b50cf8b4b0770da8ec22534a9e14a58
2019-06-25 13:32:03 -07:00