Colin Cross
a7cfd57759
Add multi-dex to SettingsLibTests when buliding with coverage
...
Building with coverage enabled pushes SettingsLibTests over the dex
limit, enable multi-dex.
Test: builds
Change-Id: Ia72db71a2e46e2fdc8cf3e5484f122fa985f25c7
2017-02-17 18:54:37 +00:00
Android Build Merger (Role)
54dc4cb096
Merge "Merge "Update dalvik.bytecode package" am: 3f827b5e33 am: fd63280dd2 am: 2e6a473f20 am: 2dc835dd1c"
2017-02-17 18:40:27 +00:00
Orion Hodson
2b7c037aee
Merge "Update dalvik.bytecode package" am: 3f827b5e33 am: fd63280dd2 am: 2e6a473f20
...
am: 2dc835dd1c
2017-02-17 18:39:13 +00:00
TreeHugger Robot
a4f3891d28
Merge "Mark clearDeviceOwnerApp/clearProfileOwner as deprecated"
2017-02-17 18:38:36 +00:00
Conrad Chen
7a9e2fb857
Merge "TIF: Fix current position not reported issue"
2017-02-17 18:36:42 +00:00
Andrii Kulian
a2c94eb260
Merge "Use the top stack on display instead of focused"
2017-02-17 18:36:09 +00:00
Andrii Kulian
580ae91310
Merge "Move activities to fullscreen stack on display removal"
2017-02-17 18:35:31 +00:00
Orion Hodson
2dc835dd1c
Merge "Update dalvik.bytecode package" am: 3f827b5e33 am: fd63280dd2
...
am: 2e6a473f20
2017-02-17 18:33:21 +00:00
Andrii Kulian
000fd43eec
Merge "Report move to display for activities that handle config changes"
2017-02-17 18:27:29 +00:00
Orion Hodson
2e6a473f20
Merge "Update dalvik.bytecode package" am: 3f827b5e33
...
am: fd63280dd2
2017-02-17 18:27:29 +00:00
Orion Hodson
fd63280dd2
Merge "Update dalvik.bytecode package"
...
am: 3f827b5e33
2017-02-17 18:20:18 +00:00
Treehugger Robot
3f827b5e33
Merge "Update dalvik.bytecode package"
2017-02-17 18:13:42 +00:00
Bartosz Fabianowski
4f7e1fc9af
Merge "Add API for checking whether the default IME was set by the DO/PO"
2017-02-17 17:53:02 +00:00
Dmitry Dementyev
a63a9d4c34
Merge "Update AccountManager getAccountVisibility method to better handle default cases."
2017-02-17 17:06:18 +00:00
Aaron Whyte
cdb8fcb611
Merge "Unhide InputDevice.SOURCE_ROTARY_ENCODER"
2017-02-17 16:40:51 +00:00
TreeHugger Robot
f3a5cefdf6
Merge "Do not log booleans"
2017-02-17 16:26:23 +00:00
Orion Hodson
7d1bdf8375
Update dalvik.bytecode package
...
BUG: 33191717
Test: m checkapi
Change-Id: I6af2b36573f698ae091e9d7e3f01c156549834c1
2017-02-17 14:55:25 +00:00
TreeHugger Robot
bae3d7083f
Merge "Spline: Fix monotonicity constraint"
2017-02-17 14:53:29 +00:00
Julia Reynolds
bef4eed2f7
Do not log booleans
...
Change-Id: Ic132d214d226abb6b318038a3262e1c918814aa6
Fixes: 35445671
Test: manual
2017-02-17 09:49:16 -05:00
Wyatt Riley
cd52950a9e
Merge "Common code for 4 jni Location conversions"
2017-02-17 14:40:29 +00:00
TreeHugger Robot
91e5d7fa99
Merge "Remove locked user tasks if starting overlay fails"
2017-02-17 13:40:43 +00:00
sj.cha
4205057104
Merge "Infinite reboot when OS upgrade from M to N with set Always-on VPN" am: 1a69570fe8 am: 3b92631a69 am: 10957727f5
...
am: 395f0de0dc
2017-02-17 13:32:07 +00:00
sj.cha
395f0de0dc
Merge "Infinite reboot when OS upgrade from M to N with set Always-on VPN" am: 1a69570fe8 am: 3b92631a69
...
am: 10957727f5
2017-02-17 13:27:04 +00:00
sj.cha
10957727f5
Merge "Infinite reboot when OS upgrade from M to N with set Always-on VPN" am: 1a69570fe8
...
am: 3b92631a69
2017-02-17 13:21:34 +00:00
sj.cha
3b92631a69
Merge "Infinite reboot when OS upgrade from M to N with set Always-on VPN"
...
am: 1a69570fe8
2017-02-17 13:17:00 +00:00
Treehugger Robot
1a69570fe8
Merge "Infinite reboot when OS upgrade from M to N with set Always-on VPN"
2017-02-17 13:07:21 +00:00
TreeHugger Robot
df31649933
Merge "Backup service APIs not available on parent profile instance"
2017-02-17 12:06:33 +00:00
TreeHugger Robot
08a2dd12bb
Merge "Defer readSessionsLocked until system ready"
2017-02-17 10:51:06 +00:00
Robin Lee
1d996bd7fc
Remove locked user tasks if starting overlay fails
...
This is a more graceful failure case than giving up and just letting
the task show unmodified on the screen if something goes wrong.
Test: runtest -x WorkLockActivityControllerTest.java
Bug: 31001762
Fix: 31064912
Change-Id: I505c00f411f41fb927c31d2280bdeda69e15b4d4
2017-02-17 10:48:43 +00:00
Clara Bayarri
1a8904abee
Merge "Use weight & style data for fonts from xml source"
2017-02-17 10:39:53 +00:00
Bill Yi
b97ce9eb47
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: d4177b8610 -s ours
...
am: 53c71a90fb
2017-02-17 10:29:48 +00:00
Bill Yi
53c71a90fb
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
...
am: d4177b8610
2017-02-17 10:24:43 +00:00
TreeHugger Robot
d4177b8610
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
2017-02-17 10:16:42 +00:00
Shreyas Basarge
4edbf055ed
Merge "Use separate message ids for backup and restore operations"
2017-02-17 10:14:50 +00:00
Esteban Talavera
5b7f2d0858
Backup service APIs not available on parent profile instance
...
Bug: 35432611
Test: cts-tradefed run cts-dev --module DevicePolicyManager --test com.android.cts.devicepolicy.ManagedProfileTest#testParentProfileApiDisabled
Change-Id: Ia1621183dee17dcd183a668f1714b563f79e5b17
2017-02-17 09:45:24 +00:00
TreeHugger Robot
6fd0e8d5d4
Merge "Import translations. DO NOT MERGE"
2017-02-17 09:39:51 +00:00
TreeHugger Robot
5cf832c5ae
Merge "Import translations. DO NOT MERGE"
2017-02-17 09:38:47 +00:00
TreeHugger Robot
956edcafe4
Merge "Import translations. DO NOT MERGE"
2017-02-17 09:38:07 +00:00
TreeHugger Robot
0478678634
Merge "Import translations. DO NOT MERGE"
2017-02-17 09:32:53 +00:00
TreeHugger Robot
ec8a096d59
Merge "Import translations. DO NOT MERGE"
2017-02-17 09:30:16 +00:00
TreeHugger Robot
c5f6c336d5
Merge "Import translations. DO NOT MERGE"
2017-02-17 09:28:39 +00:00
Bill Yi
385ae1a01a
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: d74b5f551d -s ours
...
am: 5871f5ec47
2017-02-17 09:23:42 +00:00
Bill Yi
5871f5ec47
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
...
am: d74b5f551d
2017-02-17 09:19:10 +00:00
TreeHugger Robot
d74b5f551d
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
2017-02-17 09:10:42 +00:00
TreeHugger Robot
5dd1308bbc
Merge "Fix duplicate calls of IMS#doStartInput()"
2017-02-17 08:24:47 +00:00
TreeHugger Robot
a722a2ea38
Merge "Add missing transitive dependencies"
2017-02-17 05:19:05 +00:00
Bill Yi
94a1e0fca6
Import translations. DO NOT MERGE
...
Change-Id: Ia854a721fe3df7212deb75df8ab7c4adb5b531c1
Auto-generated-cl: translation import
2017-02-16 21:18:39 -08:00
Bill Yi
deb08a3096
Import translations. DO NOT MERGE
...
Change-Id: I80580cf6ece02cc20f4cda744f2b3599ec3985cd
Auto-generated-cl: translation import
2017-02-16 21:09:53 -08:00
Bill Yi
3e97f5c9ca
Import translations. DO NOT MERGE
...
Change-Id: Id1a24d5bd8306f602f6cd6e42fe7ca70c1e2c750
Auto-generated-cl: translation import
2017-02-16 20:55:10 -08:00
Jerry Zhang
9c78253b75
Merge changes from topic 'svcusb' am: 5e2a2ee39e am: 6f44072d03 am: 35f8d6cfd0
...
am: fba74d6c61
2017-02-17 04:41:32 +00:00
