Josh Gao
|
d117fe1164
|
Merge "NativeTombstoneManager: fix tombstone parsing." am: 35a5c1501f am: 76528d5388 am: 652967de68
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597312
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0778d7611c8de7b6e32a76da221c8fe1b2d03ce4
|
2021-02-24 00:22:40 +00:00 |
|
Treehugger Robot
|
4c0d5634ec
|
Merge "Keystore 2.0: Fix correct handling of Uid/Namespace" am: 75025c5b62 am: ace6cea9b0 am: 2087d30844
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1599649
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8e1dd5224970f6ac4379cfa86584ca2afaf0b6c3
|
2021-02-24 00:22:14 +00:00 |
|
Treehugger Robot
|
a1bbbe54b7
|
Merge "Release virtual display before stopping projection" am: 2bd3073819 am: 042c3a3311 am: a35e9a077a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585286
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ief2b7bfe500f5d873aa1cdd5c8c5baed7693065a
|
2021-02-24 00:21:53 +00:00 |
|
Jeff Sharkey
|
47c776e144
|
Merge "Add michaelwr@ to Shell OWNERS" am: c31e4a1e00 am: 7958f98486 am: 77af692204
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587219
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iafdadbf4ddba1f8ec86a0013b8f262e5cd004b97
|
2021-02-24 00:21:15 +00:00 |
|
Treehugger Robot
|
feed10cb15
|
Merge "BugreportManager API review updates." am: e0db8b998f am: c8e42d59e7 am: 94a089b673
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1584520
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If29af220ff4d636b5870a16b14ead953e562aa70
|
2021-02-24 00:20:46 +00:00 |
|
Chih-hung Hsieh
|
08d389c6c3
|
Merge "Do not add quotes around flags argument" am: af4f8b9510 am: d82f6409a2 am: 703eb2b0f9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1598500
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icbde547c69af26710147c03b73437f5db5121f10
|
2021-02-24 00:20:21 +00:00 |
|
Tianjie Xu
|
fd08d9eac5
|
Merge "Throw an exception in RoR api on no-pin case" am: 7444774737 am: 4d208ac97e am: c26952bf52
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1584516
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I65d8cb00ee0c08763a53714f8825bc4d8a75557e
|
2021-02-24 00:19:46 +00:00 |
|
Treehugger Robot
|
2cb3295041
|
Merge "Clean up T&C implementation" am: e22fe5dd7d am: 9c43607801 am: 064b340c56
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1583505
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I35f732fbfa73d8b207c0e1b22595d2fd0135152c
|
2021-02-24 00:19:18 +00:00 |
|
Andrew Cheng
|
3fd0d008d2
|
Merge changes from topic "hci-disconnect-reason" am: 1c276e7591 am: 4f40f1c1f6 am: 2022790afc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597111
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7512071a6de7fb4128a30647ac383ea9bcf82b5c
|
2021-02-24 00:18:39 +00:00 |
|
Andrew Cheng
|
9efa1ff5da
|
[automerger skipped] Add BluetoothConnectionCallback to Companion App am: af705d2676 am: a0dd9676c4 am: 972b0f8779 -s ours
am skip reason: Change-Id Id24a4b3a3510781d9105763b1722f44583a7fd7c with SHA-1 151da5b2bc is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596076
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I336464fbf6b98f0713066a3cdcce96cebf4c2b03
|
2021-02-24 00:18:30 +00:00 |
|
Andrew Cheng
|
a262cfe5ca
|
Surface ACL disconnect reasons from native to Java am: b8e09882d8 am: c12293f799 am: 7d898bc6f9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1595220
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ia1006ed22244cf926dc91fa7001d8594b4ebb976
|
2021-02-24 00:18:18 +00:00 |
|
Andrew Cheng
|
5fdf251aff
|
[automerger skipped] Make BluetoothConnectionCallback static am: 8ef54b299e am: 4757f6cd7f am: 1e347371e0 -s ours
am skip reason: Change-Id Id24a4b3a3510781d9105763b1722f44583a7fd7c with SHA-1 151da5b2bc is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596074
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Icc52acad42e74b8b824b0997edaa2281b4e4d5fa
|
2021-02-24 00:18:09 +00:00 |
|
Josh Gao
|
652967de68
|
Merge "NativeTombstoneManager: fix tombstone parsing." am: 35a5c1501f am: 76528d5388
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597312
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5262153df4454d1ee3cf00106f3d26bd36309bd4
|
2021-02-24 00:15:05 +00:00 |
|
Treehugger Robot
|
2087d30844
|
Merge "Keystore 2.0: Fix correct handling of Uid/Namespace" am: 75025c5b62 am: ace6cea9b0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1599649
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I230b8b1cf1c14cc07c0617ba51e713a403ba3566
|
2021-02-24 00:14:56 +00:00 |
|
Treehugger Robot
|
a35e9a077a
|
Merge "Release virtual display before stopping projection" am: 2bd3073819 am: 042c3a3311
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585286
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6f7dd7113c76aa098c774b7ba831281ccde89652
|
2021-02-24 00:14:44 +00:00 |
|
Jeff Sharkey
|
77af692204
|
Merge "Add michaelwr@ to Shell OWNERS" am: c31e4a1e00 am: 7958f98486
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587219
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I09e49f27ad2d432d7fa7a494d954ce4a2123cd41
|
2021-02-24 00:14:27 +00:00 |
|
Treehugger Robot
|
94a089b673
|
Merge "BugreportManager API review updates." am: e0db8b998f am: c8e42d59e7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1584520
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibba20423d6d2d3a5394d871f5f4f2d33d0afdceb
|
2021-02-24 00:14:10 +00:00 |
|
Josh Gao
|
76528d5388
|
Merge "NativeTombstoneManager: fix tombstone parsing." am: 35a5c1501f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597312
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic17d60aee710d982cf6ee33e4fe0446a0a4d35e1
|
2021-02-24 00:07:51 +00:00 |
|
Treehugger Robot
|
ace6cea9b0
|
Merge "Keystore 2.0: Fix correct handling of Uid/Namespace" am: 75025c5b62
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1599649
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If2ce29c0bbd386105ca3ff2d4322d30e83250c6e
|
2021-02-24 00:05:49 +00:00 |
|
Treehugger Robot
|
042c3a3311
|
Merge "Release virtual display before stopping projection" am: 2bd3073819
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1585286
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I36b1adc30f515e5a699cfd433d44921667c1a353
|
2021-02-24 00:03:18 +00:00 |
|
Jeff Sharkey
|
7958f98486
|
Merge "Add michaelwr@ to Shell OWNERS" am: c31e4a1e00
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587219
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic52f794b74ebf0212ace0ffa989aae3b0b60d04e
|
2021-02-24 00:01:08 +00:00 |
|
Chih-hung Hsieh
|
703eb2b0f9
|
Merge "Do not add quotes around flags argument" am: af4f8b9510 am: d82f6409a2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1598500
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8975a707a1f1b768817504ff283feef346a05c7d
|
2021-02-23 23:58:58 +00:00 |
|
Tianjie Xu
|
c26952bf52
|
Merge "Throw an exception in RoR api on no-pin case" am: 7444774737 am: 4d208ac97e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1584516
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic6399b2d5de8fdca4973c8cf4a435c22ba0e68d8
|
2021-02-23 23:58:41 +00:00 |
|
Treehugger Robot
|
c8e42d59e7
|
Merge "BugreportManager API review updates." am: e0db8b998f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1584520
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I41e43baa35a660165075df1bc602cf197656df82
|
2021-02-23 23:58:26 +00:00 |
|
Treehugger Robot
|
064b340c56
|
Merge "Clean up T&C implementation" am: e22fe5dd7d am: 9c43607801
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1583505
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3be4ea39f03e9d9c8a398acba2269a0d7c3feb68
|
2021-02-23 23:58:18 +00:00 |
|
Andrew Cheng
|
2022790afc
|
Merge changes from topic "hci-disconnect-reason" am: 1c276e7591 am: 4f40f1c1f6
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597111
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7d1048a809d03138bcbe6ddc6e3e1178f3e51907
|
2021-02-23 23:57:54 +00:00 |
|
Andrew Cheng
|
972b0f8779
|
Add BluetoothConnectionCallback to Companion App am: af705d2676 am: a0dd9676c4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596076
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib5629fe35816bf368571435cc7d4956ab9bf66c8
|
2021-02-23 23:57:50 +00:00 |
|
Andrew Cheng
|
7d898bc6f9
|
Surface ACL disconnect reasons from native to Java am: b8e09882d8 am: c12293f799
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1595220
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie6246b1cca5b685d70482c73ed7b0f209d97bba3
|
2021-02-23 23:57:47 +00:00 |
|
Andrew Cheng
|
1e347371e0
|
Make BluetoothConnectionCallback static am: 8ef54b299e am: 4757f6cd7f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596074
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I49993fa34284194b78b0d34f47dd2c8969fff57e
|
2021-02-23 23:57:43 +00:00 |
|
Chih-hung Hsieh
|
d82f6409a2
|
Merge "Do not add quotes around flags argument" am: af4f8b9510
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1598500
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3f053a9b5419dc9422720dca4577615538ece2a4
|
2021-02-23 23:56:12 +00:00 |
|
Amy Zhang
|
cc2ea1657f
|
Merge "Remove unnecessary Tuner weak ref and enhance the Tuner weak ref on frontend init" into sc-dev
|
2021-02-23 23:55:43 +00:00 |
|
Amy Zhang
|
0ea82749cd
|
Merge "Check if the weak reference of java object is alive before using it" into sc-dev
|
2021-02-23 23:55:12 +00:00 |
|
Tianjie Xu
|
4d208ac97e
|
Merge "Throw an exception in RoR api on no-pin case" am: 7444774737
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1584516
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ic466002e50e6125c27f52eb2e989505720fc30c0
|
2021-02-23 23:52:30 +00:00 |
|
Treehugger Robot
|
9c43607801
|
Merge "Clean up T&C implementation" am: e22fe5dd7d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1583505
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I28c5722b7d9e4089be8f42149c3a0407ea3500a7
|
2021-02-23 23:49:21 +00:00 |
|
Treehugger Robot
|
aa677e37ce
|
Merge "Support cuttlefish with an emulated 2GB SD" am: 7c5f3fe057 am: ddcba2867e am: f4e6cdf963
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596331
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8921e6a7c9f855bf9a1f7d5c6ea5c3eb2218bfea
|
2021-02-23 23:47:49 +00:00 |
|
Phil Weaver
|
c7c7cadb7a
|
Merge "Fix concurrent modify exception for A11y" am: 2dcd402cdc am: 0b6b68b0ae am: 6881bf4a6e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1593751
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id80754eb08e878e16e1e1f9b738c0baf749d23aa
|
2021-02-23 23:47:17 +00:00 |
|
Julien Desprez
|
dcbdaf270a
|
Merge "Clean up cc_test TEST_MAPPING after default update" am: d46665bdd7 am: ac38baefa0 am: 14730f0311
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597014
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6369cb59db33e7346bb8af961d101eba852ffa62
|
2021-02-23 23:46:59 +00:00 |
|
Andrew Cheng
|
4f40f1c1f6
|
Merge changes from topic "hci-disconnect-reason" am: 1c276e7591
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597111
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I365552952f71b85e6ebbc517eb87081361d61d2c
|
2021-02-23 23:46:16 +00:00 |
|
Daniel Bright
|
1d3aefb2b0
|
[automerger skipped] Merge "Added javadoc to apn retry \ throttling related methods" am: 6fccdbb8d3 am: aab35646fc am: a845bbaa0a -s ours
am skip reason: Change-Id I35a3b97f3e52eef68310a92178bb14495641c6e7 with SHA-1 8cba5a0f7c is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1598494
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib52adc497dd8f6af88a31b05719b0ef089ffefc4
|
2021-02-23 23:46:01 +00:00 |
|
Treehugger Robot
|
0a725da38e
|
[automerger skipped] Merge "Fix NPE in AutofillManager when feature autofill is disabled" am: 782fa90be7 am: 1b0afb17d3 am: c61b65d3a3 -s ours
am skip reason: Change-Id I10ce988603f47117d0efddcc014ec51b72d3b3b4 with SHA-1 3cc809b0d9 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1511471
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie74ce06b74044063be69ea71517a37812bfdc5e8
|
2021-02-23 23:45:05 +00:00 |
|
Andrew Cheng
|
a0dd9676c4
|
Add BluetoothConnectionCallback to Companion App am: af705d2676
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596076
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3c881b415939f1bfa6f60ee5e1f2ced030b9a5ba
|
2021-02-23 23:44:08 +00:00 |
|
Cody Kesting
|
706e0ac272
|
Merge "Expose VCN Network policy APIs." am: 32a2e39563 am: e49bdb60e1 am: 1e33fdf6a7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1544188
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I269038dfbd8f36fa381015ed49e24693b1bafa59
|
2021-02-23 23:44:08 +00:00 |
|
Cody Kesting
|
3bc9cad1be
|
Merge changes I1ceccedd,Ide2c7302 am: c70a7d6258 am: 788f94aff2 am: 2c8a5fd13c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1593102
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaa8272005503a3b984a943bd62c5a522d5f14bb1
|
2021-02-23 23:43:44 +00:00 |
|
Mathew Inwood
|
b54929b5a2
|
Merge "Set updateable:false explicitly in apex rules." am: a3ab19e8f3 am: 6a103de895 am: a7286837fc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1590172
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5650736c60819b36b4dff3419208ed309bbeb3b8
|
2021-02-23 23:43:13 +00:00 |
|
Andrew Cheng
|
c12293f799
|
Surface ACL disconnect reasons from native to Java am: b8e09882d8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1595220
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I70317579c1235d84a4c491823c8b9747e135ff34
|
2021-02-23 23:41:17 +00:00 |
|
Treehugger Robot
|
f4e6cdf963
|
Merge "Support cuttlefish with an emulated 2GB SD" am: 7c5f3fe057 am: ddcba2867e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596331
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie27a22273d1164908d3a4c0ba104af6576025a95
|
2021-02-23 23:40:17 +00:00 |
|
Phil Weaver
|
6881bf4a6e
|
Merge "Fix concurrent modify exception for A11y" am: 2dcd402cdc am: 0b6b68b0ae
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1593751
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I1d891d8abc612df1fa2003ad946b98b9d22088aa
|
2021-02-23 23:39:56 +00:00 |
|
Julien Desprez
|
14730f0311
|
Merge "Clean up cc_test TEST_MAPPING after default update" am: d46665bdd7 am: ac38baefa0
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1597014
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifa40e0cb92af222fc0c0f623d94da300feeb3455
|
2021-02-23 23:39:29 +00:00 |
|
Daniel Bright
|
a845bbaa0a
|
Merge "Added javadoc to apn retry \ throttling related methods" am: 6fccdbb8d3 am: aab35646fc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1598494
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I306062a13ff4add9a0051896cc85fd15f46b65ae
|
2021-02-23 23:39:09 +00:00 |
|
Andrew Cheng
|
4757f6cd7f
|
Make BluetoothConnectionCallback static am: 8ef54b299e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596074
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id1b69b7ef8ea255fea87d68ae8806b437319d885
|
2021-02-23 23:38:24 +00:00 |
|