Commit Graph

68581 Commits

Author SHA1 Message Date
Phil Weaver
500cd62024 Merge "Fix problem with ListView accessibility focus" 2017-03-29 00:58:31 +00:00
Yifan Hong
80bed42d50 Merge "Merge "Add HidlSupport.java for utility methods for HIDL." am: 383391c5da am: 75172f2909 am: 2b38993bef" into oc-dev-plus-aosp
am: 06898dff6a

Change-Id: I7d9b2c26c85403b9df476f9eb437393a6058b687
2017-03-29 00:53:34 +00:00
Yifan Hong
4c5b8b3b71 Merge "Add HidlSupport.java for utility methods for HIDL." am: 383391c5da am: 75172f2909
am: 2b38993bef

Change-Id: Ieda97ba519f5dc35efa54ae4457737df585b8dc2
2017-03-29 00:48:01 +00:00
Yifan Hong
2b38993bef Merge "Add HidlSupport.java for utility methods for HIDL." am: 383391c5da
am: 75172f2909

Change-Id: I173a10744b83e144c19d5fc9167cac40d07aef92
2017-03-29 00:44:01 +00:00
Yifan Hong
75172f2909 Merge "Add HidlSupport.java for utility methods for HIDL."
am: 383391c5da

Change-Id: If68b94a2b38a7665a739f2792b8e0acefe5037c1
2017-03-29 00:39:58 +00:00
Treehugger Robot
383391c5da Merge "Add HidlSupport.java for utility methods for HIDL." 2017-03-29 00:32:19 +00:00
George Mount
645d5a4361 Merge "Make public getFragments() and onGetLayoutInflater() methods" into oc-dev am: c8d8c27c68
am: abea405064

Change-Id: Ib8bf2e7e6e0403f17c7f58f31a26554ca74f3272
2017-03-28 23:55:30 +00:00
George Mount
abea405064 Merge "Make public getFragments() and onGetLayoutInflater() methods" into oc-dev
am: c8d8c27c68

Change-Id: I3324c7b31834ab429ec3b38d4035fe3dd9e3c9b2
2017-03-28 23:48:39 +00:00
TreeHugger Robot
c8d8c27c68 Merge "Make public getFragments() and onGetLayoutInflater() methods" into oc-dev 2017-03-28 23:43:23 +00:00
TreeHugger Robot
8ecb4f5929 Merge "Fix a bug with filtering by raw bytes when such filter is not provided" 2017-03-28 23:36:15 +00:00
Yifan Hong
8ef5feadb8 Add HidlSupport.java for utility methods for HIDL.
The old .equals code uses Objects.deepEquals,
which does not handle for, e.g. ArrayList<byte[]>.
Create our own recursive HidlSupport.deepEquals
and deepHashCode method to handle these edge cases.

Bug: 36454147
Test: hidl_test_java
Change-Id: I56dc48985486b561263c260cf43aa90f30d581d0
2017-03-28 22:47:32 +00:00
Makoto Onuki
42d556f9dc Merge "Log a warning if a dispatch on UiThread takes more than" into oc-dev am: e56bfe0012
am: 9f799f906f

Change-Id: I06e4dd3e3dd6abda6b58b96be0fad78c2aa3ed8e
2017-03-28 22:16:19 +00:00
Eugene Susla
f0aae00cc2 Fix a bug with filtering by raw bytes when such filter is not provided
See change in BluetoothDeviceFilterUtils

Bug: 30932767
Test: Call API with a BLE filter with no raw bytes filter, matching some device.
Ensure that the device eventually shows up.
Change-Id: Ia4bfd6ac7139c374ef54dfeef71fc99a5d65bcb0
2017-03-28 15:12:26 -07:00
Makoto Onuki
9f799f906f Merge "Log a warning if a dispatch on UiThread takes more than" into oc-dev
am: e56bfe0012

Change-Id: I9743b382b9d7156576f7962e38971ef73aa2322a
2017-03-28 22:10:46 +00:00
Makoto Onuki
e56bfe0012 Merge "Log a warning if a dispatch on UiThread takes more than" into oc-dev 2017-03-28 22:03:08 +00:00
Andrii Kulian
846a577c9c Merge "Add Configuration param to onMovedToDisplay" into oc-dev
am: 36e2483663

Change-Id: I4deb6bcfb5facad1e0f85e66a149af88cbab04c2
2017-03-28 21:50:58 +00:00
Makoto Onuki
9957151661 Log a warning if a dispatch on UiThread takes more than
a certain amount of time.

Bug: 34961340
Test: Boot and launch several apps.
Change-Id: I38bd85a1dd9c572242d04f550df4a979f5f3bea5
2017-03-28 21:49:51 +00:00
TreeHugger Robot
36e2483663 Merge "Add Configuration param to onMovedToDisplay" into oc-dev 2017-03-28 21:36:40 +00:00
Todd Kennedy
5d1b7734ed Merge "Intercept direct launch of instant app installer" into oc-dev
am: 61ae34afe3

Change-Id: Iafec525f0b70c87e8a6362a37a9c508541faa740
2017-03-28 21:02:18 +00:00
Todd Kennedy
350553050e Merge "make MATCH_FACTORY_ONLY @SystemAPI" into oc-dev
am: 1b782bffdf

Change-Id: Ia15934bb7a40be04d32c0c9418ed8a8d8bd2c1c7
2017-03-28 21:01:16 +00:00
Shunta Sato
81ac13a896 Merge "Don't allow the negative height of ListPopupWindow" into oc-dev am: adcb8c8a62
am: 4b2ddf93d1

Change-Id: Ic676f1eee8a044f5fe0d806cc81720b88a66faf1
2017-03-28 21:00:16 +00:00
Todd Kennedy
cd5bf857df Merge "Add extra flag to ApplicationInfoFlags" into oc-dev
am: 01d69aae3a

Change-Id: I6ff9abe0cafd62e5160483fca547f33822bde731
2017-03-28 21:00:16 +00:00
Chad Brubaker
c1ffef0629 Merge "Add ACTION_EPHEMERAL_RESOLVER_SETTINGS" into oc-dev
am: f0fb78b95d

Change-Id: I2ddd5efd4d2579cc2f0eae0dd6119cf939ae3534
2017-03-28 20:59:17 +00:00
Shunta Sato
4b2ddf93d1 Merge "Don't allow the negative height of ListPopupWindow" into oc-dev
am: adcb8c8a62

Change-Id: Iaa38eb853169a6b8ca98d59f88116bd70a597838
2017-03-28 20:52:20 +00:00
TreeHugger Robot
61ae34afe3 Merge "Intercept direct launch of instant app installer" into oc-dev 2017-03-28 20:47:09 +00:00
TreeHugger Robot
1b782bffdf Merge "make MATCH_FACTORY_ONLY @SystemAPI" into oc-dev 2017-03-28 20:46:44 +00:00
TreeHugger Robot
01d69aae3a Merge "Add extra flag to ApplicationInfoFlags" into oc-dev 2017-03-28 20:46:21 +00:00
TreeHugger Robot
f0fb78b95d Merge "Add ACTION_EPHEMERAL_RESOLVER_SETTINGS" into oc-dev 2017-03-28 20:45:26 +00:00
Todd Kennedy
b21be12d9d Intercept direct launch of instant app installer
The instant app installer is not designed to be launched directly
by 3p apps. Instead, intercept the launch and make it look like
a "normal" instant app launch.
cherry-picked from I89c9b8c56865e260a2b92f8c2312a305a74f9cf5

Bug: 33073524
Test: Built and notice poorly behaving apps [*cough* keep *cough*] now launch instant apps
Change-Id: I5401aa8423042f54f1478409065b0d6b25cebe89
2017-03-28 13:43:21 -07:00
Todd Kennedy
ea2529df19 make MATCH_FACTORY_ONLY @SystemAPI
cherry-picked from I9e2046b62cb20c5b6651e91f833aff04d45d9800

Bug: 35946061
Test: None; just added an annotation
Change-Id: I604f962b9826700c335eeda9682d3354f6260c40
2017-03-28 13:42:00 -07:00
Todd Kennedy
b65c36a034 Add extra flag to ApplicationInfoFlags
MATCH_DISABLED_COMPONENTS should be part of ApplicationInfoFlags.
cherry-picked from If6a925c156192ee4663f0cb66d82fc03a86940d6

Change-Id: I048635ff0938f2772d5702de7eb4bc4812ece605
Fixes: 34969805
Test: None; updating annotation
2017-03-28 13:40:02 -07:00
Shunta Sato
ec2952bc4a Don't allow the negative height of ListPopupWindow
Symptom:
If an application set a negative height to the popup list,
surfaceflinger is crashed with SIGABRT.

Root cause:
WindowManagerService dose not expect negative
height of ListPopupWindow. If it's negative,
WindowManagerService set the negative value to GraphicBufferAlloc,
but GraphicBufferAlloc handle the value as unsigned int,
then surfaceflinger is crashed with SIGABRT.

Solution:
Setting a negative height is a developer error.
We should throw an IAE from setHeigh(int).

Bug: 33441454

Author: Kazuki Nakayama <kazuki.x.nakayama@sonymobile.com>
Change-Id: I5887674d302e567abfe66147de4819cfdf0ef97b
2017-03-28 13:36:36 -07:00
Chad Brubaker
336ae5b616 Add ACTION_EPHEMERAL_RESOLVER_SETTINGS
This Intent will be used in Settings to show the settings UI for the
Ephemeral resolver. Settings can get the correct component to send the
Intent to by calling
PackageManager.getInstantAppResolverSettingsComponent

Bug: 35918998
Test: Boots
Change-Id: I0edcf85704f2c19e0ee27f91b6ef057d52e32778
(cherry picked from commit aa49cb86e6)
2017-03-28 20:34:55 +00:00
Chad Brubaker
22a5cf6d9b Merge "Add ACTION_EPHEMERAL_RESOLVER_SETTINGS" 2017-03-28 20:33:35 +00:00
Jakub Pawlowski
1ac2ef2d09 Merge "Bluetooth API spelling fixes ("wether" -> "whether")" am: 81cef3aeb8 am: 5cca752a4b am: 855f9f576b
am: 5896ed8f0b

Change-Id: I2beaadeca3bd34564f5a74cfc010c4e3e35f19a6
2017-03-28 20:28:48 +00:00
Jakub Pawlowski
5896ed8f0b Merge "Bluetooth API spelling fixes ("wether" -> "whether")" am: 81cef3aeb8 am: 5cca752a4b
am: 855f9f576b

Change-Id: Icd6f6d3224c7c7fdeceb5f82f100f12e77f9c5c9
2017-03-28 20:23:49 +00:00
Tianjie Xu
ca94897b2a Merge "improve the format of locale argument when calling recovery" am: 032c7a0a18 am: 1cd3a93288 am: bc0865bc78
am: ee45a1f3ab

Change-Id: I2abd77840eb8199fe814e02f8a552d30f1c2c190
2017-03-28 20:17:48 +00:00
Jakub Pawlowski
855f9f576b Merge "Bluetooth API spelling fixes ("wether" -> "whether")" am: 81cef3aeb8
am: 5cca752a4b

Change-Id: I8b16cad8a35aef0be8f69f7ca45d54ff08402930
2017-03-28 20:17:45 +00:00
Jakub Pawlowski
5cca752a4b Merge "Bluetooth API spelling fixes ("wether" -> "whether")"
am: 81cef3aeb8

Change-Id: Ief280cbc9283ff1cabdd3c8e53fcabd47c7881b1
2017-03-28 20:12:46 +00:00
Tianjie Xu
ee45a1f3ab Merge "improve the format of locale argument when calling recovery" am: 032c7a0a18 am: 1cd3a93288
am: bc0865bc78

Change-Id: I65bc4945d0701ecc10fd41f827c4566dfea912f9
2017-03-28 20:12:14 +00:00
Tianjie Xu
bc0865bc78 Merge "improve the format of locale argument when calling recovery" am: 032c7a0a18
am: 1cd3a93288

Change-Id: I341961293c992b682aea631750eb35ca7857396a
2017-03-28 20:03:32 +00:00
Jakub Pawlowski
81cef3aeb8 Merge "Bluetooth API spelling fixes ("wether" -> "whether")" 2017-03-28 20:01:31 +00:00
Tomasz Wasilczyk
2ebd55996a Merge "Add background scan routines and callbacks to broadcast radio API." 2017-03-28 19:55:09 +00:00
Tianjie Xu
1cd3a93288 Merge "improve the format of locale argument when calling recovery"
am: 032c7a0a18

Change-Id: I54389601ac5234b872701762e928a3ea7ff2f307
2017-03-28 19:53:45 +00:00
Tianjie Xu
032c7a0a18 Merge "improve the format of locale argument when calling recovery" 2017-03-28 19:42:54 +00:00
Evan Rosky
3473647f7d Merge "Allow ToolbarActionBar to pass-through unhandled keyShortcuts" 2017-03-28 19:38:45 +00:00
Amith Yamasani
6ea7ad7487 Merge "Catch IllegalArgumentException to avoid SyncManager crash" into oc-dev am: fbd2c21f18
am: 5f5c700790

Change-Id: I297c4df5a869b579219d064098c06cd821ac47d1
2017-03-28 18:35:08 +00:00
Tomasz Wasilczyk
e597ce15b3 Add background scan routines and callbacks to broadcast radio API.
Bug: b/34054813
Test: it builds.
Change-Id: I4483d1034f28af05d869cada672e9c0988bd4b65
2017-03-28 11:19:31 -07:00
TreeHugger Robot
fbd2c21f18 Merge "Catch IllegalArgumentException to avoid SyncManager crash" into oc-dev 2017-03-28 18:15:43 +00:00
Jakub Pawlowski
08ed924d89 Bluetooth API spelling fixes ("wether" -> "whether")
Bug: 30622771
Test: manual
Change-Id: I01c8b18d0057f2fd6e477ce2ca0b779321b6c0e6
2017-03-28 18:09:50 +00:00