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
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
Will Brockman
3ec0934486 Statsd notif logs: important conversations. 
Adds an importance level for "important conversation" to the
notification posted and notification channel updated logs.

Bug: 155064930
Change-Id: Ib5a47aeb2da4d8614bfc778f3771479256220b23
Test: atest PreferencesHelperTest NotificationManagerServiceTest
Test: statsd_testdrive
 2020-06-19 16:55:02 -04: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
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
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
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
ad6498c556 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: I7ca6e6dde7beb105b22e1423f0a72951209b7955
 2020-06-19 20:47:47 +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
TreeHugger Robot
134c68bbde 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: Ifb49f228dc54c708c4137daa18c3940e1e8e45d3
 2020-06-19 20:47:38 +00:00
TreeHugger Robot
7dfc6ddad9 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: Id394f631f14b57476710e663035dff921c1c5948
 2020-06-19 20:47:29 +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
TreeHugger Robot
2a47ec4fe1 Merge "[WifiEnterpriseConfig] Update javadoc for setCaCert/Path" into rvc-dev am: 4058b3b950 am: 4409371a24 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11933102

Change-Id: I23600ed3246b1940f31ec216103ce01fe866d277
 2020-06-19 20:47:12 +00:00
Automerger Merge Worker
0230b93d42 Merge "[automerger skipped] Merge "Fix MmTelFeatureConnection Memory Leak" am: 6b8e4bdf66 am: fb2050f9af -s ours" into rvc-dev-plus-aosp 2020-06-19 20:47:11 +00:00
TreeHugger Robot
7841de0683 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: I8ae6d4f5f6c175d8df4c7e76512ddb29ec254a6a
 2020-06-19 20:47:06 +00:00
TreeHugger Robot
b6af1c4e2a Merge "[WifiEnterpriseConfig] Update javadoc for setCaCert/Path" into rvc-dev am: 4058b3b950 am: 4409371a24 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11933102

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

Change-Id: Iffad41a6ad73200cbc3f16ead94d3afe5eb1a42a
 2020-06-19 20:46:53 +00:00
Brad Ebinger
42a8db854e [automerger skipped] Merge "Fix MmTelFeatureConnection Memory Leak" am: 6b8e4bdf66 am: fb2050f9af -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: Ifd5ad1980e7c2c6565d0c825caee9bec23f09da4
 2020-06-19 20:46:46 +00:00
TreeHugger Robot
7cb7b3b94c Merge "Fix the exception when shortcut info was removed before loading persisted bubbles" into rvc-dev am: 6c8c9ea8cb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931364

Change-Id: Ic5759625d4c181b173db5d31753cdfc58c1896ef
 2020-06-19 20:46:42 +00:00
TreeHugger Robot
861a8178f9 Merge "Camera: Allow reprocessing session to configure physical streams" into rvc-dev 2020-06-19 20:46:04 +00:00
TreeHugger Robot
6c8c9ea8cb Merge "Fix the exception when shortcut info was removed before loading persisted bubbles" into rvc-dev 2020-06-19 20:40:09 +00:00
TreeHugger Robot
c18e359593 Merge "Controls UI - Marquee + transient status == no good" into rvc-dev am: a2e3ae1365 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11931368

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

Change-Id: I2ac88fe45c7543d4050fb7059627faec8fdd6b89
 2020-06-19 20:39:43 +00:00
TreeHugger Robot
a2e3ae1365 Merge "Controls UI - Marquee + transient status == no good" into rvc-dev 2020-06-19 20:38:29 +00:00
Nathan Harold
ca5aa7dfec Merge "Allow Background Location Access for Shell" am: 6e1b51a9d9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1344377

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

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

Change-Id: I1d0808220d55184e64c5d60a3d99686408791aea
 2020-06-19 20:33:56 +00:00
TreeHugger Robot
4409371a24 Merge "[WifiEnterpriseConfig] Update javadoc for setCaCert/Path" into rvc-dev am: 4058b3b950 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11933102

Change-Id: Ibd62cad0423d44727cdef98cc1374c6944d34dcc
 2020-06-19 20:33:40 +00:00
Brad Ebinger
fb2050f9af Merge "Fix MmTelFeatureConnection Memory Leak" am: 6b8e4bdf66 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1344916

Change-Id: I350155572b42bd449691dd86a36eefb5dafa9803
 2020-06-19 20:30:12 +00:00
Nathan Harold
6e1b51a9d9 Merge "Allow Background Location Access for Shell" 2020-06-19 20:21:13 +00:00
Treehugger Robot
bfaf7c5a78 Merge "Update preloaded-classes-blacklist" 2020-06-19 20:18:56 +00:00
TreeHugger Robot
4058b3b950 Merge "[WifiEnterpriseConfig] Update javadoc for setCaCert/Path" into rvc-dev 2020-06-19 20:17:59 +00:00
Robert Carr
7a31b8b1df SurfaceControlViewHost: Release ViewRoot from finalizer 
If we don't explicitly go through the doDie process the
WindowManagerGlobal instance will hold the ViewRoot alive
indefinitely. This accidental leak could be very expensive so
we prevent it with a finalizer.

Bug: 157709599
Test: Existing tests pass
Change-Id: I4fdf368eed4b4e43faacd9f62b6d9fddfd9b7ef2
 2020-06-19 13:14:00 -07:00
Brad Ebinger
6b8e4bdf66 Merge "Fix MmTelFeatureConnection Memory Leak" 2020-06-19 20:12:44 +00:00
Robert Carr
5409e24105 SurfaceControlViewHost: Call doDie with true 
If we pass immediate=false to the doDie without
updating the visibility, we may destroy the hardware renderer
but then try to draw again anyway, and then crash. It seems
theres no reason we can't call immediate=true and
properly shut down immediately.

Bug: 159250432
Test: Existing tests pass
Change-Id: Ibc6be8901be10c0985681d83f4ce16dd1ab54925
 2020-06-19 13:10:13 -07:00
Wonsik Kim
e37ef4bc92 media: fix race condition on async release 
Clear Java object state at releaseAsync(), and delete native object
upon async release complete.
Clearing CodecBase object only led to a rare race condition which
caused null pointer dereference.

Bug: 158501286
Test: atest CtsMediaTestCases:MediaCodecTest#testAsyncRelease (100 times)
Test: atest CtsMediaTestCases:MediaCodecCapabilitiesTest#testGetMaxSupportedInstances
Test: atest CtsMediaTestCases -- --module-arg CtsMediaTestCases:size:small
Change-Id: I691d39007c0ea770318f4038558ad338252bd2fb
 2020-06-19 13:04:02 -07:00
Joshua Tsuji
fdff6c9310 Fix inconsistent widths in manage menu. 
Honestly should have been a P0: https://screenshot.googleplex.com/yDLrbwa84yN

Bug: 159473130
Test: open the manage menu
Change-Id: Ieb15725ae8eadff75fccee43ec83c30cdeedbbb3
 2020-06-19 15:58:04 -04:00
Kevin Chyn
65ab6de210 Merge changes from topic "b/159260556" into rvc-dev am: 5731877f1e am: 2738860066 am: b14a5631c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11905665

Change-Id: Iff87da0d768e05aa251173c19865593873f15f71
 2020-06-19 19:57:24 +00:00
Fabian Kozynski
2828fc61dd Fix media artist color 
Set the color to #FFFFFF @60%.

Test: visual
Fixes: 159359828
Change-Id: I56877fa6a81497fccf6afbcb434da7792cb48d4a
 2020-06-19 15:56:58 -04:00
Kevin Chyn
f5d90da3d9 Merge changes from topic "b/159260556" into rvc-dev am: 5731877f1e am: 4eff386e19 am: aea1b30ed7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11905665

Change-Id: I227cb7a764161fbc755b0d96bd13eb2c3f7b8399
 2020-06-19 19:51:19 +00:00
Brad Ebinger
96c6f3fb19 [automerger skipped] Merge "Remove IllegalArgumentException for registration of capabilities" am: e51d2698ac am: b7b81db6e0 -s ours am: d678eef58e -s ours am: 7001684120 -s ours 
am skip reason: Change-Id I3250419a2438afb58922ae653e3f2e4f9628e593 with SHA-1 ffb93e5dd6 is in history

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

Change-Id: I039880861d57876efc3336a0c983a7a193811cfc
 2020-06-19 19:50:52 +00:00
Kevin Chyn
a72adbad45 Merge changes from topic "b/159260556" into rvc-dev am: 5731877f1e am: 2738860066 am: 00c670218a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11905665

Change-Id: I30ca362002f01862178a066b0734d7fd7f96827c
 2020-06-19 19:50:03 +00:00
Jack Yu
e9c44278c5 Reset cell broadcast config before enabling all channels 
Before cell broadcast config service enabling all channels, it
reset all channels that were previously enabled. This will make
sure the full channel config can be pushed down to modem. This
also solved the issue that channel config not sending to modem
when SIM is swapped. Note that a hidden API is added and will
be unhide in the next Android release.

Fix: 155027085
Test: Manual
Merged-In: Id571b990f4e45aea5bbab0dbadce48dda7b2bc56
Change-Id: Id571b990f4e45aea5bbab0dbadce48dda7b2bc56
 2020-06-19 19:46:31 +00:00
Kevin Chyn
aea1b30ed7 Merge changes from topic "b/159260556" into rvc-dev am: 5731877f1e am: 4eff386e19 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11905665

Change-Id: I034eda16e57057dc0f388ddb86148865746fb53c
 2020-06-19 19:41:52 +00:00
Fabian Kozynski
399928f9e2 Fix song title size in media controls 
Test: visual
Fixes: 159368524
Change-Id: Id2c99b6570fe90f6ceafbad841314166952246a6
 2020-06-19 15:41:45 -04:00