Commit Graph

63425 Commits

Author SHA1 Message Date
Svetoslav Ganov
b1274a057f Merge "Init MemoryIntArray#mFd with -1" am: d6eaa80590
am: a3f14a1531

Change-Id: Ieba327ed8b18c66906746e34e857e774c181fcf0
2017-05-12 00:22:00 +00:00
Svetoslav Ganov
d6eaa80590 Merge "Init MemoryIntArray#mFd with -1" 2017-05-11 23:34:24 +00:00
Hugo Benichi
164854bde2 Merge changes Ie762ce75,I611fd791 am: 21a57f263f
am: cc9f695ba0

Change-Id: I39dbc3c3c7e69e87e12977fb173379e60c74a3d9
2017-05-11 13:56:22 +00:00
Hugo Benichi
21a57f263f Merge changes Ie762ce75,I611fd791
* changes:
  ConnectivityManager: unit test for argument validation
  ConnectivityManager: uses service error codes and exceptions
2017-05-11 12:31:41 +00:00
Hugo Benichi
cb88323dd2 ConnectivityManager: uses service error codes and exceptions
This patch introduces between ConnectivityManager and
ConnectivityService a mechanism for propagating back to clients
informative errors in the form of error codes and associated custom
runtime exceptions.

Without error code, the service can only throw a limited number of
different exceptions over Binder. Furthermore the throw site stack
traces are always loss. Although for individual instances of a throw,
the error message can be inspected, aggregations of stack traces from
app crashes sanitize error messages and only leaves the stack traces.

This makes debugging dificult for some service calls such as
requestNetwork that can have a variety of failure modes.

In this patch only one failure mode is codified. More can be added later
at a light cost by: 1) defining an error code, 2) defining an
associated exception, 3) mapping the code to the exception. This patch
can serves as a template for doing so.

Test: $ runtest frameworks-net,
      #testNetworkRequestMaximum() detects the new exception type.
Bug:  36556809, 36701874
Change-Id: I611fd7915575c9e418f7149fcdc8a879d2a3716d
2017-05-11 14:15:15 +09: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
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
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
Stanley Tng
767f05feea Add Save and Restore of BluetoothOn setting
This change will automatically save the Bluetooth On setting when
the user chooses to backup the phone settings into the cloud. This
setting is restored by the Setup Wizard (SUW) when configuring the
phone and this change will enable or disable the Bluetooth based
on this restored setting.

Bug: 35657817
Test: Manual test with Sailfish
Change-Id: Ie4518593af63f96f8c363f98941ca5260a3ec4bb
2017-05-10 16:28:47 +00:00
Hemant Gupta
cef9ce368c 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: I548362cc328498920b2dae740f1a76b2cc2d6a67
2017-05-10 16:23:17 +00:00
Jakub Pawlowski
36e8f468c3 Merge "Bluetooth: Fix Periodic Adv interval check" am: cb70647418
am: 5bd173cd93

Change-Id: Ib06ab14a4625919e3091b45a78fab67dd38f8d37
2017-05-10 07:44:57 +00:00
Sunny Kapdi
037d3513e0 Bluetooth: Fix Periodic Adv interval check
The MIN and MAX values need to be swapped else
the parameter check in setInterval would always
fail

Bug: 37579882
Change-Id: I48538c2a61be88caaf04abd94074b3d9eb6dde96
2017-05-10 07:23:06 +00:00
Andre Eisenbach
1655862b93 Merge "Bluetooth: Fix interval low/min values" am: 66deee2bd4
am: 0771cb13a2

Change-Id: I74e0987ed0b6bf17ad4ff04089d703143a512005
2017-05-10 00:04:19 +00:00
Jakub Pawlowski
6b1f39502c Bluetooth: Fix interval low/min values
Bug: 38175945
Test: none
Change-Id: Idf487c7aafc518f2c57be78a1fa979b2c4a383d6
2017-05-09 22:59:18 +00:00
Ajay Panicker
79b8b354c8 Merge "Bluetooth: Move Bluetooth battery stats tracking (1/2)" am: 7df4093371
am: a3fe28806e

Change-Id: Ice5081d34ba731026e6f3b6d9c7a0156334ec705
2017-05-09 18:23:43 +00:00
Ajay Panicker
a43bd01bd1 Bluetooth: Move Bluetooth battery stats tracking (1/2)
Move Bluetooth battery stats tracking to AppScanStats for a more
unified tracking system.

Bug: 37720787
Test: cts-tradefed run cts-dev -m CtsIncidentHostTestCases -t com.android.server.cts.BatteryStatsValidationTest#testBleScans
      Perform BLE scan and check battery stats
Change-Id: Ie6c682374e6e258c291d3a11eede649c7747ef40
2017-05-09 17:52:36 +00:00
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