Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
675,355 Commits 3 Branches 0 Tags
e6491c7ec5f7ebf0a1dfb635766df8d4d95ebcff
Commit Graph

675355 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sally Yuen
e6491c7ec5 Merge "check for null listenerInfo for drag&drop" into sc-v2-dev am: d05867d498 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16032676

Change-Id: I4bbcbc75d5d5d0a4e2fabc8f0bba215a7fe376d8
 2021-10-15 09:28:02 +00:00
TreeHugger Robot
9167b90182 Merge "Catch exception when parsing faulty AVD" into sc-v2-dev am: 81f5da9ea3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15951445

Change-Id: I562181307511c4e40027f2a3c2bf64cb117719da
 2021-10-15 09:27:13 +00:00
TreeHugger Robot
7e0c759f66 Merge "Hold a wake-lock for battery % changes in AOD" into sc-v2-dev am: b81195b5fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16049051

Change-Id: Ie46a234f94bfae0a3c814175895a6b497b44d12e
 2021-10-15 09:26:22 +00:00
Vinit Nayak
1e4473b176 Merge "Add API to allow launcher to suspend AutoHideController" into sc-v2-dev am: dc8a13d662 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16008929

Change-Id: I3c9f83c44474f5587a6f29041435169bad694b45
 2021-10-15 09:25:39 +00:00
Beverly Tai
89360346bd Merge "Add log when upfps overlay isn't in sync with KeyguardUpdateMonitor" into sc-v2-dev am: 5537022d0d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16031559

Change-Id: Ie31e5f13103f8b2da946611153529e1c6b2ab7c8
 2021-10-15 09:24:54 +00:00
Andy Hung
8602ae4e02 Merge "AudioTrack: Do not throw exception from isMultichannelConfigSupported" into sc-v2-dev am: f3ca848003 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16047732

Change-Id: Ifa3e0c2475e8a5f44c5298e30af942eecf67c34b
 2021-10-15 09:24:26 +00:00
TreeHugger Robot
2d78e92903 Merge "Update Reference Sidecar Implementation Version" into sc-v2-dev am: 3ec70603c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15942580

Change-Id: I9afa0a46a9febb69e305e2a356031022f0c44dc5
 2021-10-15 09:23:03 +00:00
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
Sally Yuen
d05867d498 Merge "check for null listenerInfo for drag&drop" into sc-v2-dev 2021-10-14 20:35:23 +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
TreeHugger Robot
81f5da9ea3 Merge "Catch exception when parsing faulty AVD" into sc-v2-dev 2021-10-14 19:55:06 +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
TreeHugger Robot
b81195b5fb Merge "Hold a wake-lock for battery % changes in AOD" into sc-v2-dev 2021-10-14 19:25:43 +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
Vinit Nayak
dc8a13d662 Merge "Add API to allow launcher to suspend AutoHideController" into sc-v2-dev 2021-10-14 19:11:53 +00:00
Beverly Tai
5537022d0d Merge "Add log when upfps overlay isn't in sync with KeyguardUpdateMonitor" into sc-v2-dev 2021-10-14 19:09:51 +00:00
Andy Hung
f3ca848003 Merge "AudioTrack: Do not throw exception from isMultichannelConfigSupported" into sc-v2-dev 2021-10-14 18:59:21 +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