OSDN Git Service
Jakub Pawlowski [Mon, 28 Aug 2017 11:12:49 +0000 (04:12 -0700)]
Fix GATT client leakage when scan is throttled (1/2)
Currently, scan throttling happens after client is registered, but
before the scan is started. This might lead to scan client being leaked.
This patch fixed that by moving check before client registration.
Bug:
64887233
Test: manual
Change-Id: I22ae624a0c51110cb69679f796926e3b2b36d0ac
Treehugger Robot [Mon, 28 Aug 2017 12:39:29 +0000 (12:39 +0000)]
Merge "Trivial change to test expectations."
Hugo Benichi [Mon, 28 Aug 2017 11:47:08 +0000 (11:47 +0000)]
Merge "Nat464Xlat: clat management cleanup"
Lorenzo Colitti [Thu, 24 Aug 2017 03:40:07 +0000 (12:40 +0900)]
Trivial change to test expectations.
(cherry picked from commit
0fee732ca579bbc4320ade35f238bdfa1aa500f5)
Bug:
32163131
Test: runtest frameworks-net
Change-Id: Iec8af5191b4da495e47ef97d70a03a5d2e75cfe2
Lorenzo Colitti [Mon, 28 Aug 2017 08:02:19 +0000 (08:02 +0000)]
Merge "switch to native_handle_create() for passing ownership"
Hugo Benichi [Tue, 27 Jun 2017 06:13:20 +0000 (15:13 +0900)]
Nat464Xlat: clat management cleanup
This patch does some minor refactoring of clat starting/stopping code:
- remove unused LinkProperties arguments in updateClat
- remove unused Context argument in Nat464Xlat ctor
- introduce ensureClatIsStarted and ensureClatIsStopped methods and
simplify updateClat
- add clatd to NetworkAgentInfo toString() method
- clarify some comments
This changes prepare for moving BaseNetworkObserver callbacks to
ConnectivityService.
Bug:
62997041
Bug:
64571917
Test: runtest frameworks-net
manually connected to IPv6 only network and went to test-ipv6.com
Change-Id: Idb204784614cfe700f73255a7a7b78c5e9ee6eca
Treehugger Robot [Sat, 26 Aug 2017 00:24:23 +0000 (00:24 +0000)]
Merge "DeviceInfoUtils.java: support to show kernel version compiled with clang"
Brad Ebinger [Fri, 25 Aug 2017 20:05:53 +0000 (20:05 +0000)]
Merge "Emergency redial implementation"
Shuo Qian [Fri, 25 Aug 2017 18:01:18 +0000 (18:01 +0000)]
Merge "Add new error code in SmsManager"
Srikanth Chintala [Thu, 4 May 2017 15:28:34 +0000 (20:58 +0530)]
Emergency redial implementation
Define connection event to notify
Telecom/InCallUi about change in
account handle after redial and extra
for emergency phone handle.
Bug:
27059146
Change-Id: Ie72ab2901ec05d972204ed11f115a05b79173c1d
Mark Salyzyn [Fri, 25 Aug 2017 14:16:12 +0000 (14:16 +0000)]
Merge "Switch /data/misc/reboot/last_reboot_reason to persistent property"
Erik Kline [Thu, 24 Aug 2017 05:21:57 +0000 (22:21 -0700)]
switch to native_handle_create() for passing ownership
Test: builds
Bug:
29337859
Bug:
32163131
Bug:
64976634
Change-Id: Ifd064736c9fcb633b72e56e93b7baa5f4a5ff051
Tyler Gunn [Thu, 24 Aug 2017 22:24:16 +0000 (22:24 +0000)]
Merge "Track conference start in system elapsed time."
sqian [Wed, 9 Aug 2017 22:28:41 +0000 (15:28 -0700)]
Add new error code in SmsManager
Design doc: https://docs.google.com/a/google.com/document/d
/1YPTNoM2Atjz8oISGAsRYlFVSA1NcYP8MbqYQIzLcJ9E/edit?usp=sharing
Test: compile/flash code; test locally
Bug:
34773406
Change-Id: I0b227e76048dd46d9c8023d37647db763e1e38e1
Merged-In: I0b227e76048dd46d9c8023d37647db763e1e38e1
Treehugger Robot [Thu, 24 Aug 2017 21:33:55 +0000 (21:33 +0000)]
Merge "Add new telephony disconnect causes for low battery scenario."
Treehugger Robot [Thu, 24 Aug 2017 21:25:49 +0000 (21:25 +0000)]
Merge changes from topic "bt-fix-checkstyle-errors"
* changes:
Fix checkstyle errors (2/2)
Fix checkstyle errors (1/2)
Tyler Gunn [Tue, 22 Aug 2017 18:13:05 +0000 (11:13 -0700)]
Add new telephony disconnect causes for low battery scenario.
LOW_BATTERY is for disconnect mid-call due to low battery.
DIAL_LOW_BATTERY is for failure while dialing due to low battery.
Test: Manual.
Merged-In: Ife7a4ca5645b3fb42ab20effb4d8d4a8fef8116b
Change-Id: Ife7a4ca5645b3fb42ab20effb4d8d4a8fef8116b
Fixes:
63936576
Jack He [Wed, 23 Aug 2017 04:21:23 +0000 (21:21 -0700)]
Fix checkstyle errors (2/2)
* Manual style corrections with IDE assistance
* Variable name refactors are done through IDE
* Corrected general style errors such as:
- "final private var" -> "private final var"
- "&&", "+", "||" should not be at the end of line
- Non-static private variable should be like "mVar"
- Private static variable should be like "sVar"
- Code file should always end with newline
- Inherited methods should be annotated with @Override
and no @hide tags
- Public methods should always have a JavaDoc entry
- "int[] array" is preferred over "int array[]"
- private methods should be accessed without "this."
when there is no name collisions.
- "boolean ? true : false" -> boolean
- "boolean ? false : true" -> !boolean
- "boolean == true" OR "boolean != false" -> boolean
- "boolean != true" OR "boolean == false" -> !boolean
Bug:
63596319
Test: make checkbuild, no functional changes
Change-Id: Iabdc2be912a32dd63a53213d175cf1bfef268ccd
Jack He [Tue, 22 Aug 2017 23:06:54 +0000 (16:06 -0700)]
Fix checkstyle errors (1/2)
* Automatic style corrections through IDE
Bug:
63596319
Test: make checkbuild, no manual changes, no functional changes
Change-Id: I2397d55abc34c9b7a9b748bec6137778df3421a7
Yongqin Liu [Thu, 8 Jun 2017 08:15:29 +0000 (16:15 +0800)]
DeviceInfoUtils.java: support to show kernel version compiled with clang
The kernel version displayed in settings is only shown correctly
when built with gcc, this change adds support for a kernel built
with clang.
Test: manually on hikey with following command:
adb shell am instrument -w -e class com.android.settings.DeviceInfoSettingsTest com.android.settings.tests.unit/android.support.test.runner.AndroidJUnitRunner
Change-Id: I9b7991681cb5abdf44e7d1d1bff84c7c866be2ed
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Treehugger Robot [Thu, 24 Aug 2017 05:18:23 +0000 (05:18 +0000)]
Merge changes from topic "offload_cherrypick"
* changes:
Send add/removeDownstream info to offload HAL
Don't completely stop offload if setting data limit fails.
Erik Kline [Thu, 6 Jul 2017 10:49:35 +0000 (19:49 +0900)]
Send add/removeDownstream info to offload HAL
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passed
Bug:
29337859
Bug:
32163131
Merged-In: I0cb81ac054fc2bf6c8b8bfe658e9404a15091d7a
Merged-In: I7abcdcc2d7d967179c47081a6db2b417164891f3
Change-Id: I6c59aa7cb80b54f376f294b24c1409710c553d74
(cherry picked from commit
ed962a84122ab950a103fbbc0bf911f61b6b9500)
Lorenzo Colitti [Mon, 21 Aug 2017 03:34:50 +0000 (12:34 +0900)]
Don't completely stop offload if setting data limit fails.
Currently, if setting a data limit fails, we completely stop
offload in order to avoid data overages. However, the next thing
we do is try to fetch the stats and crash, because once offload
is stopped all our local state is cleared.
Fix this by fetching stats before we stop offload.
Bug:
29337859
Bug:
32163131
Bug:
64867836
Test: OffloadControllerTest passes
Test: no crash when disabling wifi tethering with BT tethering active
Merged-In: I7fc47e60b2da5f39c26fb22c1325618f9948dd38
Merged-In: I464dd2a6d1996b1cfb8bbf82b6ee453fd0747569
Change-Id: I260f5450f8b67f055983af68fb23a5f3cfc0bc69
(cherry picked from commit
d743601a002ac12c02da58e92ebd0544ab0b77ea)
Hugo Benichi [Thu, 24 Aug 2017 03:36:20 +0000 (03:36 +0000)]
Merge "Make NetworkManagementServiceTest pass again."
Hugo Benichi [Thu, 24 Aug 2017 02:37:03 +0000 (02:37 +0000)]
Merge "Tethering offload stats updates are eventually consistent"
Hall Liu [Wed, 23 Aug 2017 20:18:15 +0000 (20:18 +0000)]
Merge "Embms adjustments for 7/28"
Hall Liu [Thu, 27 Jul 2017 22:33:31 +0000 (15:33 -0700)]
Embms adjustments for 7/28
* Move some vendor intents and extras into a VendorIntents class
* Add a download result RESULT_IO_ERROR
* Add documentation noting that repeated calls to
setTempFileRootDirectory will not throw an error if the parameter is the
same.
* Add getTempFileRootDirectory method for app
* Hide AIDL classes from the public/system API surfaces for download
* Remove size and md5hash from FileInfo
Change-Id: I8c968a7d68db2588ee550167ed2693fe89c5925a
Hall Liu [Wed, 23 Aug 2017 16:37:50 +0000 (16:37 +0000)]
Merge "Embms API adjustments for 7/21"
Hugo Benichi [Tue, 22 Aug 2017 04:57:41 +0000 (13:57 +0900)]
Tethering offload stats updates are eventually consistent
This patch removes the call to runWithScissors() in
OffloadController#getTetherStats() that was causing a deadlock when
NetworkStatsService would be polled for stats in certain threading
contexts.
Instead of trying to query the tethering offload HAL synchronously all
the time, this patch:
- changes getTetherStats() to only call into the offload HAL when it
detects that it is called on the same thread as the Tethering handler
thread.
- changes the map of interface to accumulated tethering forwarded stats
to be concurrent.
This makes stats reading from getTetherStats() eventually consistent.
From the point of view of getTetherStats(), it preserves the guarantees
that tethering stats are monotonically increasing, and also guarantees
no tearing between rx bytes and tx bytes.
Bug:
29337859
Bug:
32163131
Bug:
64771555
Test: runtest frameworks-net
Merged-In: Ibcd351ad0225ef146b00a807833f76d2a886f6c1
Merged-In: I61786d61fe1422e429c0dd9eadaff6f02eb850e7
Merged-In: I999d1d1bf72e7ab02c5d17f37aad00bc711d3fc5
(cherry pick from commit
eb5e465edd78bea26289f779b635c7e94d934854)
Change-Id: I28646b962cee8c8a6efd66059f84873c02ac5810
Lorenzo Colitti [Mon, 10 Jul 2017 17:29:28 +0000 (02:29 +0900)]
Make NetworkManagementServiceTest pass again.
1. Mock the service manager so that NMS can fetch mock versions
of INetd and IBatteryStats.
2. Call LocalServices.removeServiceForTest to avoid a duplicate
service registration error. // check this
3. Change the timeout from 100ms to 200ms, as otherwise the tests
that check for IfaceClass fail.
4. Convert NetworkManagementServiceTest to JUnit 4.
5. Move NetworkManagementServiceTest to tests/net
Bug:
29337859
Bug:
32163131
Bug:
32561414
Bug:
62918393
Test: runtest frameworks-net
Change-Id: Ic7371b427b35809ccd446addf35c9d8ae99ccfd3
Hall Liu [Thu, 20 Jul 2017 22:32:51 +0000 (15:32 -0700)]
Embms API adjustments for 7/21
* Enforce that only one instance of each manager can be active.
* Add a death receipient for both managers to notify the app of binder
death
* Add documentation informing the app that it may not call create()
multiple times
* Fix a collision in streaming state reason codes
* Add documentation in DownloadRequest to indicate which methods should
be called by the middleware.
Change-Id: Ie15283b5c34fee736e8023dbd4f889c2ca95299e
Treehugger Robot [Tue, 22 Aug 2017 22:19:28 +0000 (22:19 +0000)]
Merge "Enable Checkstyle for "repo upload" for more projects."
Aurimas Liutikas [Fri, 28 Apr 2017 21:30:26 +0000 (14:30 -0700)]
Enable Checkstyle for "repo upload" for more projects.
This CL enables Checkstyle for the following directories:
- core/java/android/
- core/tests/coretests/src/android/
Bug:
34746646
Test: None
Change-Id: Ib8b3f198000be19e9a7a61aa5abd61d827454eba
(cherry picked from commit
e5abb866a56582ffc705c261a2cab20c2331e6a3)
Tyler Gunn [Fri, 4 Aug 2017 16:27:26 +0000 (09:27 -0700)]
Track conference start in system elapsed time.
This is important so that Telecom can track the duration of the call,
which is tracked using wall clock time.
Test: Manual, unit test
Bug:
64068300
Change-Id: If642d282cd8134060acf6ffe8d81215c394d800c
Mark Salyzyn [Tue, 15 Aug 2017 14:53:47 +0000 (07:53 -0700)]
Switch /data/misc/reboot/last_reboot_reason to persistent property
Switch from /data/misc/reboot/last_reboot_reason to persistent
Android property persist.sys.boot.reason for indicating why the
device is rebooted or shutdown.
persist.sys.boot.reason has a standard as outlined in b/
63736262 and
the associated investigation. Made adjustments to the values so that
we did not create a problem even before we started. Compliance is
part of the tests in boot_reason_test.sh.
Test: system/core/bootstat/boot_reason_test.sh
Bug:
64687998
Change-Id: Iba69acf2105f4446411d86cdb8097a1755a20f15
Treehugger Robot [Tue, 22 Aug 2017 19:52:22 +0000 (19:52 +0000)]
Merge "Make dun APNs as read-only by default."
Amit Mahajan [Wed, 17 May 2017 22:36:30 +0000 (15:36 -0700)]
Make dun APNs as read-only by default.
Test: Verified tethering manually for T-Mo and AT&T
Bug:
38186417
Change-Id: Iae2beede0e20810cba4d96f897756896adf77b30
Treehugger Robot [Tue, 22 Aug 2017 18:03:10 +0000 (18:03 +0000)]
Merge "Remove TTS symbols from NDK stub library."
Hall Liu [Tue, 22 Aug 2017 17:55:06 +0000 (17:55 +0000)]
Merge "Fix lint errors in the streaming API"
Tobias Thierer [Tue, 22 Aug 2017 15:00:24 +0000 (15:00 +0000)]
Merge "Network: Use HttpURLConnectionFactory rather than OkHttp APIs"
am:
be87c9ca58
Change-Id: I79db2f0dc0870f71ec21397545e2e6abb5c7142b
Tobias Thierer [Tue, 22 Aug 2017 14:07:16 +0000 (14:07 +0000)]
Merge "Network: Use HttpURLConnectionFactory rather than OkHttp APIs"
Dan Albert [Tue, 22 Aug 2017 07:15:25 +0000 (00:15 -0700)]
Remove TTS symbols from NDK stub library.
These haven't actually existed in libandroid for some time. We can't
fix the past, so just remove the API from the NDK.
Test: make checkbuild
Bug: http://b/
64572149
Change-Id: Ic68e81c63e738e6d341bcae6178cdcc080326da4
Lorenzo Colitti [Tue, 22 Aug 2017 06:42:19 +0000 (06:42 +0000)]
Merge "Fix transitioning between non-accept strict policies."
am:
bef2c91bb5
Change-Id: Iacf9f43f88ac77cb2a6094348cf52107f7ef0817
Treehugger Robot [Tue, 22 Aug 2017 06:28:30 +0000 (06:28 +0000)]
Merge "Fix transitioning between non-accept strict policies."
Hugo Benichi [Mon, 21 Aug 2017 12:08:28 +0000 (12:08 +0000)]
Merge "IpManager: use InitialConfiguration for provisioning"
am:
5b218bdc8e
Change-Id: I131589680b68222e4fda4e9165ac2f50894ee28e
Hugo Benichi [Mon, 21 Aug 2017 11:53:24 +0000 (11:53 +0000)]
Merge "IpManager: use InitialConfiguration for provisioning"
Hugo Benichi [Tue, 8 Aug 2017 04:08:06 +0000 (13:08 +0900)]
IpManager: use InitialConfiguration for provisioning
This patch changes IpManager to take into account static provisioning
information specified in the InitialConfiguration for IPv6 static
configuration.
When a valid InitialConfiguration with IPv6 content is specified,
IpManager will do the following things:
- at start(), it will push the IPv6 addresses in the config to netd
- it will observe all addresses be notified via Netlink
- when all addresses are there, it will patch in the associated IPv6
routes in the config, so that they get passed to ConnectivityService
through the usual mechanism
The logic triggering onProvisioningSuccess is also changed to take into
account InitialConfiguration: when all addresses and all routes in the
config are seen the provisioning is successful.
Bug:
62988545
Test: runtest frameworks-net, with newly added tests
Change-Id: I77ed7c576c4b198de7a4726be70c78b74689e98b
Lorenzo Colitti [Sun, 20 Aug 2017 02:54:57 +0000 (11:54 +0900)]
Fix transitioning between non-accept strict policies.
https://android-review.googlesource.com/438278/ attempted
to fix changing between two non-accept StrictMode policies (which
is not supported by netd) by ensuring that if neither the old nor
the new policy were accept, we'd first set an accept policy.
Unfortunately, while this is what the comment says, what the
code actually does is send the new policy twice. Fix the code to
match the comment and the intent of the CL.
While I'm at it, also move applyUidCleartextNetworkPolicy into
the synchronized block, so multiple concurrent calls to
setUidCleartextNetworkPolicy don't result in NMS state going out
of sync with netd state.
Bug:
28362720
Test: builds
Change-Id: I8d876ba0786c4d6325d26a84378fc6afcf47ab84
Lorenzo Colitti [Sat, 19 Aug 2017 03:15:08 +0000 (03:15 +0000)]
Merge changes I325b13d5,I89719fe7
am:
23868e9c09
Change-Id: Iaced543ab17ea87c8f701975764d957bc1b17fc7
Treehugger Robot [Sat, 19 Aug 2017 03:05:14 +0000 (03:05 +0000)]
Merge changes I325b13d5,I89719fe7
* changes:
Add tether offload traffic to interface stats as well.
Tell the system when tethering offload hits a limit.
Lorenzo Colitti [Thu, 17 Aug 2017 10:23:08 +0000 (19:23 +0900)]
Add tether offload traffic to interface stats as well.
Currently, we only count add tethering traffic to per-UID
stats, but not to total data usage (i.e., dev and XT stats). This
is correct for software tethering, because all software forwarded
packets are already included in interface counters, but it is
incorrect for hardware offload, because such packets do not
increment interface counters.
To fix this:
1. Add an argument to ITetheringStatsProvider#getTetherStats to
indicate whether per-UID stats are requested. For clarity,
define integer constants STATS_PER_IFACE and STATS_PER_UID
to represent these operations.
2. Make NetdTetheringStatsProvider return stats only if per-UID
stats are requested. (Otherwise tethering traffic would be
double-counted).
3. Make OffloadController's stats provider return the same
stats regardless of whether per-UID stats were requested or
not.
4. Make NetworkStatsService add non-per-UID tethering stats to
the dev and XT snapshots. The per-UID snapshots were already
correctly adding in per-UID stats.
(cherry picked from commit
5356a35c3bcfcdf2d184c620af6bfbf9bddf35c5)
Bug:
29337859
Bug:
32163131
Test: runtest frameworks-net
Test: runtest frameworks-telephony
Change-Id: I325b13d50e88841dfb0db4c35e7e27f163ee72fe
Merged-In: I4e8e923d68dce1a4a68608dbd6c75a91165aa4ee
Hall Liu [Fri, 4 Aug 2017 01:26:39 +0000 (18:26 -0700)]
Fix lint errors in the streaming API
Fix the errors that cropped up when trying to upload the unhide CL in
MR1.
Bug:
30981736
Test: manual, with testapps
Change-Id: If4a9a5533a235a8cc56762ab7a9e32ec89440f1d
Lorenzo Colitti [Tue, 15 Aug 2017 10:25:51 +0000 (19:25 +0900)]
Tell the system when tethering offload hits a limit.
Add a new tetherLimitReached method to INetworkManagementService,
and call it when the HAL notifies OffloadController because the
limit has been reached.
Bug:
29337859
Bug:
32163131
Test: builds
Test: OffloadControllerTest passes
(cherry picked from commit
d66cf56ba662f10f2da1d0f844116632ad0a0dbb)
Change-Id: I89719fe7ec8bfd3c85d6cdca9c0d449aea86ef9d
Merged-In: I026e6aa9e7b371f316c0d97c3cf5e78abc1f5263
Hugo Benichi [Fri, 18 Aug 2017 11:59:02 +0000 (11:59 +0000)]
Merge "Really allow NetworkAgent immutable updates to NetworkCapabilities"
am:
cb3c24e36b
Change-Id: Ifbdd005576b3f0fbf278ecec81ce3e4308c6276d
Hugo Benichi [Fri, 18 Aug 2017 11:45:39 +0000 (11:45 +0000)]
Merge "Really allow NetworkAgent immutable updates to NetworkCapabilities"
Jack Yu [Fri, 18 Aug 2017 06:20:41 +0000 (23:20 -0700)]
resolve merge conflicts of
d5cb58c693de to stage-aosp-master
Test: I solemnly swear I did not test this conflict resolution.
Merged-In: Ifc35306711dde39eb521dc015da931f4d5f2bf06
Change-Id: I9494087c5a90bccc4326c173bf6395996da357af
Treehugger Robot [Fri, 18 Aug 2017 05:52:16 +0000 (05:52 +0000)]
Merge "Reduced the retry after disconnect delay"
Hugo Benichi [Fri, 18 Aug 2017 05:41:22 +0000 (14:41 +0900)]
Really allow NetworkAgent immutable updates to NetworkCapabilities
This patch completes commit
bae105a5ccd11430bab14721d1325e2303a673da to
really allow updates of immutable capabilities to NetworkCapabilities of
NetworkAgents by using satisfiedByImmutableNetworkCapabilities instead
satisfiedByNetworkCapabilities.
Bug:
64125969
Test: runtest frameworks-net
Change-Id: I9beeb623792f0ee31abcd4ba9d0ba2451304fb2e
Jack Yu [Wed, 16 Aug 2017 21:26:56 +0000 (14:26 -0700)]
Reduced the retry after disconnect delay
Reduced the delay from 20 seconds to 10 seconds. And created
a separate delay configuration for it.
Test: Manual
bug:
63633916
Merged-In: Ifc35306711dde39eb521dc015da931f4d5f2bf06
Change-Id: Ifc35306711dde39eb521dc015da931f4d5f2bf06
(cherry picked from commit
5523dc55d808998af4402431265e085e62bf6dd1)
Bill Yi [Fri, 18 Aug 2017 00:49:23 +0000 (17:49 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug:
64086495
Change-Id: I1d90eea9e876253b9ca99b4507e9e34b5ea9819e
Jakub Pawlowski [Thu, 17 Aug 2017 23:06:14 +0000 (23:06 +0000)]
Merge "Bluetooth: Don't throw exception when stopAdvertisingSet fails"
am:
b7cbb2fe49
Change-Id: I5ccf67621134fe1ba9204e2a8f3502ffacef0315
Treehugger Robot [Thu, 17 Aug 2017 22:51:23 +0000 (22:51 +0000)]
Merge "Bluetooth: Don't throw exception when stopAdvertisingSet fails"
Jakub Pawlowski [Thu, 17 Aug 2017 22:47:38 +0000 (22:47 +0000)]
Merge "Bluetooth: Fix startAdvertisingSet error handling"
am:
ed12213b59
Change-Id: I093e849e910428c521e73072121dfdfdceb28e0d
Treehugger Robot [Thu, 17 Aug 2017 22:33:27 +0000 (22:33 +0000)]
Merge "Bluetooth: Fix startAdvertisingSet error handling"
Jakub Pawlowski [Thu, 17 Aug 2017 13:15:43 +0000 (06:15 -0700)]
Bluetooth: Don't throw exception when stopAdvertisingSet fails
When advertising is stopped while Bluetooth is disabled, we should not
throw any exceptions, just log the failure.
This was the default behaviour before the AdvertisingSet was introduced.
Bug:
63819108
Test: manual
Change-Id: I518e071b77b127973aee6f24fa6ced4f28bc9531
Jakub Pawlowski [Thu, 17 Aug 2017 14:19:12 +0000 (07:19 -0700)]
Bluetooth: Fix startAdvertisingSet error handling
Calls to old advertising API (startAdvertising), should never throw
exceptions. Instead, it used to post failure callback. This behaviour
was accidentally modified when implementing new API. Right now, instead
of posting error callback, we throw IllegalArgumentException if we fail
to obtain BluetoothGatt object, or the call to startAdvertisingSet
fails.
This patch brings back the old behaviour to the API. It also makes new
API post callback instead of throwing exception in this error case.
Bug:
63819108
Test: manual
Change-Id: I897b99839f899ca3f3dc609918d665c8c327b777
Hall Liu [Thu, 17 Aug 2017 01:30:56 +0000 (01:30 +0000)]
Merge "Revert "Fix lint errors in the streaming API""
am:
42d3eadb37
Change-Id: I4229c1eb42edba2c2c7df08f87bfded5402c01c7
Hall Liu [Thu, 17 Aug 2017 01:22:19 +0000 (01:22 +0000)]
Merge "Revert "Fix lint errors in the streaming API""
Hall Liu [Thu, 17 Aug 2017 00:46:24 +0000 (00:46 +0000)]
Revert "Fix lint errors in the streaming API"
This reverts commit
e1f10cbd7ff6128171b6ab37b3afbfdc3d9f9f33.
Change-Id: Id3666b27b0d07b0a1d4f3179f2073aa75440f2ee
Andreas Huber [Wed, 16 Aug 2017 23:40:07 +0000 (23:40 +0000)]
Merge "Remove unused global references in JNI code supporting HwBinder."
am:
2c4dfa0412
Change-Id: I20348e98597bf8de57b19ef25aec6fb0912da25f
Andreas Huber [Wed, 16 Aug 2017 23:17:49 +0000 (23:17 +0000)]
Merge "Remove unused global references in JNI code supporting HwBinder."
Hall Liu [Wed, 16 Aug 2017 23:16:30 +0000 (23:16 +0000)]
Merge "Fix lint errors in the streaming API"
am:
b0f5d57489
Change-Id: Ic12810c6a3c795419ff7440218ffa23bad7d8401
Hall Liu [Wed, 16 Aug 2017 22:51:13 +0000 (22:51 +0000)]
Merge "Fix lint errors in the streaming API"
Luis Hector Chavez [Wed, 16 Aug 2017 21:32:13 +0000 (21:32 +0000)]
Merge "Improve container capability bounding in containers"
am:
586fd52b34
Change-Id: I7c67b571164e67b3e4a8ae9c9a2701e338693a4b
Treehugger Robot [Wed, 16 Aug 2017 21:16:50 +0000 (21:16 +0000)]
Merge "Improve container capability bounding in containers"
Hall Liu [Fri, 4 Aug 2017 01:26:39 +0000 (18:26 -0700)]
Fix lint errors in the streaming API
Fix the errors that cropped up when trying to upload the unhide CL in
MR1.
Bug:
30981736
Test: manual, with testapps
Change-Id: I94e1bcccea4b9f50dae4c93f247ab78058d15bb5
Di Lu [Wed, 16 Aug 2017 16:33:18 +0000 (16:33 +0000)]
Merge "Add user quota information into the IpSecService dump"
am:
fedd856546
Change-Id: I1f64ab03918ece154fe31a07b698825315d39c0f
Andreas Huber [Wed, 16 Aug 2017 16:02:02 +0000 (09:02 -0700)]
Remove unused global references in JNI code supporting HwBinder.
Bug:
63814586
Change-Id: Ia149cc055d6e105df8e109ae1b959a9fbf669b8a
Test: hidl_test_java
Di Lu [Wed, 16 Aug 2017 16:20:18 +0000 (16:20 +0000)]
Merge "Add user quota information into the IpSecService dump"
Luis Hector Chavez [Wed, 12 Jul 2017 17:03:30 +0000 (10:03 -0700)]
Improve container capability bounding in containers
This change stops relying on the ro.boot.container property for dropping
a subset of capabilities and instead relies on the effective capability
mask of the Zygote process, prior to forking.
When Android is running in a pid/mount/net/user namespace, even if a
particular capability is present, some operations that require that
capability check whether it is allowed in the init namespace (instead of
in the current namespace), so they would fail even with the capability
granted within the namespace. So, explicitly dropping the capabilities
from the beginning allows for clearer signalling of which operations can
be expected to work instead of failing silently for mysterious reasons.
Bug:
63579953
Test: aosp_bullhead-eng still boots
Test: Running Zygote without CAP_SYS_MODULE makes it such that
system_server does not request it.
Change-Id: I1d18d13341bcc04e701fd14092e7e94961728620
Hugo Benichi [Wed, 16 Aug 2017 14:49:27 +0000 (14:49 +0000)]
Merge "Add convenience methods to IpPrefix and LinkAddress"
am:
2ad60c88f1
Change-Id: I6d3f3c50eaec44e3a0787e849ab28e89f6f4a72d
Treehugger Robot [Wed, 16 Aug 2017 14:38:29 +0000 (14:38 +0000)]
Merge "Add convenience methods to IpPrefix and LinkAddress"
Hugo Benichi [Tue, 8 Aug 2017 04:06:04 +0000 (13:06 +0900)]
Add convenience methods to IpPrefix and LinkAddress
Also moving relevant test files into tests/net as part of runtest
framworks-net.
Also removes testHashCode in LinkAddress() because this test relies on
the assumption that hashCode() is stable across releases or jdk
versions, which is absolutely not true.
This creates maintenance work for little benefit since hashCode is
already tested as part of the equality test.
For instance this test is now broken because hashing for InetAddress
changed.
Bug:
62988545
Bug:
62918393
Test: runtest frameworks-net, added coverage in tests
Change-Id: I695bc3f0e801bf13bc4fc0706565758f12b775b4
Hugo Benichi [Wed, 16 Aug 2017 11:57:50 +0000 (11:57 +0000)]
Merge "More OWNERS file for core networking team"
am:
2827f21740
Change-Id: Icae3bc4dbb2cd094c728d98aea02d4009aaa0e0b
Hugo Benichi [Wed, 16 Aug 2017 11:50:55 +0000 (11:50 +0000)]
Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities"
am:
b35719a057
Change-Id: I0ab76de59e87c46a6961229399ff7200bce49838
Treehugger Robot [Wed, 16 Aug 2017 11:37:11 +0000 (11:37 +0000)]
Merge "More OWNERS file for core networking team"
Treehugger Robot [Wed, 16 Aug 2017 11:34:24 +0000 (11:34 +0000)]
Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities"
Hugo Benichi [Wed, 16 Aug 2017 06:43:14 +0000 (15:43 +0900)]
More OWNERS file for core networking team
Test: build
Change-Id: I7cef188e29f487025aee04ab0c1a003bb32a7048
Hugo Benichi [Wed, 16 Aug 2017 04:19:04 +0000 (13:19 +0900)]
Allow NetworkAgent "immutable updates" to NetworkCapabilities
This patch loosens the validation checks when a NetworkAgent updates it
NetworkCapabilities: instead of checking that capabilities labeled as
"immutable" stay identical across updates, it is now accepted to change
immutable capabilities in a way that the new NetworkCapabilities
satisfies the old NetworkCapabilities.
This allows a NetworkAgent to update itself in order to match more
requests, but will still catch NetworkAgents that sends degradation
updates causing potentially requests to not match anymore.
Bug:
64125969
Test: runtest frameworks-net
Change-Id: I2a1b3f9c0be6415e40edc989d0c1b03b5631f7b1
Brad Ebinger [Tue, 15 Aug 2017 18:04:18 +0000 (18:04 +0000)]
Merge "Adds a new string definition for IMS Access blocked reason"
am:
53e82a9cd0
Change-Id: I3bafca03e20ef114588145982985411882d2c8f5
Brad Ebinger [Tue, 15 Aug 2017 17:41:27 +0000 (17:41 +0000)]
Merge "Adds a new string definition for IMS Access blocked reason"
Lorenzo Colitti [Tue, 15 Aug 2017 02:07:36 +0000 (02:07 +0000)]
Merge changes I82d3bee0,I9c9413d7
am:
deb4eb5d05
Change-Id: Iaa6aecf3ec3a91dc04f4533c0ea5b649bdfeb83d
Lorenzo Colitti [Tue, 15 Aug 2017 01:57:28 +0000 (01:57 +0000)]
Merge changes I82d3bee0,I9c9413d7
* changes:
Pass data usage limits to tethering offload code.
Don't time out when fetching tether offload stats.
nharold [Tue, 15 Aug 2017 01:29:00 +0000 (01:29 +0000)]
Merge "Cleanup ServiceState.toString()"
am:
ee6e43c033
Change-Id: Ida4fc7c5cce8c763a5b8baf544d8244934e7c193
nharold [Tue, 15 Aug 2017 01:12:28 +0000 (01:12 +0000)]
Merge "Cleanup ServiceState.toString()"
Tyler Gunn [Tue, 15 Aug 2017 00:14:36 +0000 (00:14 +0000)]
Merge "Add ConnectionService callback invoked when connection creation complete."
am:
58b77aa4aa
Change-Id: I62e0700b9a94d3b17b2d32d16adb488519f6ff66
huiwan [Mon, 14 Aug 2017 23:59:13 +0000 (23:59 +0000)]
Merge "PrintSpooler: fix monkey crash if height&width small than 0"
am:
4a41744919
Change-Id: I3b704d0f3e27bb26e00c60cd22145767d6c08335
Tyler Gunn [Mon, 14 Aug 2017 23:54:12 +0000 (23:54 +0000)]
Merge "Add config option to enable/disable pause workaround."
am:
9282d725f0 -s ours
Change-Id: I6e54ff11618e8a49cb20391f10f8f79adc61463d
ludi [Thu, 10 Aug 2017 22:44:40 +0000 (15:44 -0700)]
Add user quota information into the IpSecService dump
Bug:
64093788
Test: runtest frameworks-net
Change-Id: I6c5fc9e2db4ba57e0db4f6380a1251c4e444951b
Tyler Gunn [Mon, 14 Aug 2017 21:24:18 +0000 (21:24 +0000)]
Merge "Add ConnectionService callback invoked when connection creation complete."