Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
511,742 Commits 3 Branches 0 Tags
bb3ebce4c60d26a489f12f3700de7587845dfee1
Commit Graph

511742 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
bb3ebce4c6 Merge "Save AsyncOps for later forwarding instead of SyncOps." into rvc-dev am: 7ec25249ab am: 319a6644f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11913241

Change-Id: I8f89868c1eaaf71238d4490bd68f540e8974b4fb
 2020-06-19 22:02:13 +00:00
Automerger Merge Worker
8d4e43da80 Merge "Merge "Start dim animations on pending vs sync transaction" into rvc-dev am: bb414bfea2 am: ebd5983e16" into rvc-d1-dev-plus-aosp 2020-06-19 22:02:05 +00:00
Evan Rosky
3aad19109d Merge "Start dim animations on pending vs sync transaction" into rvc-dev am: bb414bfea2 am: ebd5983e16 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11923901

Change-Id: I92a89e6afab6baad2a696172f84f2735bff4b4c7
 2020-06-19 22:01:54 +00:00
Evan Rosky
fcf5a9c782 Merge "Start dim animations on pending vs sync transaction" into rvc-dev am: bb414bfea2 am: 407047743c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11923901

Change-Id: I9f689544f8ab0d4ec06571f9581b33818b8bafce
 2020-06-19 22:01:45 +00:00
TreeHugger Robot
319a6644f3 Merge "Save AsyncOps for later forwarding instead of SyncOps." into rvc-dev am: 7ec25249ab 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11913241

Change-Id: I4a5f511e3739df3ef55070887bbe8929767e58d7
 2020-06-19 21:43:33 +00:00
Evan Rosky
ebd5983e16 Merge "Start dim animations on pending vs sync transaction" into rvc-dev am: bb414bfea2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11923901

Change-Id: I2674b969f3ac0c72f728099c564b1c43d2f602f2
 2020-06-19 21:43:08 +00:00
Evan Rosky
407047743c Merge "Start dim animations on pending vs sync transaction" into rvc-dev am: bb414bfea2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11923901

Change-Id: I943034948e06e4899a650149e1222926f5799747
 2020-06-19 21:42:45 +00:00
TreeHugger Robot
7ec25249ab Merge "Save AsyncOps for later forwarding instead of SyncOps." into rvc-dev 2020-06-19 21:29:40 +00:00
Automerger Merge Worker
4ac80cfc41 Merge "[automerger skipped] Merge "Reset cell broadcast config before enabling all channels" into rvc-dev-plus-aosp am: d8b6dc30e2 -s ours" into rvc-d1-dev-plus-aosp 2020-06-19 21:28:41 +00:00
Automerger Merge Worker
0e89ded315 Merge "Merge "Camera: Relax physical stream cropping behavior" into rvc-dev am: 08465447a2 am: 67d8e4ba14" into rvc-d1-dev-plus-aosp 2020-06-19 21:28:30 +00:00
Jack Yu
66b1d5f80b [automerger skipped] Merge "Reset cell broadcast config before enabling all channels" into rvc-dev-plus-aosp am: d8b6dc30e2 -s ours 
am skip reason: Change-Id Id571b990f4e45aea5bbab0dbadce48dda7b2bc56 with SHA-1 78b4100272 is in history

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

Change-Id: Ia1a1d7e7c61fda56c6e88e2b7afded191b0e7f72
 2020-06-19 21:28:21 +00:00
Automerger Merge Worker
8ac281083f Merge "Merge "Camera: Relax physical stream cropping behavior" into rvc-dev am: 08465447a2 am: aaee7513c7" into rvc-d1-dev-plus-aosp 2020-06-19 21:28:09 +00:00
TreeHugger Robot
9e8d7f955b Merge "Camera: Relax physical stream cropping behavior" into rvc-dev am: 08465447a2 am: 67d8e4ba14 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11457099

Change-Id: I71c1714cd993d2f71d75e4f961b314779251c3f0
 2020-06-19 21:28:00 +00:00
TreeHugger Robot
36b4493364 Merge "Turn off automatic heap dump notifications in SysUI" into rvc-dev am: 194bf13842 am: 189ffac3c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11893823

Change-Id: I30ea938b7e7b10f5208f459a425ef990bae79a12
 2020-06-19 21:27:44 +00:00
TreeHugger Robot
cea20b1589 Merge "Camera: Relax physical stream cropping behavior" into rvc-dev am: 08465447a2 am: aaee7513c7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11457099

Change-Id: Iddd8017310ec515bc0d2877fe61bd9b4021a56d6
 2020-06-19 21:27:35 +00:00
Evan Rosky
bb414bfea2 Merge "Start dim animations on pending vs sync transaction" into rvc-dev 2020-06-19 21:27:29 +00:00
Automerger Merge Worker
b472142971 Merge "Merge "Log when users/profiles change" into rvc-dev am: 9be82755f3 am: f50da91208" into rvc-d1-dev-plus-aosp 2020-06-19 21:27:29 +00:00
Ned Burns
a61d6a01f7 Merge "Log when users/profiles change" into rvc-dev am: 9be82755f3 am: f50da91208 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11921947

Change-Id: Ic569480652883b69188e2156f19b7587c5afb9e2
 2020-06-19 21:27:07 +00:00
TreeHugger Robot
19f0e936e4 Merge "Turn off automatic heap dump notifications in SysUI" into rvc-dev am: 194bf13842 am: 90a2acf2b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11893823

Change-Id: I3b3daa0918aa5180636c4caf3d0bf265d33ec9f7
 2020-06-19 21:27:06 +00:00
Ned Burns
c943472be7 Merge "Log when users/profiles change" into rvc-dev am: 9be82755f3 am: f303062b7e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11921947

Change-Id: If08a8dc6994d5932522483e99e8c8c9908a4af7d
 2020-06-19 21:26:50 +00:00
Automerger Merge Worker
b905491d56 Merge "Merge "When opening from locked shade, wait for the shade to unlock before expanding." into rvc-dev am: f1f28c8ec4 am: 3a2f38931c" into rvc-d1-dev-plus-aosp 2020-06-19 21:26:31 +00:00
TreeHugger Robot
7055266a7c Merge "When opening from locked shade, wait for the shade to unlock before expanding." into rvc-dev am: f1f28c8ec4 am: 3a2f38931c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11934834

Change-Id: I81c9c69131ccd5b01cfcceb9d918dafc2701c7a7
 2020-06-19 21:26:10 +00:00
TreeHugger Robot
1c7dee820f Merge "When opening from locked shade, wait for the shade to unlock before expanding." into rvc-dev am: f1f28c8ec4 am: e6a7a0e18c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11934834

Change-Id: If10f9614c98b31107c29f2b9148b1384dcafeae0
 2020-06-19 21:25:55 +00:00
Jack Yu
d8b6dc30e2 Merge "Reset cell broadcast config before enabling all channels" into rvc-dev-plus-aosp 2020-06-19 21:12:57 +00:00
TreeHugger Robot
67d8e4ba14 Merge "Camera: Relax physical stream cropping behavior" into rvc-dev am: 08465447a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11457099

Change-Id: Ib9fc64d11cbc3efa8df08fcc0a422bdba677be88
 2020-06-19 21:12:10 +00:00
TreeHugger Robot
aaee7513c7 Merge "Camera: Relax physical stream cropping behavior" into rvc-dev am: 08465447a2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11457099

Change-Id: I826b131674313c5de03838709e97f1dc927b316c
 2020-06-19 21:11:59 +00:00
TreeHugger Robot
189ffac3c8 Merge "Turn off automatic heap dump notifications in SysUI" into rvc-dev am: 194bf13842 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11893823

Change-Id: I493521ca2fceee43c084a1c31021f23a1215dd45
 2020-06-19 21:11:27 +00:00
Ned Burns
f50da91208 Merge "Log when users/profiles change" into rvc-dev am: 9be82755f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11921947

Change-Id: I2909581204b38d50db22e024ea44a5a03c5fa915
 2020-06-19 21:11:15 +00:00
TreeHugger Robot
90a2acf2b1 Merge "Turn off automatic heap dump notifications in SysUI" into rvc-dev am: 194bf13842 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11893823

Change-Id: I318e67f714b93264994097c534cf5e231ca0cfcb
 2020-06-19 21:11:14 +00:00
TreeHugger Robot
e6a7a0e18c Merge "When opening from locked shade, wait for the shade to unlock before expanding." into rvc-dev am: f1f28c8ec4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11934834

Change-Id: I55856288f4e60a04fceadc8690dcbf59239fbb26
 2020-06-19 21:10:50 +00:00
Ned Burns
f303062b7e Merge "Log when users/profiles change" into rvc-dev am: 9be82755f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11921947

Change-Id: I58f3b0570e36839dd7d703a2e9b7d920d5f3ab68
 2020-06-19 21:10:49 +00:00
TreeHugger Robot
3a2f38931c Merge "When opening from locked shade, wait for the shade to unlock before expanding." into rvc-dev am: f1f28c8ec4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11934834

Change-Id: Iff9ce332efacaf3ae5fdda807fbcf87b153f1c5d
 2020-06-19 21:10:23 +00:00
TreeHugger Robot
08465447a2 Merge "Camera: Relax physical stream cropping behavior" into rvc-dev 2020-06-19 21:10:22 +00:00
TreeHugger Robot
194bf13842 Merge "Turn off automatic heap dump notifications in SysUI" into rvc-dev 2020-06-19 21:08:47 +00:00
Ned Burns
9be82755f3 Merge "Log when users/profiles change" into rvc-dev 2020-06-19 21:04:25 +00:00
TreeHugger Robot
f1f28c8ec4 Merge "When opening from locked shade, wait for the shade to unlock before expanding." into rvc-dev 2020-06-19 20:59:36 +00:00
Nathan Harold
1fe0bcad31 [automerger skipped] Merge "Allow Background Location Access for Shell" am: 6e1b51a9d9 am: ca5aa7dfec -s ours am: b1ab8be7d6 -s ours 
am skip reason: Change-Id Iba3fcb3a43c5df3c30dadf6b7733eaee03d1d0e3 with SHA-1 89796d4936 is in history

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

Change-Id: Ifc10274cacb8df95f77bfba5618668cfdbc8593f
 2020-06-19 20:56:19 +00:00
Treehugger Robot
8a9d692c60 Merge "Update preloaded-classes-blacklist" am: bfaf7c5a78 am: 0cb2ff9a26 am: 14e8ef1cf4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1344376

Change-Id: I9ec3a8a1fc3faf164711a10c2a50a16aadc5b3c1
 2020-06-19 20:56:11 +00:00
Automerger Merge Worker
5d9a6c515c Merge "Merge "Camera: Allow reprocessing session to configure physical streams" into rvc-dev am: 861a8178f9" into rvc-dev-plus-aosp am: 76bd691f34 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11669678

Change-Id: I29dafb191472332c7028e13e0b72bf2e5b5cf4ec
 2020-06-19 20:55:42 +00:00
Automerger Merge Worker
4947970f7b Merge "[automerger skipped] Merge "Fix MmTelFeatureConnection Memory Leak" am: 6b8e4bdf66 am: fb2050f9af -s ours" into rvc-dev-plus-aosp am: 0230b93d42 -s ours 
am skip reason: Change-Id Idcf8b558c3807a3f9f5094afee532e76ea6f02cb with SHA-1 64e101323b is in history

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

Change-Id: I18336efc26b58062440178bb0c1a591d2c99e4b4
 2020-06-19 20:55:15 +00:00
TreeHugger Robot
31df8b0502 Merge "Fix the exception when shortcut info was removed before loading persisted bubbles" into rvc-dev am: 6c8c9ea8cb am: 978fea8f8a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931364

Change-Id: I04e250d0d6fcc6ed9e731cd762219fd05e4c14b7
 2020-06-19 20:54:47 +00:00
TreeHugger Robot
a1bcdde277 Merge "Controls UI - Marquee + transient status == no good" into rvc-dev am: a2e3ae1365 am: cb647e6139 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931368

Change-Id: I614e0fd24c047292b89e051bf2d95fe808f7dca2
 2020-06-19 20:54:37 +00:00
TreeHugger Robot
0c67799ae7 Merge "[WifiEnterpriseConfig] Update javadoc for setCaCert/Path" into rvc-dev am: 4058b3b950 am: 631d5d4629 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11933102

Change-Id: Ia8da269dcaad695b8e519e71f1fc5db096c31a3a
 2020-06-19 20:53:26 +00:00
Nathan Harold
b1ab8be7d6 [automerger skipped] Merge "Allow Background Location Access for Shell" am: 6e1b51a9d9 am: ca5aa7dfec -s ours 
am skip reason: Change-Id Iba3fcb3a43c5df3c30dadf6b7733eaee03d1d0e3 with SHA-1 89796d4936 is in history

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

Change-Id: Ice59c20f918e2d7419d2d302b00582d9f15e99ad
 2020-06-19 20:48:10 +00:00
Treehugger Robot
14e8ef1cf4 Merge "Update preloaded-classes-blacklist" am: bfaf7c5a78 am: 0cb2ff9a26 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1344376

Change-Id: Ib8d8708fb9e1dd6f0e9c8937b3d00fd4c39a061d
 2020-06-19 20:47:58 +00:00
TreeHugger Robot
e504eaa8cf Merge "Camera: Allow reprocessing session to configure physical streams" into rvc-dev am: 861a8178f9 am: a616d5d75f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11669678

Change-Id: I4142d81415402d9502379a79d44d9edfdb11996a
 2020-06-19 20:47:58 +00:00
TreeHugger Robot
ddb98d9ec5 Merge "Fix the exception when shortcut info was removed before loading persisted bubbles" into rvc-dev am: 6c8c9ea8cb am: 7cb7b3b94c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931364

Change-Id: I1234cbcff8af08500e804d12de7e1305112ba1dd
 2020-06-19 20:47:50 +00:00
TreeHugger Robot
afd98cbe15 Merge "Controls UI - Marquee + transient status == no good" into rvc-dev am: a2e3ae1365 am: c18e359593 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931368

Change-Id: Id2768bfddf8e7d000ac048a5540eb4b9e352ff35
 2020-06-19 20:47:41 +00:00
Automerger Merge Worker
76bd691f34 Merge "Merge "Camera: Allow reprocessing session to configure physical streams" into rvc-dev am: 861a8178f9" into rvc-dev-plus-aosp 2020-06-19 20:47:17 +00:00
TreeHugger Robot
a616d5d75f Merge "Camera: Allow reprocessing session to configure physical streams" into rvc-dev am: 861a8178f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11669678

Change-Id: I5e2af4a872e89e94a82ef684b0b06d86792bc65d
 2020-06-19 20:47:14 +00:00