Commit Graph

63408 Commits

Author SHA1 Message Date
Hugo Benichi
44e9b81c54 Merge changes I4872f8ba,I92039f29,Iaad13e13 am: 767ac317e2
am: 717238a614

Change-Id: Id7ca8a16da5774a00517cfb60b877d181a358353
2017-05-09 06:23:46 +00:00
Hugo Benichi
ab5bdbf84e NsdService: test coverage for client requests.
Adding coverage for:
  - NsdManager client disconnection
  - in-flight request GC

Test: new test passes
Bug: 37013369, 33298084
Change-Id: I92039f297cf99352bbf4196797933d89c0b819ff
2017-05-09 10:49:33 +09:00
Hugo Benichi
ff3e6ccca1 NsdManager: remove duplicated argument validation
This patch simplifies argument validation in NsdManager public api and
regroup duplicated validation into common methods.

This makes stack traces more actionable as now specific errors will
cause the api to throw exception from specific methods, whereas before
IllegalArgumentException would be thrown from inside the same api method
for different reasons.

This patch also includes a couple of other small cleanups.

Test: $ runtest -x frameworks/base/tests/net/../NsdManagerTest.java
Bug: 37013369
Change-Id: Iaad13e13976e9bf8f508d7188f823f8184ac414b
2017-05-09 10:49:33 +09:00
Yifan Hong
31175a97b4 Merge changes from topic 'libvintf_cp' am: 9bd4c20764
am: 7fbbc2e85d

Change-Id: Id3ce69c9f0642b1aad8acb9512870b239e652e95
2017-05-06 00:28:09 +00:00
Yifan Hong
c62e73c6a4 Add compatibility matrices to VintfObject.report() am: 4463d991be
am: dd4156cb43

Change-Id: I877107d04b96038592a8aaf2c79aecdd316318f2
2017-05-06 00:26:53 +00:00
Yifan Hong
dd4156cb43 Add compatibility matrices to VintfObject.report()
am: 4463d991be

Change-Id: I26c78cca5e807ee291bdb097d11d5f4ac43bba29
2017-05-06 00:17:26 +00:00
Treehugger Robot
9bd4c20764 Merge changes from topic 'libvintf_cp'
* changes:
  android.os.VintfObject: add API for EDI.
  Add compatibility matrices to VintfObject.report()
2017-05-06 00:11:33 +00:00
Ruben Brunk
f4a9d362a8 Merge "Fix Bluetooth GATT API default handler assignment" am: 612b8bef0c
am: 0b34d001e4

Change-Id: Ie18a2a483bb08d924a93db4f7dd95c948a6fb323
2017-05-05 23:46:53 +00:00
Ruben Brunk
c131051e28 Fix Bluetooth GATT API default handler assignment
Restores previous behaviour where GATT callbacks are invoked on the
binder thread and not the calling process main looper thread.

This fixes performance regressions as well as some
NetworkOnMainThreadException's for some applications.

Bug: 37544152
Bug: 37871717
Test: Covered by prior API tests.
Change-Id: Id8ab705dd4d7f00030e6ac29e056dde5180670e9
(cherry picked from commit 6bdc550e27)
2017-05-05 22:22:50 +00:00
Kenny Root
4fd0b06ac7 Track updates to Conscrypt am: 7fdce769c3
am: 0634c4f77f

Change-Id: I9cdad70a06353e3451cc3c1d4e1237f42b91fa24
2017-05-05 21:18:09 +00:00
Kenny Root
0634c4f77f Track updates to Conscrypt
am: 7fdce769c3

Change-Id: I691f1ed588814311363f67b8ce43cbe247e54b71
2017-05-05 21:08:48 +00:00
Kenny Root
c497348c74 Merge changes from topic 'update-conscrypt'
* changes:
  Delete obsolete and unused KeyStoreTests
  Track updates to Conscrypt
2017-05-05 21:00:40 +00:00
Neil Fuller
5175e734a1 Merge "Add (disabled) time zone update system server impl" am: cba224e833
am: 0a6aeccab2

Change-Id: Idbd7614472b51a87e217bb21720ecfb0b063d237
2017-05-05 14:23:04 +00:00
Yifan Hong
bf49821c39 android.os.VintfObject: add API for EDI.
Add APIs for EDI (extensive device information).

Test: CtsDeviceInfo
Bug: 28656227
Change-Id: I609d4f1f07e20717827ef024ff8cbe124d7e54a6
Merged-In: I609d4f1f07e20717827ef024ff8cbe124d7e54a6
2017-05-04 20:01:32 -07:00
Yifan Hong
4463d991be Add compatibility matrices to VintfObject.report()
Test: FrameworksCoreTests
Bug: 36814503
Change-Id: I27eaea136437afb2102581d410b657e810612a0a
Merged-In: I27eaea136437afb2102581d410b657e810612a0a
2017-05-04 20:00:30 -07:00
Neil Fuller
68f666693a Add (disabled) time zone update system server impl
This commit builds on top of prior API commits. It
adds code to the system server, but in a disabled way.

The system server is responsible for monitoring two
(configured) package names: one for the "updater app"
(provided by the platform) and one for the "data app"
(provided by the OEM). When either package changes
the updater app is triggered via a privileged
intent.

The updater is then required to communicate with the
data app and report back to the system server.

Unit tests are included for the major components.

To run:
make -j30 FrameworksServicesTests
adb install -r -g "out/target/product/angler/data/app/FrameworksServicesTests/FrameworksServicesTests.apk"
adb shell am instrument -e package com.android.server.timezone -w com.android.frameworks.servicestests \
    "com.android.frameworks.servicestests/android.support.test.runner.AndroidJUnitRunner"

Test: See above.
Bug: 31008728
Merged-In: I8f82cdcc2b574778a7e0d0184270f305b69ee17b
Change-Id: I8f82cdcc2b574778a7e0d0184270f305b69ee17b
2017-05-04 19:46:47 +01:00
Neil Fuller
2cf4771469 Merge "More time zone update API classes" am: c301339498
am: 9798dc47b1

Change-Id: Ia85f1ec883b8ac8cb9a93dfbfabacd1589aafe8f
2017-05-04 14:53:53 +00:00
Treehugger Robot
c301339498 Merge "More time zone update API classes" 2017-05-04 14:41:10 +00:00
Neil Fuller
3620392aca Merge "Time zone update API classes" am: cfe0c2f1ec
am: 463f3f8cf7

Change-Id: I519483f82e12a038e52f3b4813b0db0325749925
2017-05-04 14:06:56 +00:00
Neil Fuller
cfe0c2f1ec Merge "Time zone update API classes" 2017-05-04 13:51:39 +00:00
Neil Fuller
a8889fa7fa More time zone update API classes
This class forms the contract between the updater app
(the app provided by and triggered by the system)
and the data app (the app provided by the OEM to
provide time zone data).

Bug: 31008728
Test: make only, just constants
Change-Id: I687b75954e132884aec962fcf8955f3f38a00b2f
2017-05-04 14:11:09 +01:00
Neil Fuller
bede17c216 Time zone update API classes
Time zone update API classes. Currently hidden but they
will go on to be unhidden in future.

This forms the basis of client and system server code to
support time zone updates.

Tests can be run with:

make -j30 FrameworksCoreTests
adb install out/target/product/angler/data/app/FrameworksCoreTests/FrameworksCoreTests.apk
adb shell am instrument -e package android.app.timezone \
    -w com.android.frameworks.coretests \
    "com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner"

Bug: 31008728
Test: See above.
Merged-In: I668bc8ac0cb78f3d4d9a4b7ad6ac1534b88af833
Change-Id: Icde574f8974152617a1f7ac9fa225bd5011dcce1
2017-05-04 12:32:53 +01:00
gaoshang
ca8edea785 Merge "fix KeyEvent can't correctly finish when inputmethod time out happend" am: 36247646e3
am: 0f722b529c

Change-Id: Ic315d3c7d7cfc0132237de29fc7426d412cdb96b
2017-05-04 03:51:43 +00:00
Treehugger Robot
36247646e3 Merge "fix KeyEvent can't correctly finish when inputmethod time out happend" 2017-05-04 03:37:37 +00:00
gaoshang
d66a86bf50 fix KeyEvent can't correctly finish when inputmethod time out happend
Symptom: If inputmethod handle an KeyEvent time out ,
Did not finish this event correctly , eventually lead to app ANR
Root Cause: without seq number when obtainMessage MSG_TIMEOUT_INPUT_EVENT
Solution: add seq parameter

Test: Input
Test: InputMethod

Fixes: 37648930
Change-Id: I3a2b964b34aa57267bd777305200a2bfdc66f65c
Merged-In: I3a2b964b34aa57267bd777305200a2bfdc66f65c
Signed-off-by: gaoshang <gaoshang@xiaomi.com>
2017-05-04 02:19:42 +00:00
Tianjie Xu
1b0da0cdfd Merge "Add error/cause code reporting for Non A/B OTA failures" am: 2db2f6d265
am: c2a0d6776c

Change-Id: I2061f6c122f64d9156ca4c17ec3d410eff213a07
2017-05-03 17:51:56 +00:00
Tianjie Xu
2db2f6d265 Merge "Add error/cause code reporting for Non A/B OTA failures" 2017-05-03 17:34:29 +00:00
Tianjie Xu
223edeb272 Add error/cause code reporting for Non A/B OTA failures
Read and report the error_code & cause_code from last_install.

Bug: 36866437
Test: mma & observe the sysui event in logcat -b events
Change-Id: I5357861fc758e14ed3235bfc8cc76d7561ccea58
2017-05-02 23:02:11 -07:00
Hugo Benichi
27b0eebb4d Merge "NsdManager: add test coverage for discoverServices()" am: 3e21b1745c
am: 60182dbe4e

Change-Id: I341cbbfd36b4e849651505c187053115833ca4b0
2017-05-02 08:59:22 +00:00
Treehugger Robot
3e21b1745c Merge "NsdManager: add test coverage for discoverServices()" 2017-05-02 08:44:29 +00:00
Hugo Benichi
9a3e69d9b6 Merge "NsdManager: unit test coverage for servive registration" am: b0e408450c
am: bc57faa1ac

Change-Id: I55a7a1a33cfd30a5c8d5ede67f6a1c602a840e6a
2017-05-02 06:42:44 +00:00
Treehugger Robot
b0e408450c Merge "NsdManager: unit test coverage for servive registration" 2017-05-02 06:27:10 +00:00
Hugo Benichi
93f4591684 NsdManager: add test coverage for discoverServices()
Test: added new tests
Bug: 37013369, 33298084
Change-Id: If6c1113ee1bd4690db90abd5a61c3e229c827aec
2017-05-02 15:26:33 +09:00
Hugo Benichi
8c5eeb0afc NsdManager: unit test coverage for servive registration
This patch adds test coverage for NsdManager#registerService() and
NsdManager#unregisterService(). This test shows a potential defect in
the api: if unregisterService() fails, the associated listener is always
unregistered from NsdManager. If the service initially registered is
still registered, this potentially make it impossible to unregister.

Test: added new unit test
Bug: 37013369, 33298084
Change-Id: Ia089b6d2f2a349907a8b29d9a3acd7f59e177887
2017-05-02 13:31:24 +09:00
Kenny Root
7fdce769c3 Track updates to Conscrypt
Test: cts-tradefed run cts -m CtsLibcoreOkHttpTestCases -a arm64-v8a
Test: cts-tradefed run cts -m CtsLibcoreTestCases -a arm64-v8a
Change-Id: I1487d694c5abe7cf2b938d9f1869d9aeb5285ac5
2017-05-01 14:11:03 -07:00
Colin Cross
316c9ce694 Add missing symbol
Bug: 35998031
Test: builds
Change-Id: Ie085b4058c5714df9913ceb9fd03fb4658168520
2017-05-01 15:02:50 +00:00
Yifan Hong
5fe979b404 Merge "Add android.os.VintfRuntimeInfo" am: 4f8a375958
am: e0bf06dd9e

Change-Id: Iae968194f2dbaa2effcf19399b1165a233aa32ba
2017-04-29 03:12:52 +00:00
Treehugger Robot
4f8a375958 Merge "Add android.os.VintfRuntimeInfo" 2017-04-29 03:00:08 +00:00
Yifan Hong
1bda67369c Add android.os.VintfRuntimeInfo
This is the Java API for ::android::vintf::RuntimeInfo.
This will be used by CTS for device info report purposes.

Bug: 28656227
Test: cts-tradefed run cts -m CtsEdiHostTestCases --skip-preconditions
Change-Id: Id87c95a17e77d7ec1794a6f850de97edf9ae892d
2017-04-28 17:10:28 -07:00
Jakub Pawlowski
62fc08f684 Merge "Bluetooth: bluetooth.le API fixes" am: cf95973276
am: 6af9bde898

Change-Id: I20d885ee7f12821885767a13cafac6c3dec4ba2d
2017-04-28 21:55:50 +00:00
Jakub Pawlowski
9d4abb5631 Bluetooth: bluetooth.le API fixes
Fix minor spelling problems.
Throw IllegalStateException instead of IllegalArgumentException in
build().

Bug: 37532634
Test: none
Change-Id: I73b6f04aec98f5baffb06a363e2a3f71e8cec3c4
2017-04-28 21:35:53 +00:00
Tomasz Wasilczyk
3329b63b40 Merge "Fix equality method implementation in BandConfig class." am: 30a34ec0e2
am: 5acbf70872

Change-Id: I57e6fa0f946f25048da1524f07fa4eb13fdb2f1c
2017-04-28 20:25:43 +00:00
Tomasz Wasilczyk
30a34ec0e2 Merge "Fix equality method implementation in BandConfig class." 2017-04-28 20:09:04 +00:00
Tomasz Wasilczyk
dd767065fe Fix equality method implementation in BandConfig class.
Test: instrumentation (in master branch)
Bug: b/36863239
Change-Id: I2f3b68ba3fac75b849ee99dc06d0a13478168b7e
2017-04-28 08:19:34 -07:00
Martijn Coenen
5aaf5543e4 Merge "Validate incoming data properly." am: 5718b01b9a
am: 4fcfe05707

Change-Id: I129a3e6c1b401448c075cd63c5396914bfb67fd7
2017-04-28 14:44:47 +00:00
Martijn Coenen
7c00639a68 Validate incoming data properly.
Make sure calls to readBuffer() and readEmbeddedBuffer()
get the correct size, parent and offset passed in, so
these can be validated by libhwbinder.

Modified HwBlob to take a length argument as well,
so it can be validated.

Bug: 30498700
Test: hidl_test, hidl_test_java, Youtube, Maps, Netflix, Camera
Change-Id: I28712db97ae29b46acfe952d3d92d1ce5f666a4d
Merged-In: I28712db97ae29b46acfe952d3d92d1ce5f666a4d
2017-04-27 16:24:26 -07:00
Jakub Pawlowski
493ae0da60 Merge "Bluetooth: Add constants to ScanResult" am: 369a94496c
am: b6656f07e7

Change-Id: I29f06e5c612e29ae25bde0e3e8854bf88213b65d
2017-04-27 22:33:14 +00:00
Jakub Pawlowski
c7c01a2877 Bluetooth: Add constants to ScanResult
Add TX_POWER_NOT_PRESENT and PERIODIC_INTERVAL_NOT_PRESENT

Test: none
Bug: 37536707
Change-Id: Ia48a30f44a961c6e0babd17ecaed0eb93c98ecad
2017-04-27 21:03:46 +00:00
Jakub Pawlowski
3657c398e1 Merge "Fix NPE when accessing mCallback in BluetoothGatt" am: 1be8fb23eb
am: 28f182aa87

Change-Id: I85f4847b7c530bded24dcb27faa851ed9b5ba653
2017-04-27 19:56:09 +00:00
Jakub Pawlowski
0e4ac75f2e Fix NPE when accessing mCallback in BluetoothGatt
This issue was introduced in commit
4eab49652e.

Bug: 37710354
Test: none
Change-Id: I2d985ce97c44d4e096713e156e57437f44ea3ddb
2017-04-27 19:37:35 +00:00