Jeff Sharkey
f660c012b0
Merge "Add support for "Audiobooks"."
2018-12-04 16:58:17 +00:00
Eric Laurent
5b9de38cd1
Merge "Activity manager: native callback for process state"
2018-12-04 16:40:27 +00:00
TreeHugger Robot
2fcf06a23b
Merge "Fixed deadlock while mapping and unmapping process in AMS"
2018-12-04 16:28:34 +00:00
TreeHugger Robot
2a2896c280
Merge "Make getUnderlineColor public."
2018-12-04 16:25:19 +00:00
TreeHugger Robot
bc1fdab278
Merge "Make foreground color of print button always white"
2018-12-04 16:20:25 +00:00
Wale Ogunwale
0b940847d6
Fixed deadlock while mapping and unmapping process in AMS
...
Re-worked code not to hold process map lock while calling ATMS to mirror
process map information.
Change-Id: I7f84f45709ea665ad9718dce50beaad7e683773f
Fixes: 120172223
Test: N/A
2018-12-04 16:11:03 +00:00
Wale Ogunwale
147ab0cc32
Merge "Fix DisplayPolicyLayoutTests"
2018-12-04 16:07:52 +00:00
Fabian Kozynski
9016506e52
Merge "Removed unused animations"
2018-12-04 16:00:24 +00:00
TreeHugger Robot
d8a905b38c
Merge "Remove dead code"
2018-12-04 15:52:33 +00:00
Tony Mak
ddb9b50b5f
Suggesting at most three smart actions
...
Removed Notification.MAX_ACTION_BUTTONS check as we no longer
show smart actions as normal actions. Instead, suggesting at most
3 smart actions.
BUG: 111437455
Test: Manual, observes smart action even the notification always have
three normal actions.
Change-Id: I9238ef8b74c4f030979cb36cc87eaeff8c777682
2018-12-04 15:41:21 +00:00
TreeHugger Robot
afafd66da2
Merge "Support RRO for system wallpaper"
2018-12-04 14:34:13 +00:00
Neil Fuller
a068624dce
Merge "Make ANDROID_RUNTIME_ROOT a required env variable" am: 6dc466fd3a am: 84cbaf603e
...
am: beb24a9764
Change-Id: Iebc2f4a8769f2f2da5459862cb2d6370dd105c83
2018-12-04 05:34:21 -08:00
Dario Freni
79f40ffadb
[automerger skipped] Merge changes from topic "apex_adb" am: f64909587b am: 2d03586435
...
am: 110abbf49a -s ours
Change-Id: I223936e3c8868e409fcec819b1341ac0a3d3549f
2018-12-04 05:19:10 -08:00
Neil Fuller
beb24a9764
Merge "Make ANDROID_RUNTIME_ROOT a required env variable" am: 6dc466fd3a
...
am: 84cbaf603e
Change-Id: I8fe51f82861ea2397b335efdbc4605fbd1e9b46a
2018-12-04 05:13:57 -08:00
Neil Fuller
84cbaf603e
Merge "Make ANDROID_RUNTIME_ROOT a required env variable"
...
am: 6dc466fd3a
Change-Id: I0efcfb627ed17e24ffb278909d19292a4ffdb058
2018-12-04 05:06:13 -08:00
Dario Freni
110abbf49a
Merge changes from topic "apex_adb" am: f64909587b
...
am: 2d03586435
Change-Id: I217e06b2e131e6eb3f21c6f25207699f9b15b28f
2018-12-04 05:05:42 -08:00
Dario Freni
2d03586435
Merge changes from topic "apex_adb"
...
am: f64909587b
Change-Id: If241fd30597248d5c34be0e550feaf50850e46cc
2018-12-04 04:52:09 -08:00
Olivier Gaillard
f1ef51a9d5
Merge "Use setMaxBinderCallStats instead of set interval."
2018-12-04 12:51:19 +00:00
Neil Fuller
6dc466fd3a
Merge "Make ANDROID_RUNTIME_ROOT a required env variable"
2018-12-04 12:39:16 +00:00
Treehugger Robot
f64909587b
Merge changes from topic "apex_adb"
...
* changes:
Add MATCH_APEX flag to getInstalledPackages.
Rename APEX installPackage method to stagePackage.
Initial support for installing APEX via adb.
2018-12-04 12:29:06 +00:00
Olivier Gaillard
3b87c389b7
Merge "Attribute binder/looper work started from BatteryExternalStatsWorker."
2018-12-04 11:33:39 +00:00
TreeHugger Robot
b844315b7d
Merge "Fixed quickscrub regression"
2018-12-04 11:16:43 +00:00
David Brazdil
0bf7ab1631
Merge "hiddenapi: Add constants for 'greylist-max-p'" am: ec62f08f8c am: 8a822605d2
...
am: f29f0de34c
Change-Id: I31647f9e58e86d1bb18891534fcf1e3d4226298e
2018-12-04 03:07:34 -08:00
David Brazdil
f29f0de34c
Merge "hiddenapi: Add constants for 'greylist-max-p'" am: ec62f08f8c
...
am: 8a822605d2
Change-Id: If1b679a373cb4a29405076ee1ebe2df904b793ea
2018-12-04 02:48:00 -08:00
David Brazdil
8a822605d2
Merge "hiddenapi: Add constants for 'greylist-max-p'"
...
am: ec62f08f8c
Change-Id: I4da04fd68d6c779402508b5b901a6566efbc2b40
2018-12-04 02:29:59 -08:00
Tiger Huang
b4287e0c49
Merge "Prevent the focus state from getting cleared"
2018-12-04 10:10:41 +00:00
TreeHugger Robot
d380bd78bb
Merge "Select closest font's style for backward compatibility"
2018-12-04 10:10:11 +00:00
David Brazdil
ec62f08f8c
Merge "hiddenapi: Add constants for 'greylist-max-p'"
2018-12-04 10:07:59 +00:00
Olivier Gaillard
2c9d47a533
Use setMaxBinderCallStats instead of set interval.
...
Test: manual
Change-Id: I9ddb84209bb1c4719374276a3ed47e5eebf874f7
2018-12-04 09:49:11 +00:00
Jorim Jaggi
c999d5ee84
Merge "A brave new world for window insets (2 and 3/n)"
2018-12-04 09:44:26 +00:00
Neil Fuller
269be44f8f
Merge "Add a service for reporting runtime debug info" am: 08cbafefdc am: 20547cf20d
...
am: b5354b7ca9
Change-Id: I2395418164f3dbcb04bc18647c6cccf7a025c1b4
2018-12-04 00:56:36 -08:00
Neil Fuller
b5354b7ca9
Merge "Add a service for reporting runtime debug info" am: 08cbafefdc
...
am: 20547cf20d
Change-Id: I29e7fe0355c7461ca6b939c669b9e4f3d471c4b6
2018-12-04 00:36:09 -08:00
Neil Fuller
20547cf20d
Merge "Add a service for reporting runtime debug info"
...
am: 08cbafefdc
Change-Id: I7964eb4c6a72f7d2a52f600cbb4c8e07736284fe
2018-12-04 00:26:45 -08:00
Neil Fuller
08cbafefdc
Merge "Add a service for reporting runtime debug info"
2018-12-04 08:10:34 +00:00
Felipe Leme
d830ca25a1
Merge "Refactored AbstractRemoteService in 2 classes."
2018-12-04 06:26:49 +00:00
Tiger Huang
c4f6b122bc
Fix DisplayPolicyLayoutTests
...
WindowTestsBase.createWindow() would not only create a WindowState
object, but would also create its parents and add it to the scene
graph. When WindowTestsBase is creating the StackWindowController, it
will invoke controller.onOverrideConfigurationChanged() which
eventually requests a traversal to layout all the windows. The layout
caused by the traversal has chances to impact the test.
DisplayPolicyLayoutTests uses its own display frame to perform the
layout. The width and height are arbitrary which may not be the same
as the width and height of the mDisplayContent in the scene graph.
So if the layout is performed by the mDisplayContent (instead of
DisplayPolicyLayoutTests), the window frames will be different.
With this change, we use the mGlobalLock to protect our tests. It
ensures that no one would modify the window frames computed by
layoutWindowLw() when we are testing them.
Bug: 120075361
Test: atest DisplayPolicyInsetsTests \
DisplayPolicyLayoutTests \
DisplayPolicyTests
Change-Id: I11420d3ddfc1d0610d000919574ad5bfba27345a
2018-12-04 14:24:42 +08:00
Seigo Nonaka
68d1d5ae7e
Select closest font's style for backward compatibility
...
Bug: 119425212
Test: atest CtsGraphicsTestCases
Test: atest CtsContentTestCases:android.content.res.cts.ResourcesTest
Change-Id: I796baf342f752366040b657954b0f82d358a7790
2018-12-03 20:16:26 -08:00
TreeHugger Robot
6b611eaefc
Merge "Give navigation audio group priority over voice audio group."
2018-12-04 03:55:12 +00:00
Chong Zhang
c13bfd871d
Merge "Fix ExifInterface for .heic when meta is at the end" am: 98c9cd7b20 am: 17fc70b1ee
...
am: 79fa7d39c3
Change-Id: I33880ecff74ecdc2a60b0857b3cb8e8164232030
2018-12-03 19:37:53 -08:00
Chong Zhang
79fa7d39c3
Merge "Fix ExifInterface for .heic when meta is at the end" am: 98c9cd7b20
...
am: 17fc70b1ee
Change-Id: Ib3073cfac59888d707583efd9a9fda1d3731f103
2018-12-03 19:24:28 -08:00
Chong Zhang
17fc70b1ee
Merge "Fix ExifInterface for .heic when meta is at the end"
...
am: 98c9cd7b20
Change-Id: Iad3fabcbbb4f46c1d401c45fe25ea6c39e248efd
2018-12-03 19:14:11 -08:00
Treehugger Robot
98c9cd7b20
Merge "Fix ExifInterface for .heic when meta is at the end"
2018-12-04 02:51:07 +00:00
TreeHugger Robot
3af0f3a7c3
Merge "Specify AudioTrack HWAVSync timestamp units as nanoseconds"
2018-12-04 02:49:33 +00:00
TreeHugger Robot
402f60848c
Merge "Swipe integration"
2018-12-04 02:48:29 +00:00
Shuo Qian
61d0334836
Merge "Frame EmergencyNumber notifier in TelephonyRegistry"
2018-12-04 02:25:19 +00:00
Elliott Hughes
01fb624e09
Merge "C++17 is the default now." am: fbb102ea84 am: ccb3d1d61a
...
am: 8dd21cd6b5
Change-Id: I79e72e3a99c9590fdbaab72507044aa85dfa38ef
2018-12-03 18:05:24 -08:00
TreeHugger Robot
60cd20ed9b
Merge "Remove ; from closing namespaces in libs/hwui"
2018-12-04 02:01:14 +00:00
Tyler Gunn
e74019dc88
[automerger skipped] Merge "Add telecom test-commands for maintaining role overrides." am: d2d1a5a23e am: eacfc9fd85
...
am: f374fdcb83 -s ours
Change-Id: I5d92e11da24a80a2e912f3b5b78e36e36c830246
2018-12-03 17:49:44 -08:00
Elliott Hughes
8dd21cd6b5
Merge "C++17 is the default now." am: fbb102ea84
...
am: ccb3d1d61a
Change-Id: I9d422db18f2c87c5f44e8f6e3598d6e597b32c21
2018-12-03 17:46:41 -08:00
Elliott Hughes
ccb3d1d61a
Merge "C++17 is the default now."
...
am: fbb102ea84
Change-Id: I9674640ffa53c4998c9d4f52340803e309b04eb1
2018-12-03 17:36:29 -08:00