Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
542,466 Commits 3 Branches 0 Tags
56936beddd997d381a4e893c437d396caabbe02e
Commit Graph

542466 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Antoan Angelov
59804dccba Merge "Show disclosure for work profile on org owned device in keyguard" into rvc-dev 2020-06-22 17:49:16 +00:00
TreeHugger Robot
2129ea98da Merge "Update style drawables after bugbash" into rvc-d1-dev 2020-06-22 17:42:07 +00:00
Marvin Ramin
c7778b1d8a Merge "CEC: Run all actions after TV allocates address" into rvc-dev-plus-aosp am: 648b80d622 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11953483

Change-Id: I6917cb4633bc566a36ec06a0595b2645d77315ae
 2020-06-22 17:36:51 +00:00
Matt Pietal
53e190d887 Merge "Controls UI - Show timeout msg and not controls on error" into rvc-dev am: cde9d6b37f am: 8de9d2b451 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11941804

Change-Id: I0ecbe4fa1a6fbcc3340977f2e901d2ecb929b650
 2020-06-22 17:36:39 +00:00
Automerger Merge Worker
4e82eb3ce6 Merge "Merge "AudioTrack: Update javadoc" into rvc-dev am: 72998aeaf7 am: 98ef1743b4" into rvc-d1-dev-plus-aosp 2020-06-22 17:36:05 +00:00
Matt Pietal
ccb7801722 Merge "Controls UI - Show timeout msg and not controls on error" into rvc-dev am: cde9d6b37f am: c38d8f0bf1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11941804

Change-Id: I25db131c13d88aab866ea0b7cc3b0ac4bcf07de5
 2020-06-22 17:35:54 +00:00
Matt Pietal
66d9cd0641 Merge "Controls UI - Show timeout msg and not controls on error" into rvc-dev am: cde9d6b37f am: c38d8f0bf1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11941804

Change-Id: Ic15ed73be29b5ad49421f5251f06b522e306e2df
 2020-06-22 17:35:52 +00:00
Andy Hung
f236676828 Merge "AudioTrack: Update javadoc" into rvc-dev am: 72998aeaf7 am: 98ef1743b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932147

Change-Id: I8a5adacabc3e511a2ab0174ee73468c87496a428
 2020-06-22 17:35:50 +00:00
Automerger Merge Worker
a6b84001ab Merge "Merge "AudioTrack: Update javadoc" into rvc-dev am: 72998aeaf7 am: 6176456336" into rvc-d1-dev-plus-aosp 2020-06-22 17:35:49 +00:00
Andy Hung
78a68c7d52 Merge "AudioTrack: Update javadoc" into rvc-dev am: 72998aeaf7 am: 6176456336 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932147

Change-Id: I2eb9b6f490daa1a6dbed8367b6ffd653fb1f7433
 2020-06-22 17:35:39 +00:00
Treehugger Robot
bb606cfc11 Merge "A2DP: Check AAC bitrate mode by its CodecSpecific1" am: bdc57bef81 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1207444

Change-Id: Ifc20ab03e30411a33230eb02a7650109d1c2c0e7
 2020-06-22 17:35:34 +00:00
Andy Hung
089a1435d0 Merge "AudioTrack: Update javadoc" into rvc-dev am: 72998aeaf7 am: 6176456336 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932147

Change-Id: Ife685c139b684edd186d0c2382c08e9bf0ab60b5
 2020-06-22 17:35:34 +00:00
TreeHugger Robot
aaa58fd871 Merge "Correct the name of enum UserType item" into rvc-dev am: 06cfd49914 am: cd463e4191 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932651

Change-Id: I9b1e685239d26a85f11766a43eebf7845c4a1bef
 2020-06-22 17:35:27 +00:00
TreeHugger Robot
c00127486b Merge "Correct the name of enum UserType item" into rvc-dev am: 06cfd49914 am: 0e5f389159 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932651

Change-Id: I62d825fe796db9eb572306ff02261495945b7cf6
 2020-06-22 17:35:24 +00:00
TreeHugger Robot
fe900b1a5d Merge "Correct the name of enum UserType item" into rvc-dev am: 06cfd49914 am: 0e5f389159 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932651

Change-Id: Id1a7e9c6e57d3673cde26cdc65fd964302b365c0
 2020-06-22 17:35:10 +00:00
Marvin Ramin
648b80d622 Merge "CEC: Run all actions after TV allocates address" into rvc-dev-plus-aosp 2020-06-22 17:26:40 +00:00
Treehugger Robot
bdc57bef81 Merge "A2DP: Check AAC bitrate mode by its CodecSpecific1" 2020-06-22 17:22:54 +00:00
Matt Pietal
8de9d2b451 Merge "Controls UI - Show timeout msg and not controls on error" into rvc-dev am: cde9d6b37f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11941804

Change-Id: I9043d8e4ca1f350ebea732b3ed4a6b6e78a88f0f
 2020-06-22 17:22:15 +00:00
Matt Pietal
c38d8f0bf1 Merge "Controls UI - Show timeout msg and not controls on error" into rvc-dev am: cde9d6b37f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11941804

Change-Id: Id13578a1fcfdd28b0baba65cd74e7fbbc69acc74
 2020-06-22 17:22:07 +00:00
Andy Hung
6176456336 Merge "AudioTrack: Update javadoc" into rvc-dev am: 72998aeaf7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932147

Change-Id: I5beea974c7057c08813946a93e38b1d66838b4a1
 2020-06-22 17:21:53 +00:00
Andy Hung
98ef1743b4 Merge "AudioTrack: Update javadoc" into rvc-dev am: 72998aeaf7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932147

Change-Id: I372c962a1ff0f3f9e4972998452789cf0edb3fc3
 2020-06-22 17:21:50 +00:00
TreeHugger Robot
cd463e4191 Merge "Correct the name of enum UserType item" into rvc-dev am: 06cfd49914 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932651

Change-Id: I75103ba087a2539c987a85b73976a9a0a77aa391
 2020-06-22 17:21:12 +00:00
TreeHugger Robot
0e5f389159 Merge "Correct the name of enum UserType item" into rvc-dev am: 06cfd49914 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932651

Change-Id: Ia59ce826e2362adaee7bfff6c41a655fa64b2b48
 2020-06-22 17:21:12 +00:00
Matt Pietal
cde9d6b37f Merge "Controls UI - Show timeout msg and not controls on error" into rvc-dev 2020-06-22 17:18:42 +00:00
Fabian Kozynski
f4ade0f9f5 Merge "Make SeekBar 1dp tall when disabled" into rvc-dev am: 6a75f1332f am: a2097465a1 am: a6bd528b19 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11936020

Change-Id: I1f15735d2f626186f92f7dd94323fe3612ff789f
 2020-06-22 17:17:20 +00:00
Alison Cichowlas
1c7877e663 Merge "When Nearby is present as a chip, exclude it from app list." into rvc-dev am: 974d17209e am: 7f69e3e6a1 am: b1a66e18e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931365

Change-Id: I20fe84cbc00154aa01d442e2f12e17c8caff1ab8
 2020-06-22 17:17:04 +00:00
TreeHugger Robot
ab4571151b Merge "Turn off quiet mode in the background, allowing the dialog to dismiss quicker." into rvc-dev am: 63458fb6e5 am: c903377bc7 am: 58e98ee649 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931083

Change-Id: I4e7da57c8f9616864fdb2493de41b599794efd26
 2020-06-22 17:16:51 +00:00
Treehugger Robot
78ff31cbb4 [automerger skipped] Merge "Update DnsManagerTest for AIDL interface change" am: e9b37e0726 am: 1af8487ed2 -s ours am: 3da0597e95 -s ours am: fcafef1c81 -s ours 
am skip reason: Change-Id Ic53f42b968626294c851dac252a70769846ba427 with SHA-1 125db20ee5 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1345375

Change-Id: Ifbae62d0af4076d9986ff2965d0d28bb96f7d4f7
 2020-06-22 17:16:42 +00:00
Fabian Kozynski
0cb7a50fe8 Merge "Make SeekBar 1dp tall when disabled" into rvc-dev am: 6a75f1332f am: 32026857ab am: abc8699787 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11936020

Change-Id: I0846f4817f69c1174835060939ae4f8b05175c6d
 2020-06-22 17:16:27 +00:00
Alison Cichowlas
d03eb295fb Merge "When Nearby is present as a chip, exclude it from app list." into rvc-dev am: 974d17209e am: c71b0edf6f am: 1597a9eacf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931365

Change-Id: Icec56834af35ccbab0948afe322170112faf960b
 2020-06-22 17:16:06 +00:00
Automerger Merge Worker
e1bef4701f Merge "Merge "Turn off quiet mode in the background, allowing the dialog to dismiss quicker." into rvc-dev am: 63458fb6e5 am: f978d16719" into rvc-d1-dev-plus-aosp am: 83049ea721 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931083

Change-Id: I45f4bd9762b7cc4818579fc6283027acd4c0cb4b
 2020-06-22 17:15:20 +00:00
Andy Hung
72998aeaf7 Merge "AudioTrack: Update javadoc" into rvc-dev 2020-06-22 17:15:09 +00:00
Fabian Kozynski
648832d6f2 Merge "Make SeekBar 1dp tall when disabled" into rvc-dev am: 6a75f1332f am: 32026857ab am: 8278544495 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11936020

Change-Id: I59c809ca136fc6755615a00e978f67392a0357f9
 2020-06-22 17:14:46 +00:00
Automerger Merge Worker
bf0edba280 Merge "Merge "Verify staged session remain unchanged on system server reboot" into rvc-dev am: 9cf5156fed am: 42a637d4ee am: e832a7c0da" into rvc-qpr-dev-plus-aosp 2020-06-22 17:14:44 +00:00
TreeHugger Robot
8a81582678 Merge "Verify staged session remain unchanged on system server reboot" into rvc-dev am: 9cf5156fed am: 42a637d4ee am: e832a7c0da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838108

Change-Id: I2f50e575c5431f4f101bd26432bd2908ae3f1243
 2020-06-22 17:14:35 +00:00
Alison Cichowlas
55e138075c Merge "When Nearby is present as a chip, exclude it from app list." into rvc-dev am: 974d17209e am: c71b0edf6f am: f231e027f2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931365

Change-Id: Id0a70a98b3f6a52b4d5dfa3475b7d77fe7b3e677
 2020-06-22 17:14:27 +00:00
TreeHugger Robot
e559e16c16 Merge "Turn off quiet mode in the background, allowing the dialog to dismiss quicker." into rvc-dev am: 63458fb6e5 am: f978d16719 am: 5f20fc8f85 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931083

Change-Id: I0ebd2bcbdd3f2eca1fb51a6aed8e5e89e7a66c6b
 2020-06-22 17:14:05 +00:00
TreeHugger Robot
2a680e638c Merge "Verify staged session remain unchanged on system server reboot" into rvc-dev am: 9cf5156fed am: b54c17b229 am: c2eb8b0e82 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838108

Change-Id: Ibf446f235c2af05dd9056b7f1226bb2f10aad4c1
 2020-06-22 17:12:53 +00:00
TreeHugger Robot
5fafcbcdae Merge "Verify staged session remain unchanged on system server reboot" into rvc-dev am: 9cf5156fed am: b54c17b229 am: b0d78529a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838108

Change-Id: I1a79cb8fb5e875c16ecc76bf33b3a33890e4e44b
 2020-06-22 17:12:25 +00:00
TreeHugger Robot
06cfd49914 Merge "Correct the name of enum UserType item" into rvc-dev 2020-06-22 17:06:58 +00:00
Fabian Kozynski
a6bd528b19 Merge "Make SeekBar 1dp tall when disabled" into rvc-dev am: 6a75f1332f am: a2097465a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11936020

Change-Id: Ifc8c37bad8c406c4400433221ea03b39cf2a68f6
 2020-06-22 17:05:52 +00:00
Alison Cichowlas
b1a66e18e4 Merge "When Nearby is present as a chip, exclude it from app list." into rvc-dev am: 974d17209e am: 7f69e3e6a1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931365

Change-Id: Id6dc575719a610467873e1e526edd25910282cb6
 2020-06-22 17:05:38 +00:00
TreeHugger Robot
58e98ee649 Merge "Turn off quiet mode in the background, allowing the dialog to dismiss quicker." into rvc-dev am: 63458fb6e5 am: c903377bc7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931083

Change-Id: I55b4745c158825e510f0bea603000f6534b1f979
 2020-06-22 17:05:18 +00:00
Treehugger Robot
fcafef1c81 [automerger skipped] Merge "Update DnsManagerTest for AIDL interface change" am: e9b37e0726 am: 1af8487ed2 -s ours am: 3da0597e95 -s ours 
am skip reason: Change-Id Ic53f42b968626294c851dac252a70769846ba427 with SHA-1 125db20ee5 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1345375

Change-Id: Idcf69400cac750cd32c7f237219f30c3e7d528d7
 2020-06-22 17:04:59 +00:00
Fabian Kozynski
abc8699787 Merge "Make SeekBar 1dp tall when disabled" into rvc-dev am: 6a75f1332f am: 32026857ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11936020

Change-Id: Id0569aba95aea3e853f8e13b1c97ae2026f7c38a
 2020-06-22 17:04:34 +00:00
Fabian Kozynski
8278544495 Merge "Make SeekBar 1dp tall when disabled" into rvc-dev am: 6a75f1332f am: 32026857ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11936020

Change-Id: I6448c99db62ffb9972856b88c53e75be1da05a59
 2020-06-22 17:04:25 +00:00
Alison Cichowlas
1597a9eacf Merge "When Nearby is present as a chip, exclude it from app list." into rvc-dev am: 974d17209e am: c71b0edf6f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931365

Change-Id: I028ebbaa2071ccf91e2e9cc95e86b4e44242c360
 2020-06-22 17:04:22 +00:00
Alison Cichowlas
f231e027f2 Merge "When Nearby is present as a chip, exclude it from app list." into rvc-dev am: 974d17209e am: c71b0edf6f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931365

Change-Id: I5e543d326bbe76941fe616462531a922ac7bbc90
 2020-06-22 17:04:12 +00:00
Automerger Merge Worker
83049ea721 Merge "Merge "Turn off quiet mode in the background, allowing the dialog to dismiss quicker." into rvc-dev am: 63458fb6e5 am: f978d16719" into rvc-d1-dev-plus-aosp 2020-06-22 17:04:00 +00:00
TreeHugger Robot
7ab65c71fb Merge "Turn off quiet mode in the background, allowing the dialog to dismiss quicker." into rvc-dev am: 63458fb6e5 am: f978d16719 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931083

Change-Id: I58ba69b1ae45270b02c715d09d5d34abd0ab536d
 2020-06-22 17:03:47 +00:00