Treehugger Robot
8091324763
Merge "Move set member pair handle from settingLib to setting" am: 41e10b86d8 am: 07ea7a3228 am: 3ab3a0d16f am: 2c3ef27e6a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856333
Change-Id: I946ce586868082f4e17b736e3ae49d213c9495b8
2021-10-15 08:53:42 +00:00
Treehugger Robot
2c3ef27e6a
Merge "Move set member pair handle from settingLib to setting" am: 41e10b86d8 am: 07ea7a3228 am: 3ab3a0d16f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856333
Change-Id: I94a04d970d18df04d477b16de0edaa6021b096cd
2021-10-15 08:44:04 +00:00
Treehugger Robot
3ab3a0d16f
Merge "Move set member pair handle from settingLib to setting" am: 41e10b86d8 am: 07ea7a3228
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856333
Change-Id: Ie90ff7dd26035af6049246d728cd788b2bc0c032
2021-10-15 08:26:47 +00:00
Treehugger Robot
07ea7a3228
Merge "Move set member pair handle from settingLib to setting" am: 41e10b86d8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856333
Change-Id: I83272d52869356d4ada38f2669b15e4c7c846499
2021-10-15 08:11:14 +00:00
Treehugger Robot
41e10b86d8
Merge "Move set member pair handle from settingLib to setting"
2021-10-15 07:56:18 +00:00
Alice Kuo
423e648a82
Move set member pair handle from settingLib to setting
...
Remove createBond from settingLib. SystemUI and Setting have the
individual settingLib instance. If we trigger pairing inside settingLib,
the action would be called twice.
Bug: 201758444
Bug: 150670922
Test: Pair the coordinated set devices, and check the set member pairing
would be done automatically without the pairing dialog
Change-Id: I289b8af857530f0fb207b777d09d94549cfdf553
2021-10-15 13:15:08 +08:00
TreeHugger Robot
1c6178883d
[automerger skipped] Merge "Disallow overlays for ResolverActivity" into qt-dev am: f3661fc780 am: d4be365335 -s ours am: e3d406ab9a -s ours am: 6071b11999 -s ours am: 63c010460d -s ours am: 80de4b8d1c -s ours am: 0acc275d9b -s ours
...
am skip reason: skipped by user joshtrask
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15960137
Change-Id: I088ce449c5dba419a564a2df39454944e8c82704
2021-10-14 23:39:13 +00:00
TreeHugger Robot
146762019b
[automerger skipped] Merge "Disallow overlays for ResolverActivity" into qt-dev am: f3661fc780 am: d4be365335 -s ours am: e3d406ab9a -s ours am: 7dacb9fb5e -s ours am: 241c81a614 -s ours am: c8aacc1e15 -s ours am: 600c8a4afd -s ours
...
am skip reason: skipped by user joshtrask
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15960137
Change-Id: I50de4cc9064061e8d27403983e6580ac7e16ad82
2021-10-14 23:39:05 +00:00
Elliott Hughes
368edeba4f
Merge "Fix NPE in BootReceiver.addTombstoneToDropBox." am: f2ab01c09e am: 3615fbdf11 am: df923b18cd am: ea5235631f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1823178
Change-Id: I2fec24cf2af79fe46f7d5c97a2023ee748d3955f
2021-10-14 23:38:47 +00:00
TreeHugger Robot
f1964016ed
[automerger skipped] Merge "Disallow overlays for ResolverActivity" into qt-dev am: f3661fc780 am: d4be365335 -s ours am: e3d406ab9a -s ours am: 6071b11999 -s ours am: 63c010460d -s ours am: c153e0efff -s ours am: 56f35e690b -s ours
...
am skip reason: skipped by user joshtrask
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15960137
Change-Id: Ia2315ed2777756b650a32d89893961459a1927f4
2021-10-14 23:38:37 +00:00
TreeHugger Robot
86f2f00029
[automerger skipped] Merge "Disallow overlays for ResolverActivity" into qt-dev am: f3661fc780 am: d4be365335 -s ours am: e3d406ab9a -s ours am: 7dacb9fb5e -s ours am: 241c81a614 -s ours am: 7d54272649 -s ours am: 34e2a8d846 -s ours
...
am skip reason: skipped by user joshtrask
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15960137
Change-Id: Icc722afc3b6080eeb0bc435ae870ad688f6c95e5
2021-10-14 23:38:17 +00:00
TreeHugger Robot
0acc275d9b
[automerger skipped] Merge "Disallow overlays for ResolverActivity" into qt-dev am: f3661fc780 am: d4be365335 -s ours am: e3d406ab9a -s ours am: 6071b11999 -s ours am: 63c010460d -s ours am: 80de4b8d1c -s ours
...
am skip reason: skipped by user joshtrask
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15960137
Change-Id: I3b86801ce1b9a17ac15705bbacc9dd9a507cd071
2021-10-14 23:19:36 +00:00
TreeHugger Robot
600c8a4afd
[automerger skipped] Merge "Disallow overlays for ResolverActivity" into qt-dev am: f3661fc780 am: d4be365335 -s ours am: e3d406ab9a -s ours am: 7dacb9fb5e -s ours am: 241c81a614 -s ours am: c8aacc1e15 -s ours
...
am skip reason: skipped by user joshtrask
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15960137
Change-Id: Ib0e4877e35789481699a215bf4eefe31d67b1037
2021-10-14 23:19:07 +00:00
Elliott Hughes
ea5235631f
Merge "Fix NPE in BootReceiver.addTombstoneToDropBox." am: f2ab01c09e am: 3615fbdf11 am: df923b18cd
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1823178
Change-Id: I9b438983d1a458d9571d297f615ba3447af3c86f
2021-10-14 23:18:40 +00:00
TreeHugger Robot
56f35e690b
[automerger skipped] Merge "Disallow overlays for ResolverActivity" into qt-dev am: f3661fc780 am: d4be365335 -s ours am: e3d406ab9a -s ours am: 6071b11999 -s ours am: 63c010460d -s ours am: c153e0efff -s ours
...
am skip reason: skipped by user joshtrask
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15960137
Change-Id: I8545b7d0c47ec33edd5bf56ace04421da64830b0
2021-10-14 23:18:28 +00:00
TreeHugger Robot
34e2a8d846
[automerger skipped] Merge "Disallow overlays for ResolverActivity" into qt-dev am: f3661fc780 am: d4be365335 -s ours am: e3d406ab9a -s ours am: 7dacb9fb5e -s ours am: 241c81a614 -s ours am: 7d54272649 -s ours
...
am skip reason: skipped by user joshtrask
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15960137
Change-Id: I4ad826957bded28c5dd626f2f4bf494ccd38b38b
2021-10-14 23:18:12 +00:00
Elliott Hughes
df923b18cd
Merge "Fix NPE in BootReceiver.addTombstoneToDropBox." am: f2ab01c09e am: 3615fbdf11
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1823178
Change-Id: Ic65d659d0cc2116d9289b2e6581af23917285dc2
2021-10-14 23:04:16 +00:00
TreeHugger Robot
80de4b8d1c
[automerger skipped] Merge "Disallow overlays for ResolverActivity" into qt-dev am: f3661fc780 am: d4be365335 -s ours am: e3d406ab9a -s ours am: 6071b11999 -s ours am: 63c010460d -s ours
...
am skip reason: skipped by user joshtrask
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15960137
Change-Id: I9ecb33a8ccc0f97617d48f5ff1e25ef57ae3970c
2021-10-14 23:04:11 +00:00
TreeHugger Robot
c8aacc1e15
[automerger skipped] Merge "Disallow overlays for ResolverActivity" into qt-dev am: f3661fc780 am: d4be365335 -s ours am: e3d406ab9a -s ours am: 7dacb9fb5e -s ours am: 241c81a614 -s ours
...
am skip reason: skipped by user joshtrask
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15960137
Change-Id: Iec2e808c5f377429378e4f1d6dd4fb0a7f15cdf1
2021-10-14 23:04:03 +00:00
TreeHugger Robot
c153e0efff
[automerger skipped] Merge "Disallow overlays for ResolverActivity" into qt-dev am: f3661fc780 am: d4be365335 -s ours am: e3d406ab9a -s ours am: 6071b11999 -s ours am: 63c010460d -s ours
...
am skip reason: skipped by user joshtrask
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15960137
Change-Id: If2920a4577f25ae31df654a9ec6485d607bc5fe7
2021-10-14 23:03:39 +00:00
TreeHugger Robot
7d54272649
[automerger skipped] Merge "Disallow overlays for ResolverActivity" into qt-dev am: f3661fc780 am: d4be365335 -s ours am: e3d406ab9a -s ours am: 7dacb9fb5e -s ours am: 241c81a614 -s ours
...
am skip reason: skipped by user joshtrask
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15960137
Change-Id: Ia312c564c697210f4a76e7971335040da814feb7
2021-10-14 23:03:07 +00:00
TreeHugger Robot
63c010460d
[automerger skipped] Merge "Disallow overlays for ResolverActivity" into qt-dev am: f3661fc780 am: d4be365335 -s ours am: e3d406ab9a -s ours am: 6071b11999 -s ours
...
am skip reason: skipped by user joshtrask
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15960137
Change-Id: I5c653d3d75eb94c07d79a6f50157e9ed6e5e8088
2021-10-14 22:54:29 +00:00
Elliott Hughes
3615fbdf11
Merge "Fix NPE in BootReceiver.addTombstoneToDropBox." am: f2ab01c09e
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1823178
Change-Id: I15a231d3dbc22577c366c61154e1f5b49ad99f04
2021-10-14 22:54:13 +00:00
TreeHugger Robot
241c81a614
[automerger skipped] Merge "Disallow overlays for ResolverActivity" into qt-dev am: f3661fc780 am: d4be365335 -s ours am: e3d406ab9a -s ours am: 7dacb9fb5e -s ours
...
am skip reason: skipped by user joshtrask
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15960137
Change-Id: I1090649f7622af8613a34a1fce70cfbd3241953c
2021-10-14 22:53:00 +00:00
Elliott Hughes
f2ab01c09e
Merge "Fix NPE in BootReceiver.addTombstoneToDropBox."
2021-10-14 22:40:00 +00:00
TreeHugger Robot
6071b11999
[automerger skipped] Merge "Disallow overlays for ResolverActivity" into qt-dev am: f3661fc780 am: d4be365335 -s ours am: e3d406ab9a -s ours
...
am skip reason: skipped by user joshtrask
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15960137
Change-Id: Ibcefc625d834c5d00275551ca20b164c77169052
2021-10-14 22:37:10 +00:00
TreeHugger Robot
7dacb9fb5e
[automerger skipped] Merge "Disallow overlays for ResolverActivity" into qt-dev am: f3661fc780 am: d4be365335 -s ours am: e3d406ab9a -s ours
...
am skip reason: skipped by user joshtrask
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15960137
Change-Id: Ice9c20b9018cead99a36c4126086fe360346516c
2021-10-14 22:37:09 +00:00
TreeHugger Robot
e3d406ab9a
[automerger skipped] Merge "Disallow overlays for ResolverActivity" into qt-dev am: f3661fc780 am: d4be365335 -s ours
...
am skip reason: skipped by user joshtrask
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15960137
Change-Id: I3398972f2772e2a688d391b246bc9b121f7ea204
2021-10-14 22:18:42 +00:00
Christian Wailes
4240b8cc4d
Merge "Updated OWNERS file" am: 59e9a53f60 am: b609c7e04a am: 3e03850e7f am: 84d6f82481
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1855767
Change-Id: I559da3b3aca5d268c6be1af504d4b31a76085b15
2021-10-14 20:05:33 +00:00
Christian Wailes
84d6f82481
Merge "Updated OWNERS file" am: 59e9a53f60 am: b609c7e04a am: 3e03850e7f
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1855767
Change-Id: I0ee0c4e07e3f4db7274ff08e7b083d4c0d8f7094
2021-10-14 19:51:51 +00:00
Christian Wailes
3e03850e7f
Merge "Updated OWNERS file" am: 59e9a53f60 am: b609c7e04a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1855767
Change-Id: I25f5b116e7300a26f0399543f7536ee21ae7f999
2021-10-14 19:32:35 +00:00
Christian Wailes
b609c7e04a
Merge "Updated OWNERS file" am: 59e9a53f60
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1855767
Change-Id: Idf68e62ec0e369828cd44ddc6c6d71a6af94a3d8
2021-10-14 19:17:41 +00:00
Christian Wailes
59e9a53f60
Merge "Updated OWNERS file"
2021-10-14 18:57:32 +00:00
Steven Moreland
b6dd3438c8
Merge "getBlobAshmemSize -> getOpenAshmemSize" am: b146c8bedb am: ab8578378d am: 4ef3dc86b8 am: 7402f8c51b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1854070
Change-Id: I4bb5829ffcad5511dd5fdb4838dc9fb75fc76acc
2021-10-14 18:33:08 +00:00
Hao Ke
59fdfa75a3
Merge "Add “@throws BadParcelableException” to the JavaDoc of new API methods that throw the exception." am: d6f306117a am: ce08bacce0 am: 956294ef72 am: 0cdb183ba9
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1857934
Change-Id: I5f97834c0b9aec14086023ff85ffb8f7f176e019
2021-10-14 18:32:38 +00:00
Steven Moreland
7402f8c51b
Merge "getBlobAshmemSize -> getOpenAshmemSize" am: b146c8bedb am: ab8578378d am: 4ef3dc86b8
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1854070
Change-Id: I13d8848ed6cc4823555af1db46f5e186c292a63e
2021-10-14 18:17:56 +00:00
Hao Ke
0cdb183ba9
Merge "Add “@throws BadParcelableException” to the JavaDoc of new API methods that throw the exception." am: d6f306117a am: ce08bacce0 am: 956294ef72
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1857934
Change-Id: I234e7606d9e2f948df596dd75aa7664a878bfa69
2021-10-14 18:17:38 +00:00
Steven Moreland
4ef3dc86b8
Merge "getBlobAshmemSize -> getOpenAshmemSize" am: b146c8bedb am: ab8578378d
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1854070
Change-Id: Iafc23be921f28c084b6a5fecaadf60d8bf424a1f
2021-10-14 18:02:39 +00:00
Hao Ke
956294ef72
Merge "Add “@throws BadParcelableException” to the JavaDoc of new API methods that throw the exception." am: d6f306117a am: ce08bacce0
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1857934
Change-Id: I4108e9e894466ff13ebde63191d0404f95a3a3dc
2021-10-14 18:02:13 +00:00
Steven Moreland
ab8578378d
Merge "getBlobAshmemSize -> getOpenAshmemSize" am: b146c8bedb
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1854070
Change-Id: I4c3691e56fef89c0a3e4fe0d4494d807128ff61f
2021-10-14 17:48:04 +00:00
TreeHugger Robot
b5c9e938e6
Merge "Remove flag plugin with flag manager with DI" into sc-v2-dev am: 24e2465847
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16040960
Change-Id: Iab196751ba1e88e4c59f8c3212100cd0d6c6b341
2021-10-14 17:47:55 +00:00
Hao Ke
ce08bacce0
Merge "Add “@throws BadParcelableException” to the JavaDoc of new API methods that throw the exception." am: d6f306117a
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1857934
Change-Id: Ie91b63142355e26dc5e27216ac9f53a4ebe492d3
2021-10-14 17:47:17 +00:00
Treehugger Robot
dd1be6c2db
Merge "Partial revert "Wait for unlock to start jobs."" am: 214a74b728 am: 63013a442b am: 13ff1dd274 am: 493d6155ad
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1852928
Change-Id: I4e6435a0e9bf2514c98efa65e7959bab1bc8bf31
2021-10-14 17:46:23 +00:00
Steven Moreland
b146c8bedb
Merge "getBlobAshmemSize -> getOpenAshmemSize"
2021-10-14 17:43:16 +00:00
TreeHugger Robot
24e2465847
Merge "Remove flag plugin with flag manager with DI" into sc-v2-dev
2021-10-14 17:36:46 +00:00
Hao Ke
d6f306117a
Merge "Add “@throws BadParcelableException” to the JavaDoc of new API methods that throw the exception."
2021-10-14 17:30:43 +00:00
Treehugger Robot
493d6155ad
Merge "Partial revert "Wait for unlock to start jobs."" am: 214a74b728 am: 63013a442b am: 13ff1dd274
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1852928
Change-Id: Ia1462b70390b6e4ecd00641fe3da3d6f4604c1f9
2021-10-14 17:29:10 +00:00
Treehugger Robot
13ff1dd274
Merge "Partial revert "Wait for unlock to start jobs."" am: 214a74b728 am: 63013a442b
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1852928
Change-Id: Id5ef1d1745b10a52916286371c575e87233d2f60
2021-10-14 17:17:00 +00:00
Treehugger Robot
63013a442b
Merge "Partial revert "Wait for unlock to start jobs."" am: 214a74b728
...
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1852928
Change-Id: I7a7edfc0e461268dc7c25f504dc674100aeb8e9b
2021-10-14 17:01:58 +00:00
TreeHugger Robot
e63e181cb7
Merge "[Provider Model] Increase the maximum height of Internet Dialog" into sc-v2-dev am: f1ea2165d0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16047749
Change-Id: If53571599d0b0f9f58a680d5a183a4e2f2b2e64c
2021-10-14 16:46:37 +00:00
