Android Build Merger (Role)
8ea57c6592
Merge "Merge "Updates to shared lib for Launcher" into pi-dev am: f4833c4fb2" into pi-dev-plus-aosp
2018-05-31 18:27:13 +00:00
Jorim Jaggi
4edb110569
Merge "Updates to shared lib for Launcher" into pi-dev
...
am: f4833c4fb2
2018-05-31 11:26:41 -07:00
Remi NGUYEN VAN
e6657a0cca
Merge "Add missing dependencies for libdexfile" am: 286aa939af
...
am: e78185076c
2018-05-31 11:25:40 -07:00
Adrian Roos
d955cdf889
Merge "Cutout Overlay: Flip color in inverted color mode" into pi-dev
...
am: aceee95fa0
2018-05-31 11:22:16 -07:00
David Brazdil
a782e5dbbf
More additions to hidden API list greylist
...
am: 132e75bd51
2018-05-31 11:17:46 -07:00
David Brazdil
e084cb25c1
[automerger skipped] Merge "Build dark greylist from public + light grey API" into pi-dev
...
am: abed288a08
2018-05-31 11:15:46 -07:00
David Brazdil
b39e4589c7
[automerger skipped] Build dark greylist from public + light grey API
...
am: 94c2ab6562
2018-05-31 11:02:28 -07:00
Nicolas Geoffray
c657c961dc
Merge "Add MediaMuxer APIs to light grey." into pi-dev
...
am: cbe39d1a56
2018-05-31 10:56:29 -07:00
Felka Chang
fdae858850
Merge "Fix text is cut off in corner cut out condition" into pi-dev
...
am: 544cbc9b97
2018-05-31 10:52:02 -07:00
Nicolas Geoffray
3428cbf8fe
Merge "Hidden API bugbot update" into pi-dev
...
am: b50d9f8123
2018-05-31 10:47:28 -07:00
Bill Yi
ae790fc733
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 737d83180e
2018-05-31 10:42:55 -07:00
Lorenzo Colitti
fc9df9896c
Merge "Don't complain if a VPN changes capabilities." into pi-dev
...
am: 0a93a3530d
2018-05-31 10:41:34 -07:00
Remi NGUYEN VAN
e78185076c
Merge "Add missing dependencies for libdexfile"
...
am: 286aa939af
2018-05-31 10:27:22 -07:00
Jorim Jaggi
f4833c4fb2
Merge "Updates to shared lib for Launcher" into pi-dev
2018-05-31 15:50:31 +00:00
TreeHugger Robot
aceee95fa0
Merge "Cutout Overlay: Flip color in inverted color mode" into pi-dev
2018-05-31 15:40:16 +00:00
David Brazdil
132e75bd51
More additions to hidden API list greylist
...
Bug: 80456099
Test: make out/target/common/obj/PACKAGING/hiddenapi-blacklist.txt
Change-Id: Iee44f02c83e5d2c68e09b6c4f62c8faff2e74df8
2018-05-31 14:21:32 +01:00
David Brazdil
abed288a08
Merge "Build dark greylist from public + light grey API" into pi-dev
2018-05-31 12:20:57 +00:00
Adrian Roos
8b29a8407e
Cutout Overlay: Flip color in inverted color mode
...
Flips the color when the screen is inverted such
that it will end up black again after composition.
Change-Id: I8800c666b60061a58f1345a2609a088a02e82f48
Fixes: 80102202
Test: Enable cutout overlay, enable color inversion, verify overlay is black.
2018-05-31 14:14:13 +02:00
TreeHugger Robot
cbe39d1a56
Merge "Add MediaMuxer APIs to light grey." into pi-dev
2018-05-31 10:27:18 +00:00
Felka Chang
544cbc9b97
Merge "Fix text is cut off in corner cut out condition" into pi-dev
2018-05-31 08:41:44 +00:00
Nicolas Geoffray
4b72bcbeb4
Add MediaMuxer APIs to light grey.
...
bug: 80338884
Test: m
Change-Id: I076f6033e3b6512a5667d81a09a451bda8853505
2018-05-31 09:35:59 +01:00
Nicolas Geoffray
b50d9f8123
Merge "Hidden API bugbot update" into pi-dev
2018-05-31 08:31:51 +00:00
TreeHugger Robot
737d83180e
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-05-31 05:41:44 +00:00
felkachang
e2cf7c8a8c
Fix text is cut off in corner cut out condition
...
There is a todo that it needs to handle the corner cut out. In the
condition of RTL and Corner Cut out, HeadsUpStatusBarView's padding
is wrong because displayCutout.getSafeInsetRight() is 0 but corner
cut out actually impact HeadsUpStatusBar's layout. Corner cut out
make icon's start more big but mCutOutInset is 0 so the newPadding
is a negative number.
The handle method is to detect the part of overlaying with corner
cut out. i.e. center cut out is exclude. To count the cut out start
as cutOutStart and compare cutOutStart with icon's start. The cut
out is not corner cut out if cutOutStart < icon's start.
icon's minus the width of overlay part to prevent from negative
padding.
move the get screen size from onLayout to fitSystemWindows and
onAttachToWindow because there is a chance to new object in
onLayout. To new object in onLayout is not good practice. And,
there is an chance to invoke ANR because Display.getRealSize() may
do IPC.
Fixes: 80271465
Test: atest SystemUITests
Change-Id: I36fa5c880f5e624747133e46950c1c1695a5fa58
2018-05-31 12:36:14 +08:00
Bill Yi
bf77fe8ad9
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ia217e53a5c9e1c832f986eb4c90b6099f566d941
2018-05-30 21:32:21 -07:00
Lorenzo Colitti
0a93a3530d
Merge "Don't complain if a VPN changes capabilities." into pi-dev
2018-05-31 03:03:04 +00:00
Remi NGUYEN VAN
286aa939af
Merge "Add missing dependencies for libdexfile"
2018-05-31 02:23:17 +00:00
Hongwei Wang
c59f093cfb
Merge "Master mute is valid when running fixed volume for automotive" into pi-dev
...
am: 69ed99856b
2018-05-30 18:33:06 -07:00
Hongwei Wang
69ed99856b
Merge "Master mute is valid when running fixed volume for automotive" into pi-dev
2018-05-31 01:22:45 +00:00
Hongwei Wang
daba124674
Master mute is valid when running fixed volume for automotive
...
In Automotive case, we set fixed volume to suggest no volume control
inside AudioFlinger and master mute is a mapping to the physical mute
button in a car, which toggles the global mute state.
Bug: 80474559
Test: adb shell input keyevent 164
Change-Id: I1d4fd143a98ee96f11850811c90e6d9932cab948
2018-05-30 16:47:49 -07:00
Benedict Wong
25d4bb84bd
Merge changes from topic "vpn-meteredness" into oc-mr1-dev am: 64c14793f7
...
am: 8fde8400f1
2018-05-30 16:28:34 -07:00
Benedict Wong
c855305414
[automerger skipped] DO NOT MERGE: Add unit tests to ensure VPN meteredness am: 66bc52884b -s ours
...
am: 79aad4f39a
2018-05-30 16:23:34 -07:00
Benedict Wong
8fde8400f1
Merge changes from topic "vpn-meteredness" into oc-mr1-dev
...
am: 64c14793f7
2018-05-30 16:12:34 -07:00
Benedict Wong
79aad4f39a
[automerger skipped] DO NOT MERGE: Add unit tests to ensure VPN meteredness
...
am: 66bc52884b
2018-05-30 16:10:46 -07:00
Benedict Wong
64c14793f7
Merge changes from topic "vpn-meteredness" into oc-mr1-dev
...
* changes:
DO NOT MERGE: Add unit tests to ensure VPN meteredness
DO NOT MERGE: Fix ConnectivityController meteredness checks
2018-05-30 23:00:13 +00:00
Hall Liu
1d09efefeb
[automerger skipped] Merge "Add CallAudioState ctor as TestApi" am: 39ac9ffe27
...
am: f06c6d0187
2018-05-30 15:28:18 -07:00
Chenbo Feng
56eaecd57d
[automerger skipped] Merge "Check for bpf support at NetworkStatsService start" am: 0defa6e72c
...
am: 8196301e24
2018-05-30 15:17:21 -07:00
Matthew Ng
536c5bbb8a
Merge "Show back button when launcher is disconnected from proxy service" into pi-dev
...
am: d2de50b995
2018-05-30 15:10:41 -07:00
Hall Liu
f06c6d0187
Merge "Add CallAudioState ctor as TestApi"
...
am: 39ac9ffe27
2018-05-30 15:09:21 -07:00
Chenbo Feng
8196301e24
Merge "Check for bpf support at NetworkStatsService start"
...
am: 0defa6e72c
2018-05-30 15:05:08 -07:00
Evan Rosky
9bf11ede69
Merge "Fixed a bug where sometimes unhandled handler would consume all keys" into pi-dev
...
am: 7ba4c2b254
2018-05-30 15:02:51 -07:00
TreeHugger Robot
d2de50b995
Merge "Show back button when launcher is disconnected from proxy service" into pi-dev
2018-05-30 21:55:54 +00:00
Evan Rosky
7ba4c2b254
Merge "Fixed a bug where sometimes unhandled handler would consume all keys" into pi-dev
2018-05-30 21:47:25 +00:00
Selim Cinek
a58f9fcd79
Merge "Fixed an issue where group children had rounded corners" into pi-dev
...
am: f04b6c8d77
2018-05-30 13:52:22 -07:00
TreeHugger Robot
f04b6c8d77
Merge "Fixed an issue where group children had rounded corners" into pi-dev
2018-05-30 20:26:45 +00:00
Hall Liu
39ac9ffe27
Merge "Add CallAudioState ctor as TestApi"
2018-05-30 20:24:34 +00:00
Treehugger Robot
0defa6e72c
Merge "Check for bpf support at NetworkStatsService start"
2018-05-30 19:54:42 +00:00
Matthew Ng
53896454ef
Show back button when launcher is disconnected from proxy service
...
Whenever service is disconnected, the back button will be shown. Once
the service is connected, launcher will decide whether or not to hide
the back button.
Test: adb shell am force-stop com.google.android.apps.nexuslauncher
Change-Id: Ic947e51c00abd9591c800aa1023b8d9684dc5d93
Fixes: 80098608
2018-05-30 11:27:39 -07:00
Chenbo Feng
bff0fb4ec0
Check for bpf support at NetworkStatsService start
...
The current implementation check for bpf map existance whenever a
NetworkStats request comes in. The check is not efficient and may
require additional permission for threads. So a member variable is added
to NetworkStatsService to store the bpf configuration status and is
initialized when NetworkStatsService start.
Test: -m CtsNetTestCases -t android.net.cts.TrafficStatsTest
-m CtsUsageStatsTestCases -t android.app.usage.cts.NetworkUsageStatsTest
Bug: 79994577
Change-Id: I872ae18fb3e9631a4e6c4d773fefbba32e60a03b
Merged-In: I872ae18fb3e9631a4e6c4d773fefbba32e60a03b
2018-05-30 18:15:25 +00:00
Robert Shih
ef157649d5
Merge "MediaCodec.CryptoInfo: expose subsample encryption pattern" into pi-dev
...
am: e3348a2593
2018-05-30 11:13:45 -07:00
