Kevin Han
c03ec964c5
Merge "Register AppHibernationManager in service registry" am: 44183743e0 am: 0de60cd4e8 am: 2c842f3aa7
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1572766
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3419fcaa184043d07c6e02579b6dec13d23f356f
2021-02-24 02:12:34 +00:00
Paul Hu
575877afd9
Merge "Use PermissionUtils" am: 584e907d7a am: 93798f22e8 am: 85468ed557
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559098
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I4833704b1494516871d8a2c8ba24c3ea741266d2
2021-02-24 02:11:59 +00:00
Evan Severson
0088eefaac
Merge "Remove permission correcting code" into sc-dev
2021-02-24 01:32:03 +00:00
TreeHugger Robot
7b68417fe8
Merge "CachedAppOptimizer: fix fd leak." into sc-dev
2021-02-24 01:31:56 +00:00
Kevin Han
2c842f3aa7
Merge "Register AppHibernationManager in service registry" am: 44183743e0 am: 0de60cd4e8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1572766
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ied0817ca6d49f0861bdb929a6fca78a1d75cb729
2021-02-24 01:23:36 +00:00
Paul Hu
85468ed557
Merge "Use PermissionUtils" am: 584e907d7a am: 93798f22e8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559098
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I483e0db6e9aac5d8ca8d4aa6912fa6f66b198e87
2021-02-24 01:23:09 +00:00
Kevin Han
e040263f27
Merge "Check user states exist before package add/removal" am: 486816e35f am: aee5302128 am: 8c14a6863e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1593100
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I52150c5e364580ea74f43f60dbf764ad9121874a
2021-02-24 01:09:13 +00:00
Kevin Han
31d1ff3b8d
Merge "Support dynamic feature flag config" am: 201737c781 am: b9f0ad138b am: ac520aad0d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587774
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ib612a893e68e50d1abdfd5c788fb46459e329c2d
2021-02-24 01:09:00 +00:00
Chiachang Wang
77b8356060
Merge "Move shared methods to net shared lib" am: 14da611403 am: f3e5492c46 am: 4529181d4f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571901
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0b7028aa8bb303edf27f4ff93f54a753d0b4ee78
2021-02-24 01:08:24 +00:00
Calin Juravle
4d03c52660
Merge "Always use the latest CLC for system server" am: c627177587 am: 6c7dcfeccc am: 8900f912e5
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1584564
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I0b10842a46df176c2ff0ff8f8a77dd5be0cb41f0
2021-02-24 01:07:39 +00:00
Matt Casey
656e9cce40
Merge "Follow-on fixes for long screenshot activity" into sc-dev
2021-02-24 01:02:09 +00:00
Lucas Dupin
e36c4de103
Merge "Revert "[framework] Integrate new quantizers"" into sc-dev
2021-02-24 01:00:49 +00:00
Lucas Dupin
2b821d14bc
Merge "Fix background colors on some themes" into sc-dev
2021-02-24 00:55:33 +00:00
Kevin Han
8c14a6863e
Merge "Check user states exist before package add/removal" am: 486816e35f am: aee5302128
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1593100
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8edda516d5bb60c11d332b741046c91f5a6a2797
2021-02-24 00:40:16 +00:00
Kevin Han
ac520aad0d
Merge "Support dynamic feature flag config" am: 201737c781 am: b9f0ad138b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587774
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I183892c7df058dc6f73c08afda263a0a840293bb
2021-02-24 00:40:12 +00:00
Chiachang Wang
4529181d4f
Merge "Move shared methods to net shared lib" am: 14da611403 am: f3e5492c46
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571901
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I09beedc0e71685bba4fa6dc5cc80907ec923b684
2021-02-24 00:39:42 +00:00
Calin Juravle
8900f912e5
Merge "Always use the latest CLC for system server" am: c627177587 am: 6c7dcfeccc
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1584564
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie1590ceef18959ac7cf6da6351072323aec696e6
2021-02-24 00:39:15 +00:00
TreeHugger Robot
f6d8a8390b
Merge "Update toast parameters instead of re-adding" into sc-dev
2021-02-24 00:34:02 +00:00
James O'Leary
96169052c4
Revert "[framework] Integrate new quantizers"
...
Revert "[sysuig] Integrate Monet color extraction to theme algorithm"
Revert submission 13554372-kahuna
Reason for revert: Colors on some wallpapers shifted, and Lucas found a couple big reasons why, would rather revert a revert tomorrow than fix forward today
Reverted Changes:
I2c3df9f71:[sysuig] Integrate Monet color extraction to theme...
I0fc60a134:[framework] Integrate new quantizers
Change-Id: I7eb8e4fde243bf62e8c750f88028db0a427560b5
2021-02-24 00:33:02 +00:00
Kevin Han
0de60cd4e8
Merge "Register AppHibernationManager in service registry" am: 44183743e0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1572766
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ibf8ac130fe7800af2d83b16f2ae90a7df5558c62
2021-02-24 00:32:44 +00:00
Paul Hu
93798f22e8
Merge "Use PermissionUtils" am: 584e907d7a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559098
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I81a3b8d23d1d708675206b36367326c44113c46d
2021-02-24 00:29:54 +00:00
Kevin Han
aee5302128
Merge "Check user states exist before package add/removal" am: 486816e35f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1593100
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iaa4d3d86b603a2fe7b05d0d3e9de72c01b14eb34
2021-02-24 00:27:09 +00:00
Lucas Dupin
87f70dbf5d
Merge "Do not reinflate navbar on theme changes" into sc-dev
2021-02-24 00:24:19 +00:00
Kevin Han
b9f0ad138b
Merge "Support dynamic feature flag config" am: 201737c781
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1587774
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id45fa63b0059bbbc9206cdd8e7e3c8e699b5c9b7
2021-02-24 00:24:12 +00:00
Michael Wright
69a0c089e9
Merge "Consolidate OWNERS for input" am: 471c70287e am: 916d84985b am: 863092a877
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1600293
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I83f41b7b86208b6ada82728c08043e76f57ac44a
2021-02-24 00:23:09 +00:00
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
Chiachang Wang
f3e5492c46
Merge "Move shared methods to net shared lib" am: 14da611403
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571901
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3baac3770814ea1aba213e54430c44308b0c07bc
2021-02-24 00:16:42 +00:00
Michael Wright
863092a877
Merge "Consolidate OWNERS for input" am: 471c70287e am: 916d84985b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1600293
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie7ec688ae8ec0ce72fee8bfae130d951f95400d1
2021-02-24 00:15:17 +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
Calin Juravle
6c7dcfeccc
Merge "Always use the latest CLC for system server" am: c627177587
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1584564
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I395c3c3bc7533ef3d45cca88b2a14e548b2677c5
2021-02-24 00:13:49 +00:00
Michael Wright
916d84985b
Merge "Consolidate OWNERS for input" am: 471c70287e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1600293
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I365e6075c104f327331e08fc642c74d0050c21b5
2021-02-24 00:10:55 +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