Commit Graph

542466 Commits

Author SHA1 Message Date
Keun-young Park
56936beddd Merge "Restore lost unlocked users after vold reset" into rvc-dev am: f9dcad0b12 am: 8e6eb848f6 am: 482cb2fa8d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11920286

Change-Id: I0c7dc28e5dc72561d3f17004452300b6baf5b332
2020-06-22 18:52:03 +00:00
Will Brockman
20b222e840 Merge "Update section enum for statsd notif panel logs." into rvc-dev am: 7ebbe4fc60 am: 8f127c5113 am: b8b802080d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11941805

Change-Id: I5283c379a38176daf1fba44ca681832660ab9c98
2020-06-22 18:51:54 +00:00
Keun-young Park
aa60a9dcf0 Merge "Restore lost unlocked users after vold reset" into rvc-dev am: f9dcad0b12 am: 543d7e8c18 am: e466414cce
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11920286

Change-Id: Ida8e2d59c0950ef9a2d4a4142a8d10a515ef9e9d
2020-06-22 18:51:46 +00:00
Will Brockman
eb45a7802d Merge "Update section enum for statsd notif panel logs." into rvc-dev am: 7ebbe4fc60 am: bd94c081a1 am: e04879f25e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11941805

Change-Id: I1de21990eee42040038f6b54ce9c5dd5763209c2
2020-06-22 18:51:35 +00:00
Automerger Merge Worker
4c9e4d8438 Merge "Merge "Updates enterPictureInPicture API doc" into rvc-dev am: 997150ee0a am: b1d028531b am: 4d275b65ab" into rvc-qpr-dev-plus-aosp 2020-06-22 18:51:16 +00:00
Hongwei Wang
25ce837a23 Merge "Updates enterPictureInPicture API doc" into rvc-dev am: 997150ee0a am: b1d028531b am: 4d275b65ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/10961377

Change-Id: Iefd1be361bb971da1e1fbc29d024168c748acd75
2020-06-22 18:51:08 +00:00
Hongwei Wang
e542939447 Merge "Updates enterPictureInPicture API doc" into rvc-dev am: 997150ee0a am: b1d028531b am: 7ad3c87ae1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/10961377

Change-Id: I482371fab43ff7e960dec383e10f5b9b21cd8e6e
2020-06-22 18:51:05 +00:00
Hongwei Wang
c0643da38f Merge "Updates enterPictureInPicture API doc" into rvc-dev am: 997150ee0a am: 4cac31dde3 am: 29afe59ac4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/10961377

Change-Id: I4d281c0f620d06f5cd3f2aed27cd4521c665982f
2020-06-22 18:50:17 +00:00
Keun-young Park
482cb2fa8d Merge "Restore lost unlocked users after vold reset" into rvc-dev am: f9dcad0b12 am: 8e6eb848f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11920286

Change-Id: Ibe39b88bb8302ed3834848254ebcfe671c157e97
2020-06-22 18:40:16 +00:00
Keun-young Park
e466414cce Merge "Restore lost unlocked users after vold reset" into rvc-dev am: f9dcad0b12 am: 543d7e8c18
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11920286

Change-Id: I33c61d074a3452806ce17a7e3767a3a6f2f35118
2020-06-22 18:40:12 +00:00
Will Brockman
b8b802080d Merge "Update section enum for statsd notif panel logs." into rvc-dev am: 7ebbe4fc60 am: 8f127c5113
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11941805

Change-Id: I4f85cc2b99b015479c5bcfa772aeffcef64b691f
2020-06-22 18:40:00 +00:00
Will Brockman
e04879f25e Merge "Update section enum for statsd notif panel logs." into rvc-dev am: 7ebbe4fc60 am: bd94c081a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11941805

Change-Id: I5a805b187f93d344a956dca714f5e0bf2b986fe4
2020-06-22 18:39:57 +00:00
Hongwei Wang
4d275b65ab Merge "Updates enterPictureInPicture API doc" into rvc-dev am: 997150ee0a am: b1d028531b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/10961377

Change-Id: I5e0f39c3f979ac5b60b65eca193f222523ffa3bd
2020-06-22 18:39:48 +00:00
Hongwei Wang
7ad3c87ae1 Merge "Updates enterPictureInPicture API doc" into rvc-dev am: 997150ee0a am: b1d028531b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/10961377

Change-Id: I1408ab1f96a68f2352be4fa421628301af6a93e1
2020-06-22 18:39:33 +00:00
Hongwei Wang
29afe59ac4 Merge "Updates enterPictureInPicture API doc" into rvc-dev am: 997150ee0a am: 4cac31dde3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/10961377

Change-Id: If123c397d1b6ce7e0820b71fb1f41b8039267f8c
2020-06-22 18:39:21 +00:00
Antoan Angelov
f80b770042 Merge "Show disclosure for work profile on org owned device in keyguard" into rvc-dev am: 59804dccba am: 1b08baf416 am: d473d2a565
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931086

Change-Id: Ide7afa44b48ab64ef5efa66b76893ff95e788253
2020-06-22 18:34:53 +00:00
Antoan Angelov
115f2686d7 Merge "Show disclosure for work profile on org owned device in keyguard" into rvc-dev am: 59804dccba am: 1b08baf416 am: 36976a22e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931086

Change-Id: I597c57779c80c871dbd7a937c1da1ef55daa3042
2020-06-22 18:29:45 +00:00
Antoan Angelov
a954f63620 Merge "Show disclosure for work profile on org owned device in keyguard" into rvc-dev am: 59804dccba am: caa0bf8a29 am: 456ecb6e05
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931086

Change-Id: Ia2651915b290c727b26a3e0e66d48843025513ba
2020-06-22 18:29:25 +00:00
Keun-young Park
543d7e8c18 Merge "Restore lost unlocked users after vold reset" into rvc-dev am: f9dcad0b12
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11920286

Change-Id: I8d496cc4bd30f5e574537a54107f6dc56ea27665
2020-06-22 18:29:24 +00:00
Keun-young Park
8e6eb848f6 Merge "Restore lost unlocked users after vold reset" into rvc-dev am: f9dcad0b12
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11920286

Change-Id: Ia4014bebd3fff50b3026b768a03fc15f93a65c6c
2020-06-22 18:29:15 +00:00
Will Brockman
8f127c5113 Merge "Update section enum for statsd notif panel logs." into rvc-dev am: 7ebbe4fc60
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11941805

Change-Id: Ice2fa4903d8c4c5dcc7513161c695d4054dabc7b
2020-06-22 18:29:03 +00:00
Treehugger Robot
850eb90b0b Merge "A2DP: Check AAC bitrate mode by its CodecSpecific1" am: bdc57bef81 am: bb606cfc11 am: adeef01787 am: 4d88d35930
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1207444

Change-Id: I8c16301dc90bef0487e5c3dbe65381f63e063a24
2020-06-22 18:29:01 +00:00
Will Brockman
bd94c081a1 Merge "Update section enum for statsd notif panel logs." into rvc-dev am: 7ebbe4fc60
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11941805

Change-Id: Iab8d05e2a118596e3649a245b23ce3491d77f28c
2020-06-22 18:28:49 +00:00
Hongwei Wang
b1d028531b Merge "Updates enterPictureInPicture API doc" into rvc-dev am: 997150ee0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/10961377

Change-Id: I800000c876df75cac0d736b73f1daf99e545492b
2020-06-22 18:28:47 +00:00
Hongwei Wang
4cac31dde3 Merge "Updates enterPictureInPicture API doc" into rvc-dev am: 997150ee0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/10961377

Change-Id: Ic4d994aa3635098e269dc3e198a96ad84f976910
2020-06-22 18:27:57 +00:00
Keun-young Park
f9dcad0b12 Merge "Restore lost unlocked users after vold reset" into rvc-dev 2020-06-22 18:23:00 +00:00
Antoan Angelov
d473d2a565 Merge "Show disclosure for work profile on org owned device in keyguard" into rvc-dev am: 59804dccba am: 1b08baf416
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931086

Change-Id: Iba9b691ec51101db4ba340e1e75d1e6117f0befa
2020-06-22 18:21:21 +00:00
Antoan Angelov
36976a22e9 Merge "Show disclosure for work profile on org owned device in keyguard" into rvc-dev am: 59804dccba am: 1b08baf416
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931086

Change-Id: I6cba15575cda4f1bba8b3543091ed6168be03d51
2020-06-22 18:21:10 +00:00
Will Brockman
7ebbe4fc60 Merge "Update section enum for statsd notif panel logs." into rvc-dev 2020-06-22 18:16:43 +00:00
Antoan Angelov
456ecb6e05 Merge "Show disclosure for work profile on org owned device in keyguard" into rvc-dev am: 59804dccba am: caa0bf8a29
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931086

Change-Id: I85cc19922d39e77ca5329798bba9211169640ca4
2020-06-22 18:15:23 +00:00
Treehugger Robot
4d88d35930 Merge "A2DP: Check AAC bitrate mode by its CodecSpecific1" am: bdc57bef81 am: bb606cfc11 am: adeef01787
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1207444

Change-Id: I6e91c9036b5a8d705eb0e0ecd4963fc45fb9b340
2020-06-22 18:15:07 +00:00
Hongwei Wang
997150ee0a Merge "Updates enterPictureInPicture API doc" into rvc-dev 2020-06-22 18:14:10 +00:00
Antoan Angelov
caa0bf8a29 Merge "Show disclosure for work profile on org owned device in keyguard" into rvc-dev am: 59804dccba
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931086

Change-Id: I9a29b2c89f51573df0fdb930f70f0d98b2becdd4
2020-06-22 18:05:47 +00:00
Antoan Angelov
1b08baf416 Merge "Show disclosure for work profile on org owned device in keyguard" into rvc-dev am: 59804dccba
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931086

Change-Id: I897ddd64edd67f7843d6869f0c0f6fbb4e0aa292
2020-06-22 18:05:21 +00:00
TreeHugger Robot
e273403da7 Merge "Update style drawables after bugbash" into rvc-d1-dev am: 2129ea98da am: 8fc024ee30
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931360

Change-Id: Ic3822dec9e2b63a831e71030be111c97f96fed87
2020-06-22 18:04:13 +00:00
Marvin Ramin
b640a94a39 Merge "CEC: Run all actions after TV allocates address" into rvc-dev-plus-aosp am: 648b80d622 am: c7778b1d8a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11953483

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

Change-Id: Iebf01f85c68184fd1a288ee92a253b997440ad01
2020-06-22 18:03:38 +00:00
Automerger Merge Worker
ad3e8a42e0 Merge "Merge "AudioTrack: Update javadoc" into rvc-dev am: 72998aeaf7 am: 98ef1743b4" into rvc-d1-dev-plus-aosp am: 4e82eb3ce6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932147

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

Change-Id: I961bf247ab2fad0e7a13969a0ac1c69c88a64bab
2020-06-22 18:03:05 +00:00
Automerger Merge Worker
a641e25930 Merge "Merge "AudioTrack: Update javadoc" into rvc-dev am: 72998aeaf7 am: 6176456336" into rvc-d1-dev-plus-aosp am: a6b84001ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932147

Change-Id: I30a786ea6753a603f82a8c0667a225d91bfbe859
2020-06-22 18:02:34 +00:00
Automerger Merge Worker
3b78c6e9f0 Merge "Merge "Correct the name of enum UserType item" into rvc-dev am: 06cfd49914 am: cd463e4191 am: aaa58fd871" into rvc-qpr-dev-plus-aosp 2020-06-22 18:02:03 +00:00
TreeHugger Robot
ab1a527f4e Merge "Correct the name of enum UserType item" into rvc-dev am: 06cfd49914 am: cd463e4191 am: aaa58fd871
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932651

Change-Id: Ic6abcd008d4123fb5e5a4b80ccddb9c3b2a9289d
2020-06-22 18:01:49 +00:00
TreeHugger Robot
9b723306fd Merge "Update style drawables after bugbash" into rvc-d1-dev am: 2129ea98da am: ec31f3cfce
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931360

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

Change-Id: Ifaa75a079782a794f7acc954071e3abfb085339e
2020-06-22 18:01:27 +00:00
Andy Hung
adf4610c68 Merge "AudioTrack: Update javadoc" into rvc-dev am: 72998aeaf7 am: 6176456336 am: 78a68c7d52
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932147

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

Change-Id: I861833972b9f33baf5d1d1ec3902779b78028f15
2020-06-22 17:59:47 +00:00
TreeHugger Robot
ec31f3cfce Merge "Update style drawables after bugbash" into rvc-d1-dev am: 2129ea98da
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931360

Change-Id: If70b2a78dec38e6f0e0494ef4b02c6e3c771ce67
2020-06-22 17:59:38 +00:00
TreeHugger Robot
8fc024ee30 Merge "Update style drawables after bugbash" into rvc-d1-dev am: 2129ea98da
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931360

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

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

Change-Id: Ief198aaf2b3cc65b77cf81aad645e8ba36ced989
2020-06-22 17:59:28 +00:00