Adam Lesinski
e999fa69cf
Merge "Merge "Revert "always adjust per-user application info"" into oc-dev am: 887544e100" into oc-dev-plus-aosp
...
am: c2bc1f2790
2017-06-08 21:33:26 +00:00
Jakub Pawlowski
fcc30a6db3
Merge "Bluetooth: fix connectGatt overload invocations" am: 404e9f209f am: c0fed83b84
...
am: 3b852973e3
2017-06-08 21:30:57 +00:00
Adam Lesinski
21983b0293
Merge "Revert "always adjust per-user application info"" into oc-dev am: 887544e100
...
am: adca091fcd
2017-06-08 21:25:24 +00:00
Android Build Merger (Role)
c2bc1f2790
Merge "Merge "Revert "always adjust per-user application info"" into oc-dev am: 887544e100" into oc-dev-plus-aosp
2017-06-08 21:23:36 +00:00
Adam Lesinski
8573162324
Merge "Revert "always adjust per-user application info"" into oc-dev
...
am: 887544e100
2017-06-08 21:22:21 +00:00
Jakub Pawlowski
3b852973e3
Merge "Bluetooth: fix connectGatt overload invocations" am: 404e9f209f
...
am: c0fed83b84
2017-06-08 21:20:27 +00:00
Adam Lesinski
adca091fcd
Merge "Revert "always adjust per-user application info"" into oc-dev
...
am: 887544e100
2017-06-08 21:20:03 +00:00
George Mount
d1cfbc506b
Add target sdk check for behavior change.
...
Bug 62188967
A previous change stopped animations on fragment Views before
being removed. This change in behavior caused other problems,
so the behavior must be placed behind a target SDK check.
Test: ran fragment tests, validated on app
Change-Id: I098e9b0f1472d9838abeacba3baaa7581f7a82ad
2017-06-08 14:18:31 -07:00
Adam Lesinski
887544e100
Merge "Revert "always adjust per-user application info"" into oc-dev
2017-06-08 21:14:09 +00:00
Jakub Pawlowski
c0fed83b84
Merge "Bluetooth: fix connectGatt overload invocations"
...
am: 404e9f209f
2017-06-08 21:12:26 +00:00
Adam Lesinski
157be6ead8
Revert "always adjust per-user application info"
...
This reverts commit e0046cecb0
2017-06-08 21:10:52 +00:00
Jakub Pawlowski
dbf5a0a20b
Bluetooth: fix connectGatt overload invocations
...
Merged-In: I726252e85e78bff2c9585332d2748a0d92a9f6d3
Test: sl4a GattOverBrEdrTest
Bug: 62387078
Change-Id: I5bfb87683e25f8862587e8000eb4c9bb6ff14f99
2017-06-08 21:01:24 +00:00
Jakub Pawlowski
404e9f209f
Merge "Bluetooth: fix connectGatt overload invocations"
2017-06-08 20:59:35 +00:00
Tyler Gunn
cc26dbbb46
Merge "Add carrier config for allowing USSD requests via telephony manger APIs." into oc-dev am: 980582e555
...
am: da88ca6f10
2017-06-08 20:50:56 +00:00
Winson Chung
75ef9b2667
Removing legacy default thumbnail logic.
...
- With the move to snapshots, we no longer keep a local cache of the
thumbnails and tasks which have no thumbnails will be handled
in the snapshot from the system (if it uses FLAG_SECURE) or in
Recents directly through the task description background color.
In the case of this bug, the default thumbnail (1x1 white bitmap) was
incorrectly being applied because the system could not take a snapshot
of the app due to DRM.
Bug: 62447895
Test: Open any app with DRM, play video, tap Recents
Change-Id: I02e87cf513eb9750b39d54d085b0c19645b7ed52
2017-06-08 13:46:12 -07:00
Tyler Gunn
37300eb77e
Merge "Add carrier config for allowing USSD requests via telephony manger APIs." into oc-dev am: 980582e555
...
am: f512d86f5b
2017-06-08 20:41:57 +00:00
Daichi Hirono
0f9be35ae4
Merge "Fix NPE in MtpDocumentsProviderTests" into oc-dev am: ebb6e998d5
...
am: 87df9ee8b7
2017-06-08 20:37:32 +00:00
Android Build Merger (Role)
b1ae22139a
Merge "Merge "Ensure the menu items are properly recreated after a density change" into oc-dev am: f574869c11 am: 440137be48" into oc-dr1-dev-plus-aosp
2017-06-08 20:33:33 +00:00
Android Build Merger (Role)
ec999df45c
Merge "Merge "Fix NPE in MtpDocumentsProviderTests" into oc-dev am: ebb6e998d5 am: 44442c4c99" into oc-dr1-dev-plus-aosp
2017-06-08 20:32:33 +00:00
Mady Mellor
8a1131aea6
Merge "Ensure the menu items are properly recreated after a density change" into oc-dev am: f574869c11
...
am: 440137be48
2017-06-08 20:32:22 +00:00
Android Build Merger (Role)
b13b4a385a
Merge "Merge "Fix crash when deleting task" into oc-dev am: c6fa8ee018 am: 9fd8e49fe0" into oc-dr1-dev-plus-aosp
2017-06-08 20:31:55 +00:00
Selim Cinek
7f09ce1a23
Fixed a bug where systemui could crash while cloning
...
Because cloning wasn't synchronized, the notification
could become a non-root temporarily which in turn could
lead to a crash.
1. We're now properly synchronizing the cloning, such that
this can't happen anymore
2. We're now only cloning the old statusbar notification lightly
instead of heavily to avoid this altogether
Test: manual, update decoratedcustomview notifications really fast
Change-Id: Ia6525eec64ad9a26956ca2198e20198f55b2173c
Fixes: 62181033
2017-06-08 13:31:26 -07:00
Daichi Hirono
eba3dc72a6
Merge "Fix NPE in MtpDocumentsProviderTests" into oc-dev am: ebb6e998d5
...
am: 44442c4c99
2017-06-08 20:31:17 +00:00
Winson Chung
a2abb62e20
Merge "Fix crash when deleting task" into oc-dev am: c6fa8ee018
...
am: 9fd8e49fe0
2017-06-08 20:29:21 +00:00
Mady Mellor
16fe3c84f4
Merge "Ensure the menu items are properly recreated after a density change" into oc-dev am: f574869c11
...
am: b2b3628565
2017-06-08 20:28:26 +00:00
Tyler Gunn
f512d86f5b
Merge "Add carrier config for allowing USSD requests via telephony manger APIs." into oc-dev
...
am: 980582e555
2017-06-08 20:26:55 +00:00
Android Build Merger (Role)
c7d48044f1
Merge "Merge "Move QS cell indicator back into mobile data tile" into oc-dev am: a5b457b3bf am: 0a993da2bf" into oc-dr1-dev-plus-aosp
2017-06-08 20:25:42 +00:00
Jason Monk
c5a5acad16
Merge "Move QS cell indicator back into mobile data tile" into oc-dev am: a5b457b3bf
...
am: 0a993da2bf
2017-06-08 20:24:15 +00:00
Winson Chung
c259b94c63
Merge "Fix crash when deleting task" into oc-dev am: c6fa8ee018
...
am: b2a93b69a2
2017-06-08 20:23:29 +00:00
Daichi Hirono
44442c4c99
Merge "Fix NPE in MtpDocumentsProviderTests" into oc-dev
...
am: ebb6e998d5
2017-06-08 20:19:56 +00:00
Mady Mellor
b2b3628565
Merge "Ensure the menu items are properly recreated after a density change" into oc-dev
...
am: f574869c11
2017-06-08 20:16:45 +00:00
Tyler Gunn
da88ca6f10
Merge "Add carrier config for allowing USSD requests via telephony manger APIs." into oc-dev
...
am: 980582e555
2017-06-08 20:15:58 +00:00
Jason Monk
c0eddd3657
resolve merge conflicts of a5b457b3bf to oc-dr1-dev
...
am: d7dab0f36f
2017-06-08 20:15:01 +00:00
Jeff Sharkey
da1247a076
Omit icons from bulk SessionInfo calls.
...
Calls that return List<SessionInfo> can end up returning hundreds of
sessions, each of which include a "Bitmap appIcon" object. Since we
quickly smash the entire list through a ParceledListSlice, we risk
exhausting FDs for all the ashmem regions.
To mitigate this, we omit these icons from the bulk calls, and then
fetch individual icons on-demand when explicitly requested.
Test: create 2k sessions and verify system doesn't croak
Bug: 38021844
Change-Id: I932073defe5b9b34a636818a69009d49060215fb
2017-06-08 14:13:31 -06:00
Winson Chung
b2a93b69a2
Merge "Fix crash when deleting task" into oc-dev
...
am: c6fa8ee018
2017-06-08 20:10:36 +00:00
Felipe Leme
5f97880714
Closes Autofill UIs when back button is pressed.
...
Test: existing CtsAutoFillServiceTestCases pass
Test: LoginActivityTest#testSaveGoesAwayWhenTappingBackButton pass
Fixes: 62272098
Change-Id: Id34767ca32836f040e04790f0f2935ae49d88d71
2017-06-08 13:10:32 -07:00
Tyler Gunn
980582e555
Merge "Add carrier config for allowing USSD requests via telephony manger APIs." into oc-dev
2017-06-08 20:06:59 +00:00
jackqdyulei
1424c1d77c
Copy smearing method to BatteryStatsHelper
...
Cherry pick: fix conflict in config.xml
This cl adds the following data in BatterySipper
1. screenPowerMah: power smeared by screen
2. proportionalSmearMah: power need to smeared proportionally
3. displayPowerMah: smeared power usage
This cl also copies bunch of methods from BatteryUtils to
BatteryStatsHelper with minor changes, so we could log smearing
logic in BatteryStatsHelper
Bug: 62300864
Test: runtest -x BatteryStatsHelperTest
Change-Id: I9f92f5c1ac5fa483d0c15a3d5daad570da68a7ff
2017-06-08 11:32:31 -07:00
Daichi Hirono
87df9ee8b7
Merge "Fix NPE in MtpDocumentsProviderTests" into oc-dev
...
am: ebb6e998d5
2017-06-08 18:30:15 +00:00
TreeHugger Robot
ebb6e998d5
Merge "Fix NPE in MtpDocumentsProviderTests" into oc-dev
2017-06-08 18:25:29 +00:00
Jakub Pawlowski
ba1e26578e
Bluetooth: fix connectGatt overload invocations
...
Test: sl4a GattOverBrEdrTest
Bug: 62387078
Change-Id: I5bfb87683e25f8862587e8000eb4c9bb6ff14f99
2017-06-08 17:54:29 +00:00
Mady Mellor
440137be48
Merge "Ensure the menu items are properly recreated after a density change" into oc-dev
...
am: f574869c11
2017-06-08 17:46:14 +00:00
Winson Chung
9fd8e49fe0
Merge "Fix crash when deleting task" into oc-dev
...
am: c6fa8ee018
2017-06-08 17:43:12 +00:00
TreeHugger Robot
f574869c11
Merge "Ensure the menu items are properly recreated after a density change" into oc-dev
2017-06-08 17:39:43 +00:00
Winson Chung
c6fa8ee018
Merge "Fix crash when deleting task" into oc-dev
2017-06-08 17:38:00 +00:00
Jason Monk
d7dab0f36f
resolve merge conflicts of a5b457b3bf to oc-dr1-dev
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I2aa49bfdbd2c44684d0edb21b52520fea406e167
2017-06-08 13:00:40 -04:00
Selim Cinek
f8c4add851
Fixed an issue where the notification could stay userlocked
...
When collapsing the shade while draging down (using fingerprint)
notifications would stay userlocked and would appear in a small
height instead of their regular size.
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarWindowViewTest.java
Change-Id: Ibd97a6ce063bc2fcd76f11e010e781a61bd76b5f
Fixes: 36469584
2017-06-08 09:56:42 -07:00
Jason Monk
0a993da2bf
Merge "Move QS cell indicator back into mobile data tile" into oc-dev
...
am: a5b457b3bf
2017-06-08 16:41:05 +00:00
Jason Monk
a5b457b3bf
Merge "Move QS cell indicator back into mobile data tile" into oc-dev
2017-06-08 16:35:26 +00:00
Android Build Merger (Role)
c7e5462a61
Merge "Merge "Ensure only test print services enabled - framework" into oc-dev am: 053fb9120e am: 50859b50a6" into oc-dr1-dev-plus-aosp
2017-06-08 16:21:12 +00:00
