TreeHugger Robot
91997ffd75
Merge "Rewrite FingerprintService to use HIDL 2.1"
2017-01-17 20:16:59 +00:00
Ta-wei Yen
c578d8c2f5
Merge "Add getNetworkSpecifier() and getCarrierConfig()" am: 68d03b23bb am: ea0e111468 am: 89a85b0683
...
am: 9e3a4957fc
2017-01-17 20:05:02 +00:00
Ta-wei Yen
9e3a4957fc
Merge "Add getNetworkSpecifier() and getCarrierConfig()" am: 68d03b23bb am: ea0e111468
...
am: 89a85b0683
2017-01-17 19:59:43 +00:00
Ta-wei Yen
89a85b0683
Merge "Add getNetworkSpecifier() and getCarrierConfig()" am: 68d03b23bb
...
am: ea0e111468
2017-01-17 19:53:42 +00:00
Ta-wei Yen
ea0e111468
Merge "Add getNetworkSpecifier() and getCarrierConfig()"
...
am: 68d03b23bb
2017-01-17 19:47:24 +00:00
Jim Miller
40e4645e6e
Rewrite FingerprintService to use HIDL 2.1
...
Bug: 33199080
Test: Fingerprint enroll, remove, unlock, fingerprint arbitration.
Change-Id: I8b98236ba81f053527ee74c8a189af1adfd17d55
2017-01-17 11:45:41 -08:00
Ta-wei Yen
68d03b23bb
Merge "Add getNetworkSpecifier() and getCarrierConfig()"
2017-01-17 19:38:27 +00:00
TreeHugger Robot
7d13f29b12
Merge "Add constant for package verifier state."
2017-01-17 19:38:23 +00:00
Andrii Kulian
059df13f32
Merge "Add unit tests for 180 degree rotation"
2017-01-17 19:32:00 +00:00
Andrii Kulian
6c7dcd8a46
Merge "Relayout window when rotated landscape <-> seascape"
2017-01-17 19:32:00 +00:00
Android Build Merger (Role)
0608a3bf71
Merge "Merge "Merge "Keep WIFI_FEATURE defines in sync with HAL" am: cdad7f334b am: 9db7223591 am: 3d12f1b928" into nyc-mr2-dev-plus-aosp am: ab8ebeafa2"
2017-01-17 19:23:22 +00:00
Android Build Merger (Role)
9fa86b2c14
Merge "Merge "Keep WIFI_FEATURE defines in sync with HAL" am: cdad7f334b am: 9db7223591 am: 3d12f1b928 am: d061cf5f6c"
2017-01-17 19:23:01 +00:00
Randy Pan
a941209e2f
Merge "Merge "Keep WIFI_FEATURE defines in sync with HAL" am: cdad7f334b am: 9db7223591 am: 3d12f1b928" into nyc-mr2-dev-plus-aosp
...
am: ab8ebeafa2
2017-01-17 19:22:07 +00:00
Randy Pan
850e37811e
Merge "Keep WIFI_FEATURE defines in sync with HAL" am: cdad7f334b am: 9db7223591 am: 3d12f1b928
...
am: d061cf5f6c
2017-01-17 19:21:59 +00:00
Android Build Merger (Role)
f056884734
Merge "Merge "Merge "Revert "DO NOT MERGE ANYWHERE unlock_wave: replace with black"" into nyc-mr2-dev am: ebf7abb19e -s ours" into nyc-mr2-dev-plus-aosp am: e0c2adaff4 -s ours"
2017-01-17 19:21:33 +00:00
TreeHugger Robot
5471cfc750
Merge "Add doc to Configuration.setTo() method"
2017-01-17 19:21:26 +00:00
Andrew Rossignol
f47a7f5ac9
Merge "Merge "Revert "DO NOT MERGE ANYWHERE unlock_wave: replace with black"" into nyc-mr2-dev am: ebf7abb19e -s ours" into nyc-mr2-dev-plus-aosp
...
am: e0c2adaff4
2017-01-17 19:20:27 +00:00
Andrew Rossignol
243c0172f9
Merge "Revert "DO NOT MERGE ANYWHERE unlock_wave: replace with black"" into nyc-mr2-dev am: ebf7abb19e -s ours
...
am: 12d23e7f0f
2017-01-17 19:20:24 +00:00
Andrew Rossignol
5fb5bc728f
Merge "Revert "DO NOT MERGE ANYWHERE unlock_wave: replace with black" am: 2f6b711ffa -s ours" into nyc-mr2-dev-plus-aosp
...
am: cb9d39e438
2017-01-17 19:19:01 +00:00
Andrew Rossignol
d2e6df3cef
Revert "DO NOT MERGE ANYWHERE unlock_wave: replace with black" am: 2f6b711ffa -s ours
...
am: 2aa5a90c41
2017-01-17 19:18:56 +00:00
Przemyslaw Szczepaniak
d41d449897
Merge "Track libcore change 7d105d591c14afd00f894e8f3483adcbee6e901a" am: 751e3af81e am: 6b9cd13b05 am: cc1074f6f4
...
am: bc5fd99347
2017-01-17 19:16:54 +00:00
TreeHugger Robot
91f5cbf3a0
Merge "Add OFFSET and LENGTH args for paged queries."
2017-01-17 19:14:52 +00:00
Tobias Thierer
bb7a35ae86
Merge "API: Update java.util.Date to OpenJDK8u60" am: a2343a7e78 am: d8d1d9682d am: d6be4be618
...
am: 191806932e
2017-01-17 19:10:43 +00:00
Android Build Merger (Role)
ab8ebeafa2
Merge "Merge "Keep WIFI_FEATURE defines in sync with HAL" am: cdad7f334b am: 9db7223591 am: 3d12f1b928" into nyc-mr2-dev-plus-aosp
2017-01-17 19:08:49 +00:00
Android Build Merger (Role)
e0c2adaff4
Merge "Merge "Revert "DO NOT MERGE ANYWHERE unlock_wave: replace with black"" into nyc-mr2-dev am: ebf7abb19e -s ours" into nyc-mr2-dev-plus-aosp
2017-01-17 19:08:23 +00:00
Android Build Merger (Role)
cb9d39e438
Merge "Revert "DO NOT MERGE ANYWHERE unlock_wave: replace with black" am: 2f6b711ffa -s ours" into nyc-mr2-dev-plus-aosp
2017-01-17 19:08:03 +00:00
Randy Pan
d061cf5f6c
Merge "Keep WIFI_FEATURE defines in sync with HAL" am: cdad7f334b am: 9db7223591
...
am: 3d12f1b928
2017-01-17 19:07:59 +00:00
Andrew Rossignol
12d23e7f0f
Merge "Revert "DO NOT MERGE ANYWHERE unlock_wave: replace with black"" into nyc-mr2-dev
...
am: ebf7abb19e
2017-01-17 19:07:05 +00:00
Andrew Rossignol
2aa5a90c41
Revert "DO NOT MERGE ANYWHERE unlock_wave: replace with black"
...
am: 2f6b711ffa
2017-01-17 19:06:57 +00:00
Przemyslaw Szczepaniak
bc5fd99347
Merge "Track libcore change 7d105d591c14afd00f894e8f3483adcbee6e901a" am: 751e3af81e am: 6b9cd13b05
...
am: cc1074f6f4
2017-01-17 19:06:26 +00:00
TreeHugger Robot
e3099e5363
Merge "Have better separation between adding, positioning, and reparenting task"
2017-01-17 19:03:42 +00:00
Randy Pan
3d12f1b928
Merge "Keep WIFI_FEATURE defines in sync with HAL" am: cdad7f334b
...
am: 9db7223591
2017-01-17 18:48:00 +00:00
Przemyslaw Szczepaniak
cc1074f6f4
Merge "Track libcore change 7d105d591c14afd00f894e8f3483adcbee6e901a" am: 751e3af81e
...
am: 6b9cd13b05
2017-01-17 18:46:25 +00:00
TreeHugger Robot
ebf7abb19e
Merge "Revert "DO NOT MERGE ANYWHERE unlock_wave: replace with black"" into nyc-mr2-dev
2017-01-17 18:42:46 +00:00
Randy Pan
9db7223591
Merge "Keep WIFI_FEATURE defines in sync with HAL"
...
am: cdad7f334b
2017-01-17 18:28:21 +00:00
Przemyslaw Szczepaniak
6b9cd13b05
Merge "Track libcore change 7d105d591c14afd00f894e8f3483adcbee6e901a"
...
am: 751e3af81e
2017-01-17 18:26:57 +00:00
Phil Weaver
0a78adea72
Merge "Provide hint text to accessibility."
2017-01-17 18:11:22 +00:00
Randy Pan
cdad7f334b
Merge "Keep WIFI_FEATURE defines in sync with HAL"
2017-01-17 18:10:02 +00:00
Treehugger Robot
751e3af81e
Merge "Track libcore change 7d105d591c14afd00f894e8f3483adcbee6e901a"
2017-01-17 17:55:18 +00:00
TreeHugger Robot
5feafb1f71
Merge "Properly track fragments from pop operations."
2017-01-17 17:49:25 +00:00
TreeHugger Robot
ce29c76a1b
Merge "Fix focus problems when using optimized fragment transactions."
2017-01-17 17:48:38 +00:00
Wale Ogunwale
c5cc301689
Have better separation between adding, positioning, and reparenting task
...
Several methods in activity manager and window manager performed adding,
positioning, and reparenting a task operation and sometimes failed silently
when things don't work due the callers using the methods for a particular
operation, but getting a different operation due to programmer error.
This CL better separate the methods responsible for adding, positioning, and
reparenting a task and also fails hard when there is an error.
Test: bit FrameworksServicesTests:com.android.server.wm.TaskWindowContainerControllerTests
Test: Manual testing existing PiP doesn't leave the device in a bad state.
Bug: 34260633
Change-Id: Id64367da30fc6214eb6f95b2bd5e58ed0e953a88
2017-01-17 09:46:07 -08:00
Ben Wagner
1a6cd84d64
Merge "Remove SkDevice.h includes."
2017-01-17 17:10:05 +00:00
TreeHugger Robot
d5b7c452f9
Merge "Move navigation bar logic to its own class"
2017-01-17 17:07:00 +00:00
Fabien Sanglard
d8cb7dcc41
Merge "AAPT2: Convert Android.mk to Android.bp"
2017-01-17 16:34:06 +00:00
TreeHugger Robot
1bb7019176
Merge "Allow removing non-enabled profiles"
2017-01-17 15:58:24 +00:00
Jason Monk
49fa016a98
Move navigation bar logic to its own class
...
Start hacking away at PhoneStatusBar by trying to pull out
as much NavigationBar logic as possible.
Test: runtest systemui
Change-Id: I23b904428be31b91f0747fd60c9f6e0dd323eb44
2017-01-17 10:31:13 -05:00
TreeHugger Robot
0872c2455e
Merge "Readd missing null check"
2017-01-17 14:01:21 +00:00
TreeHugger Robot
92d053b459
Merge "Unit tests for wipeData for a managed profile."
2017-01-17 12:04:51 +00:00
TreeHugger Robot
4488286444
Merge "Clarify what a "work lock screen" is"
2017-01-17 11:54:10 +00:00
