Commit Graph

71633 Commits

Author SHA1 Message Date
Svet Ganov
84390348ea Merge "Properly position dataset picker UI" into oc-dev am: d915aecfaa
am: d0bfa95b4c

Change-Id: I8387cbce6e288c02a5e469dc80245528ae2381e1
2017-05-11 07:08:00 +00:00
Michael Wachenschwanz
6517ae695a Merge "WTF Logging for catching memory issue in Parcel" into oc-dev am: 9254322192
am: c7373d1f5e

Change-Id: If27d23f8423337bf7c9290d9e00a55fb021679ff
2017-05-11 06:59:10 +00:00
Kevin Chyn
966adcbcea Merge "AuthenticationCallback should not be cleared onAuthenticationFailed" into oc-dev am: 6fddc2472e
am: 7096712148

Change-Id: I398d64f93c5061d031c18fcd5a1bfcba9fb96898
2017-05-11 06:52:24 +00:00
Jeremy Joslin
f4491b7103 Merge "Merge "Adding a new config and Setting for WiFi Wakeup." into oc-dev am: b569eedf37" into oc-dev-plus-aosp
am: 3f3a19183e

Change-Id: I01a5285918e355004d25cc9fbb04c70926a28cfa
2017-05-11 06:18:28 +00:00
Makoto Onuki
70dfa834ee Merge "Reconnect to DAService after binding is dead" into oc-dev am: ef5700667f
am: 0d9425e3e4

Change-Id: I597a3a5382ebf9798b322fc8bb3c88749d117170
2017-05-11 06:09:05 +00:00
Makoto Onuki
b6511a60e0 Merge "Offload saving bitmaps from binder threads" into oc-dev am: 31ef139466
am: 3b178f77ce

Change-Id: I12603ba93310abaa8612c118ebf77ac25e6918c5
2017-05-11 05:30:01 +00:00
Makoto Onuki
d7a168e11a Merge "Tweak for b/37809561." into oc-dev am: ca50e88b6b
am: 07db193ebc

Change-Id: I1f2580577da505bb11fdb0445c2d30e87f632a48
2017-05-11 05:26:45 +00:00
Ruben Brunk
cc9089817d Merge "Fix VR component enforcement for "2D in 3D" apps." into oc-dev am: 4d73fd5765
am: dbe6a24331

Change-Id: I7de9452a95aebf7a658d9d0552426146d1bf8e73
2017-05-11 04:51:09 +00:00
Adrian Roos
25664896dd Merge "AOD: Notification groups on Ambient Display" into oc-dev am: bafe438d71
am: ec9559ddc6

Change-Id: I176adacd40cce9d0b321501e8fe8d29f1168f0d5
2017-05-11 04:34:09 +00:00
Colin Cross
065405ca83 Merge "Bluetooth: HID: Add support for Set Idle and Get Idle Commands (3/4)" 2017-05-11 04:23:05 +00:00
Hemant Gupta
56048c446a Bluetooth: HID: Add support for Set Idle and Get Idle Commands (3/4)
Provides an interface for application to send Set Idle
and Get Idle commands to remote HID Device. Support for these
two commands was missing from existing code, so existing code
design is reused to add support for these two commands.

Without this support following mandatory PTS test cases for HID 1.0
cannot be passed, TC_HOS_HID_BV_05/06.

Test: Executed PTS tests TC_HOS_HID_BV_05/06 and confirmed if they can
pass

Bug: 34344715
Change-Id: I21f37d7638c80da99a69c38d55d741b5fb107961
(cherry picked from commit cef9ce368c)
2017-05-10 21:19:46 -07:00
Stanley Tng
09dae065c5 Merge "Merge "Add Save and Restore of BluetoothOn setting" am: bbcc641317 am: 1755a4af45 am: 6682651b2b" into oc-dev-plus-aosp
am: 4c47458094

Change-Id: I5a19fd8f898c726d8d94df7a15cfac0161fd28b0
2017-05-11 04:09:24 +00:00
Geoffrey Pitsch
a82814f0ee Merge "Fix Toast exception in NotificationManagerService" into oc-dev am: 3ee2bfd8f5
am: 92f7c861b0

Change-Id: I694b5476cdea81f751cbb15421862589e9217e3f
2017-05-11 04:02:48 +00:00
Svet Ganov
c82357bd2c Merge "Revert "Fixed placemente of Autofill UI for virtual views."" into oc-dev am: e59c6ef346
am: c911e0e76f

Change-Id: I8a1f7f4eabebe3b00ee0dfe5ae502be32486b5af
2017-05-11 03:54:10 +00:00
Svet Ganov
d0bfa95b4c Merge "Properly position dataset picker UI" into oc-dev
am: d915aecfaa

Change-Id: Ic480311a515e5a096f6b62319d677a07dd22c391
2017-05-11 02:48:46 +00:00
Michael Wachenschwanz
c7373d1f5e Merge "WTF Logging for catching memory issue in Parcel" into oc-dev
am: 9254322192

Change-Id: I2471901f1504c242b9020f575126c56375036498
2017-05-11 02:01:55 +00:00
Santos Cordon
527b92c8d8 Merge "Add uniqueId to Virtual Display and pass through to inputflinger (1/2)" 2017-05-11 01:48:26 +00:00
TreeHugger Robot
d915aecfaa Merge "Properly position dataset picker UI" into oc-dev 2017-05-11 01:38:15 +00:00
Andre Eisenbach
1360c6227e Merge "Bluetooth: HID: Add support for Set Idle and Get Idle Commands (3/4)" am: 51876abe82 am: 9413fd9e1f
am: 01d1188a8b

Change-Id: Ie92cbd1f5795d7b9f55d0e51503e7d08b61e8732
2017-05-11 01:33:18 +00:00
Michael Wachenschwanz
9254322192 Merge "WTF Logging for catching memory issue in Parcel" into oc-dev 2017-05-11 01:26:11 +00:00
Kevin Chyn
7096712148 Merge "AuthenticationCallback should not be cleared onAuthenticationFailed" into oc-dev
am: 6fddc2472e

Change-Id: I3493866a4e594a186f897b02dca0773e4a7a0d49
2017-05-11 01:13:10 +00:00
Andre Eisenbach
01d1188a8b Merge "Bluetooth: HID: Add support for Set Idle and Get Idle Commands (3/4)" am: 51876abe82
am: 9413fd9e1f

Change-Id: If065f6d25da71238b3788af0ee0854321a905e47
2017-05-11 01:10:49 +00:00
TreeHugger Robot
6fddc2472e Merge "AuthenticationCallback should not be cleared onAuthenticationFailed" into oc-dev 2017-05-11 00:46:36 +00:00
Andre Eisenbach
51876abe82 Merge "Bluetooth: HID: Add support for Set Idle and Get Idle Commands (3/4)" 2017-05-11 00:37:44 +00:00
Jeremy Joslin
fb94305b33 Merge "Adding a new config and Setting for WiFi Wakeup." into oc-dev
am: b569eedf37

Change-Id: Id4e9f4644bc470d1a3b8813502eb3e1e2ca45f05
2017-05-11 00:18:48 +00:00
Makoto Onuki
0d9425e3e4 Merge "Reconnect to DAService after binding is dead" into oc-dev
am: ef5700667f

Change-Id: I03049914406ed38f92c3a6a43a82f55504c6e518
2017-05-11 00:15:47 +00:00
Makoto Onuki
3b178f77ce Merge "Offload saving bitmaps from binder threads" into oc-dev
am: 31ef139466

Change-Id: I2980b05a8a997e003792fe995973b54eaf29d5e1
2017-05-11 00:06:56 +00:00
TreeHugger Robot
b569eedf37 Merge "Adding a new config and Setting for WiFi Wakeup." into oc-dev 2017-05-11 00:05:52 +00:00
Makoto Onuki
07db193ebc Merge "Tweak for b/37809561." into oc-dev
am: ca50e88b6b

Change-Id: I7ecbf3e077cdd9b06e9c1a13455c572c6f21c00e
2017-05-11 00:04:14 +00:00
Svet Ganov
374cae1e61 Properly position dataset picker UI
Test: all autofill CTS tests pass

bug:37958210
bug:37986800

Change-Id: Ic2cb3b8c6762a922bdb7c632e451772b7a006739
2017-05-10 23:38:51 +00:00
Makoto Onuki
ef5700667f Merge "Reconnect to DAService after binding is dead" into oc-dev 2017-05-10 23:20:39 +00:00
Bryce Lee
5cfde635e3 Merge "Use application context getting secondary displays." into oc-dev am: 456882b5ae
am: 356cccd67c

Change-Id: I291e1249e9e0b5a975faade4ee105b3e6711db67
2017-05-10 23:04:38 +00:00
Ruben Brunk
dbe6a24331 Merge "Fix VR component enforcement for "2D in 3D" apps." into oc-dev
am: 4d73fd5765

Change-Id: I7031eb3ac81aa95df7a729ad358f5288b1cabc4e
2017-05-10 23:04:07 +00:00
Adrian Roos
ec9559ddc6 Merge "AOD: Notification groups on Ambient Display" into oc-dev
am: bafe438d71

Change-Id: I159e4543f15c5d2f89bbfee10f77ed33aaaad7a7
2017-05-10 22:55:58 +00:00
Michael Wachenschwanz
101e38cbec WTF Logging for catching memory issue in Parcel
Catch an exception sent from native code looking for a specific known
bug and report via wtf which code path is hitting the bug. Revert this
change once bug has been resolved.

Bug: 37298089
Test: manual

Change-Id: Ieb98a8a82a9a2cffe4d0cfbbc8333f453b3e36d5
Signed-off-by: Michael Wachenschwanz <mwachens@google.com>
2017-05-10 15:38:30 -07:00
Android Build Merger (Role)
4c47458094 Merge "Merge "Add Save and Restore of BluetoothOn setting" am: bbcc641317 am: 1755a4af45 am: 6682651b2b" into oc-dev-plus-aosp 2017-05-10 22:34:57 +00:00
Stanley Tng
508f9bcb9d Merge "Add Save and Restore of BluetoothOn setting" am: bbcc641317 am: 1755a4af45
am: 6682651b2b

Change-Id: I6dd36520e8a0cf09c75788eda2e03b4309acea9e
2017-05-10 22:32:32 +00:00
Geoffrey Pitsch
92f7c861b0 Merge "Fix Toast exception in NotificationManagerService" into oc-dev
am: 3ee2bfd8f5

Change-Id: I10a6e8958b66463762188a82ed05ca24ff538805
2017-05-10 22:31:09 +00:00
TreeHugger Robot
31ef139466 Merge "Offload saving bitmaps from binder threads" into oc-dev 2017-05-10 22:24:14 +00:00
Makoto Onuki
ca50e88b6b Merge "Tweak for b/37809561." into oc-dev 2017-05-10 22:20:34 +00:00
Svet Ganov
c911e0e76f Merge "Revert "Fixed placemente of Autofill UI for virtual views."" into oc-dev
am: e59c6ef346

Change-Id: I3c615043966131d206967bbb7d230af9b6652f47
2017-05-10 22:09:50 +00:00
Stanley Tng
6682651b2b Merge "Add Save and Restore of BluetoothOn setting" am: bbcc641317
am: 1755a4af45

Change-Id: I6a143760d9acef0fb5f28680ca1538e346ebd81f
2017-05-10 22:04:24 +00:00
Kevin Chyn
7a6b44bcee AuthenticationCallback should not be cleared onAuthenticationFailed
Fixes: 38197608

Test: 1) enroll a finger
2) enter keyguard, touch sensor with an unenrolled finger
3) touch sensor with enrolled finger
4) phone should enter keyguard
5) do this test from screen off as well

Change-Id: I1c7b060888128b4a6b492fd6a7a8ebc85d2b3353
2017-05-10 14:39:55 -07:00
TreeHugger Robot
baed8c1321 Merge "Add uniqueId to Virtual Display and pass through to inputflinger (1/2)" into oc-dev-plus-aosp 2017-05-10 21:18:51 +00:00
Ahmed ElArabawy
2c01ffd14b Merge "power hal: Use power HAL API 1.1" 2017-05-10 20:37:48 +00:00
Santos Cordon
023b6b9d23 Add uniqueId to Virtual Display and pass through to inputflinger (1/2)
This CL adds :
1) Adds uniqueId (protected via system/sig permission) to virtual
displays.
2) Add support for N virtual display viewports into inputflinger.
3) Set the virtual display's viewports in inputflinger if it has the
uniqueId value set to non-null. (a) Moving the new viewport from java to
native inputflinger and (b) adding "uniqueId" value to viewports makes
up the great majority of this change.
4) From the inputflinger side, we also read in a new value from the
input device configuration files called 'touch.displayId'.
5) When touch.displayId and the virtual display's uniqueId match,
inputflinger links the two.

Test: Start VR and ensure that the virtual viewport shows up when running
'adb shell dump input".  Run a VR app, and ensure that the virtual input
device is associated with the new virtual viewport.
Test: com.android.server.display.DisplayManagerServiceTest

Bug: 36051620
Change-Id: Id728d6e7292feaa1d8de7660bc6a2ec90fa1ff3c
2017-05-10 13:03:32 -07:00
Bryce Lee
356cccd67c Merge "Use application context getting secondary displays." into oc-dev
am: 456882b5ae

Change-Id: Ib45a340b34f11f0112c91893893f32e0a849cf93
2017-05-10 19:22:15 +00:00
Makoto Onuki
09c529a9bc Reconnect to DAService after binding is dead
- When the DO/PO process crashes twice with a short interval, AM gives up
and the binding will be "died".  Once binding is in this state it'll never
be re-connected.

(Still, DO/PO can disable and re-enable their DAS to force DPMS to bind again
though.)

- Detect this and re-connect after one hour.

- Back-off time will be exponentially increased and never reset until DPMS
explicitly re-connects, which happens when:
-- the device rebooted,
-- the user stopped and re-started, or
-- the DAS is disabled and re-enabled.

Test: adb shell am instrument -e class com.android.server.am.PersistentConnectionTest -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.devicepolicy.DevicePolicyConstantsTest -w com.android.frameworks.servicestests
Test: adb shell am instrument -e class com.android.server.devicepolicy.DevicePolicyManagerTest -w com.android.frameworks.servicestests
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l VERBOSE -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceAdminServiceDeviceOwnerTest
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l VERBOSE -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceAdminServiceProfileOwnerTest

Bug 37711907

Change-Id: Ie0b227a94e6ce85d72a969a4dea1020baf734e2f
2017-05-10 11:57:19 -07:00
Ruben Brunk
4d73fd5765 Merge "Fix VR component enforcement for "2D in 3D" apps." into oc-dev 2017-05-10 18:19:06 +00:00
Adrian Roos
bafe438d71 Merge "AOD: Notification groups on Ambient Display" into oc-dev 2017-05-10 18:17:44 +00:00