OSDN Git Service
Nicolas Geoffray [Tue, 19 Sep 2017 11:56:05 +0000 (11:56 +0000)]
Merge "Special handling of priv-apps in Zygote."
am:
46af70cad9
Change-Id: I1dbf2313c9ee1c014854630eac5f1429548ae7f6
Nicolas Geoffray [Tue, 19 Sep 2017 11:47:58 +0000 (11:47 +0000)]
Merge "Special handling of priv-apps in Zygote."
Charles He [Tue, 19 Sep 2017 08:09:45 +0000 (08:09 +0000)]
Merge changes from topic "vpn-dialog"
am:
19bb1a0b99
Change-Id: I168072aa2bfdb9ed7630cf50547cb9732fb29280
Charles He [Tue, 19 Sep 2017 08:01:45 +0000 (08:01 +0000)]
Merge changes from topic "always-on-vpn"
am:
cc15c7f8c1
Change-Id: I7391ce7ecab4f8e73912f420d49150ed7210ea6c
Charles He [Tue, 19 Sep 2017 07:56:44 +0000 (07:56 +0000)]
Merge changes from topic "vpn-dialog"
* changes:
Unbreak VPN unit tests.
Add alert dialog when always-on VPN disconnects.
Charles He [Wed, 16 Aug 2017 12:14:13 +0000 (13:14 +0100)]
Unbreak VPN unit tests.
VpnTest was broken earlier due to a change to always-on VPN
notifications. This CL adds the corresponding mocks to the unit test to
fix it.
Bug:
36650087
Bug:
65439160
Test: runtest frameworks-net
Change-Id: Icff57c7e927c135d75a7d70ff347a579c5d45134
Merged-In: Icff57c7e927c135d75a7d70ff347a579c5d45134
(cherry picked from commit
3da6a1fc82b7e0c7adc88b92e50cceec8173672e)
Charles He [Tue, 19 Sep 2017 07:50:13 +0000 (07:50 +0000)]
Merge changes from topic "always-on-vpn"
* changes:
Opt-out for always-on VPN: rename API.
Opt-out for always-on VPN
Hugo Benichi [Tue, 19 Sep 2017 07:21:12 +0000 (07:21 +0000)]
Merge "Wakeup packet events: addressing a few comments"
am:
67d16ec1ab
Change-Id: I67b2e54d45a39005e2091a46e8b90d8cc75fe079
Hugo Benichi [Tue, 19 Sep 2017 07:12:03 +0000 (07:12 +0000)]
Merge "Wakeup packet events: addressing a few comments"
Rubin Xu [Tue, 19 Sep 2017 06:37:40 +0000 (06:37 +0000)]
Merge "Fix LinkPropertiesTest.testCompareResult"
am:
430d8472b2
Change-Id: If87f8c43371ee1f5e2e893232c9e340a1a7339f4
Treehugger Robot [Tue, 19 Sep 2017 06:28:21 +0000 (06:28 +0000)]
Merge "Fix LinkPropertiesTest.testCompareResult"
Hugo Benichi [Tue, 19 Sep 2017 04:15:26 +0000 (13:15 +0900)]
Wakeup packet events: addressing a few comments
This patch addresses a few post-submit comment for
commits
f562ac34a51dc and
60c9f63b66921.
Bug:
34901696
Bug:
62179647
Test: runtest frameworks-net
Change-Id: I4abec57e0c6bc869dc57b5eb54582dd977b64c30
Steven Moreland [Tue, 19 Sep 2017 03:22:42 +0000 (03:22 +0000)]
Merge "Remove unused variable from screencap."
am:
376234fc74
Change-Id: I5afb38c24ab6924925ab2852c5fe0ef29a91a2ff
Treehugger Robot [Tue, 19 Sep 2017 03:12:18 +0000 (03:12 +0000)]
Merge "Remove unused variable from screencap."
Pengquan Meng [Tue, 19 Sep 2017 01:23:53 +0000 (01:23 +0000)]
Merge "Incorrect decoding when TP-OA contains non-integer information"
am:
2bcc7fac89
Change-Id: I4bddee5b8cf19715db56e7286a05f76be530928d
Pengquan Meng [Tue, 19 Sep 2017 01:14:34 +0000 (01:14 +0000)]
Merge "Incorrect decoding when TP-OA contains non-integer information"
Erika Avenberg [Sat, 30 Aug 2014 10:00:47 +0000 (12:00 +0200)]
Incorrect decoding when TP-OA contains non-integer information
When receiving a GSM SMS message where the TP-Originating-Address
(TP-OA) field contains non-integer information, it is currently
decoded incorrectly.
This CL adds support for decoding BCD according to spec:
ETSI TS 123 040 V9.3.0
Section: 9.1.2.3 Semi-octet representation
"If a mobile receives an address field containing non-integer
information in the semi-octets other than "1111" (e.g. 1110)
it shall display the semi-octet as the representation given
in GSM 44.008 [12] under "called BCD number", viz 1010="*",
1011="#", 1100="a", 1101="b", 1110="c"."
Bug:
65042708
Test: runtest --path frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/GsmSmsTest.java --test-method testAddressing
Change-Id: Ied2d6ca4d84d5c3ca6cc5c4d9875d2ff2a8e5df9
Ruina Liu [Mon, 18 Sep 2017 17:53:31 +0000 (17:53 +0000)]
Merge "Fix extracting 32-bit uuid error via calling method uuidToBytes"
am:
ac421b8f44
Change-Id: I9c6b453e0ef71a70cd972a47763d042943fe3f36
Treehugger Robot [Mon, 18 Sep 2017 17:37:26 +0000 (17:37 +0000)]
Merge "Fix extracting 32-bit uuid error via calling method uuidToBytes"
Ruina Liu [Sat, 22 Jul 2017 10:41:48 +0000 (18:41 +0800)]
Fix extracting 32-bit uuid error via calling method uuidToBytes
A new defined method of uuidToBytes is used to convert
Bluetooth uuid to bytes in the case of BLE advertising.
But the most significant 16 bits of a 32-bit uuid
will be cleared after the and operations with
0X0000FFFF00000000L in the function of
getServiceIdentifierFromParcelUuid.
0XFFFFFFFF00000000L should be used as bit mask.
Change-Id: I83e22ffbecd718540e644289fee12bf9c3b66305
Test: Advertise with payload contains 32-bit uuid
Neil Fuller [Fri, 15 Sep 2017 16:47:07 +0000 (16:47 +0000)]
Merge "Fix a no-op uninstall being treated as a failure"
am:
fab8162abd
Change-Id: I6478c02a4f37f7346a58cd980c21980234c50fec
Treehugger Robot [Fri, 15 Sep 2017 16:38:38 +0000 (16:38 +0000)]
Merge "Fix a no-op uninstall being treated as a failure"
Neil Fuller [Thu, 14 Sep 2017 08:34:56 +0000 (09:34 +0100)]
Fix a no-op uninstall being treated as a failure
Treat a stageUninstall() doing nothing as a success, not a
failure. This prevents the system retrying the uninstall
later.
Unit tests run with:
make -j30 FrameworksServicesTests
adb install -r -g \
"out/target/product/marlin/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
Test: Manual testing, adb dumpsys timezone
Test: PTS: run pts -m PtsTimeZoneTestCases
Bug:
65657176
Merged-in: Ifd205da90e848552711ac3f4207cd22ad2c2747b
Change-Id: Ifd205da90e848552711ac3f4207cd22ad2c2747b
(cherry picked from commit
8e27c9226b82f41279ee6c108d2b06bb6f1cef5e)
Rubin Xu [Fri, 15 Sep 2017 10:51:39 +0000 (11:51 +0100)]
Fix LinkPropertiesTest.testCompareResult
Test: runtest frameworks-core -c android.net.LinkPropertiesTest
Change-Id: Ie97b7a7a1557b14296d7c33e98991cdede8463b0
Hall Liu [Fri, 15 Sep 2017 00:45:05 +0000 (00:45 +0000)]
Merge "API council suggested edits, part 3"
am:
7a4cc05d45
Change-Id: Idec5544475dc5eee42009f4038f32b8d8b3c5450
Hall Liu [Fri, 15 Sep 2017 00:40:49 +0000 (00:40 +0000)]
Merge "Apply suggested edits to the file-download API"
am:
f6c9baa0cd
Change-Id: I0724d3bad15fadbfd5eb46e104b49ee1dafc8c9c
Hall Liu [Fri, 15 Sep 2017 00:21:58 +0000 (00:21 +0000)]
Merge "API council suggested edits, part 3"
Hall Liu [Fri, 15 Sep 2017 00:21:13 +0000 (00:21 +0000)]
Merge "Apply suggested edits to the file-download API"
Narayan Kamath [Thu, 14 Sep 2017 23:57:14 +0000 (23:57 +0000)]
Merge changes Id931d441,I83faf974
am:
89c94f67b4
Change-Id: Ifc090e141092bcee11704e45d6f97f642040d002
Narayan Kamath [Thu, 14 Sep 2017 23:55:49 +0000 (23:55 +0000)]
Zygote: Fix race condition on package preloads.
am:
a3d4230b92 -s ours
Change-Id: I6fc6b967f04a6f3cc87908b7fdba72e26a9fb025
Treehugger Robot [Thu, 14 Sep 2017 23:41:34 +0000 (23:41 +0000)]
Merge changes Id931d441,I83faf974
* changes:
Zygote: Improve logging and error handling during connections.
Zygote: Fix race condition on package preloads.
Jakub Pawlowski [Thu, 14 Sep 2017 23:36:00 +0000 (23:36 +0000)]
Merge changes from topic "incl_svc_parsing_fix"
am:
fee4546fd6
Change-Id: If7ee44287dbec54e49df9fc350b2ebdfcdaeb431
Treehugger Robot [Thu, 14 Sep 2017 22:59:37 +0000 (22:59 +0000)]
Merge changes from topic "incl_svc_parsing_fix"
* changes:
Fix included service parsing (3/3)
Bluetooth: fix typo in comment
Hall Liu [Sat, 9 Sep 2017 01:02:38 +0000 (18:02 -0700)]
API council suggested edits, part 3
* MbmsException no longer thrown from the common methods, and the error
codes are now containined in MbmsError.
* In order to avoid ANRs while processing download-done broadcasts,
don't perform arbitrary moves when a download is done. Instead, move
into a staging directory and let the app handle it.
Bug:
30981736
Test: testapps
Change-Id: I9416f28b4f24f89af1da6f56a93ea0f0e4ea3878
Hall Liu [Sat, 2 Sep 2017 00:59:15 +0000 (17:59 -0700)]
Apply suggested edits to the file-download API
* Rename Manager -> Session
* Add Handler for callbacks in download flow
* Separate out registering a state callback into another method
* Rename dispose -> close, implement AutoClosable
* No more thrown MbmsExceptions
* Add sanity check for temp file root
* Remove the getNames method, replace with getNameForLocale
Bug:
30981736
Test: testapps
Change-Id: I1a2054d79c934bc4929464de4a644b6960db47e9
Hall Liu [Thu, 14 Sep 2017 19:45:04 +0000 (19:45 +0000)]
Merge "Make changes to MBMS Streaming APIs per recommendations"
am:
1bbf287859
Change-Id: I76662fd9822dcde781cdecafb45239e1da6337d9
Jakub Pawlowski [Thu, 14 Sep 2017 18:54:59 +0000 (11:54 -0700)]
Fix included service parsing (3/3)
Bug:
65637368
Test: sl4a GattIncludedServiceTest
Change-Id: Idb967df9d5064b0532db7f5c250f677d1dbbc54c
Jakub Pawlowski [Thu, 14 Sep 2017 19:35:24 +0000 (19:35 +0000)]
Merge "Bluetooth: fix parameter name in onConnectionUpdated"
am:
1f53eb76e4
Change-Id: I45642dfbb8ed8bb90a1306d066844d18aa1962b3
Hall Liu [Thu, 14 Sep 2017 19:34:11 +0000 (19:34 +0000)]
Merge "Make changes to MBMS Streaming APIs per recommendations"
Jakub Pawlowski [Thu, 14 Sep 2017 15:51:44 +0000 (08:51 -0700)]
Bluetooth: fix typo in comment
Test: none
Change-Id: I48c674049df88285268145d4140870eb4ab79a62
Jakub Pawlowski [Thu, 14 Sep 2017 19:24:06 +0000 (19:24 +0000)]
Merge "Bluetooth: fix parameter name in onConnectionUpdated"
Jakub Pawlowski [Thu, 14 Sep 2017 15:24:15 +0000 (08:24 -0700)]
Bluetooth: fix parameter name in onConnectionUpdated
Test: compilation
Change-Id: I625e4ca63477b795310ebb42ca5e9a0549523cc5
Neil Fuller [Thu, 14 Sep 2017 14:17:35 +0000 (14:17 +0000)]
Merge "Finalize package intents used to trigger tz update"
am:
48d3181b1d
Change-Id: I49f8cf990c76b95f2ef8d4f2e7ad6d3fe4b4b80e
Neil Fuller [Thu, 14 Sep 2017 14:07:59 +0000 (14:07 +0000)]
Merge "Finalize package intents used to trigger tz update"
Neil Fuller [Wed, 13 Sep 2017 15:01:58 +0000 (16:01 +0100)]
Finalize package intents used to trigger tz update
Finalize the package intents used to trigger tz update and
improve the documentation.
Bug:
64018084
Test: PTS: run pts -m PtsTimeZoneTestCases
Change-Id: Ifba9dea1d6d8818f875d4c7efba09d77c8e6d66a
Merged-In: Ifba9dea1d6d8818f875d4c7efba09d77c8e6d66a
(cherry picked from commit
228dc6cfefd06936657fa39848f7ee73162def8f)
Hugo Benichi [Thu, 14 Sep 2017 12:08:26 +0000 (12:08 +0000)]
Merge changes I4719b4dc,I0308cdf4,I38db1bb7
am:
a3c28cc567
Change-Id: I3b222afc77b121769cc18d52e5c3d8bcec9db886
Hugo Benichi [Thu, 14 Sep 2017 12:01:19 +0000 (12:01 +0000)]
Merge changes Ie2676b20,Ie8db6f85
am:
61901ddedd
Change-Id: Ib4fab32418da8274bd6b5cb9fef85e0db79d866a
Hugo Benichi [Thu, 14 Sep 2017 11:59:58 +0000 (11:59 +0000)]
Merge changes I4719b4dc,I0308cdf4,I38db1bb7
* changes:
IpManagerTest: fix flaky test
Fix flaky NsdManagerTest
Boostrap test for NetworkMonitor
Hugo Benichi [Thu, 14 Sep 2017 11:53:02 +0000 (11:53 +0000)]
Merge changes Ie2676b20,Ie8db6f85
* changes:
Connectivity metrics: add WakeupStats events
Connectivity metrics: collect NFLOG wakeup events
Hugo Benichi [Tue, 5 Sep 2017 04:34:48 +0000 (13:34 +0900)]
Connectivity metrics: add WakeupStats events
This patch defines a new WakeupStats event in ipconnectivity.proto and
populates these events from the NFLOG wakeup events stored in
NetdEventListenerService.
There is one WakeupStats object per known interface on which ingress
packets arrive and may wake the system up.
Example from $ adb shell dumpsys connmetrics list:
UPDATEME
...
WakeupStats(wlan0, total: 58, root: 0, system: 3, apps: 38, non-apps: 0, unrouted: 17, 6111s)
WakeupEvent(13:36:31.686, iface wlan0, uid -1)
WakeupEvent(13:38:50.846, iface wlan0, uid -1)
WakeupEvent(13:39:16.676, iface wlan0, uid 10065)
WakeupEvent(13:40:32.144, iface wlan0, uid 1000)
WakeupEvent(13:40:35.827, iface wlan0, uid 1000)
WakeupEvent(13:40:47.913, iface wlan0, uid 10004)
WakeupEvent(13:40:52.622, iface wlan0, uid 10014)
WakeupEvent(13:41:06.036, iface wlan0, uid 10004)
...
Bug:
34901696
Bug:
62179647
Test: runtest frameworks-net
Change-Id: Ie2676b20bfb411a1902f4942643df0c20e268d99
Narayan Kamath [Wed, 5 Jul 2017 13:45:38 +0000 (14:45 +0100)]
Zygote: Improve logging and error handling during connections.
Before this change, we were throwing a checked exception on success
and returning on failure. This made it hard to figure out where / when
something was going wrong. This change switches things around to throw
a RuntimeException when something goes wrong and to return a Runnable
on success. This lets us make stronger assertions in both the parent
and the child process about their state and expected return values.
This change also upgrades the severity of several errors that we would
earlier just ignore. We will now reject the command and terminate the
connection to the client when we encounter these errors such as:
- Malformed arguments
- Any ZygoteSecurityException, such as thown thrown by
applyUidSecurityPolicy and applyInvokeWithSecurityPolicy.
- Any error in setting up pipes etc. to facilitate communication
with child processes.
(cherry picked from commit
bf99d06003e76469a99269816babe16a22d83b89)
Bug:
13618569
Test: Manual
Merged-In: Id931d44135ae2e4ede1bbac6a4b187f6c139e1fd
Change-Id: Id931d44135ae2e4ede1bbac6a4b187f6c139e1fd
Narayan Kamath [Mon, 3 Jul 2017 13:12:26 +0000 (14:12 +0100)]
Zygote: Fix race condition on package preloads.
Before this change, ZygoteProcess.preloadPackageForAbi returned
as soon as the command was written to the zygote socket and not
after the preload completed. This meant that there was a small
window of time before the server side of the socket polled its FDs
where a second command could be written to the zygote socket. This
would lead to only one of the commands being processed and the
other being dropped. The client side of that socket would then wait
forever for a response and bring down the system once the watchdog
timeout was hit.
Example failure case :
--------------
system_server:send command(preloadPackage)
system_server:send command(fork)
zygote:poll & process command(preloadPackage) // the fork command is dropped.
Example of normal operation :
------------------
system_server:send command(preloadPackage)
zygote:poll & process command(preloadPackage)
system_server:send command(fork)
zygote:poll & process command(fork)
This change makes preloadPackageForAbi synchronous, which ensures
that each POLLIN event corresponds to precisely one command.
(cherry picked from commit
24a3306c32aa3860184025638f3abaab96cc9153)
Bug:
62886909
Bug:
13618569
Test: Manual
Contributed-By: yuqianyu@huawei.com
Merged-In: I83faf974c9a70a6ab18323f692c1981784e4c56a
Change-Id: I83faf974c9a70a6ab18323f692c1981784e4c56a
Android Build Merger (Role) [Wed, 13 Sep 2017 22:38:38 +0000 (22:38 +0000)]
Merge "Merge "Abort connecting to native daemon during shutdown" am:
d763e341b5" into stage-aosp-master
Tetsutoki Shiozawa [Wed, 13 Sep 2017 22:36:59 +0000 (22:36 +0000)]
Merge "Abort connecting to native daemon during shutdown"
am:
d763e341b5
Change-Id: I5b8984d51ff0715b29074cee98197263b5ce1c29
Tetsutoki Shiozawa [Wed, 13 Sep 2017 22:27:48 +0000 (22:27 +0000)]
Merge "Abort connecting to native daemon during shutdown"
am:
d763e341b5
Change-Id: I044badaab323b836580b5231e9f2661aa320d1e9
Hall Liu [Wed, 13 Sep 2017 22:22:04 +0000 (22:22 +0000)]
Merge "Unhide EMBMS download API"
am:
0285ee851d
Change-Id: Ib94f80270615f3d4a710c31b6ab81b40d77333ad
Hall Liu [Wed, 13 Sep 2017 22:17:01 +0000 (22:17 +0000)]
Merge changes from topics "embms-0804-adjustments", "prepare-download-unhide"
am:
910e5751b6
Change-Id: I07e7d0d4d799aded59797e237ec733354f3293df
Jakub Pawlowski [Wed, 13 Sep 2017 22:12:16 +0000 (22:12 +0000)]
Merge "Bluetooth: thread-safe callback invocation"
am:
f8c7572b8f
Change-Id: Iac79926b7131949367b1dad2565b6d0b405ef832
Treehugger Robot [Wed, 13 Sep 2017 22:09:54 +0000 (22:09 +0000)]
Merge "Abort connecting to native daemon during shutdown"
Jakub Pawlowski [Wed, 13 Sep 2017 22:08:00 +0000 (22:08 +0000)]
Merge "Bluetooth: fix GATT race conditions when using Handler"
am:
06b29a87d7
Change-Id: I2760ebf88cb96e29a754a65d1ce3f5ae879d7ccc
Rubin Xu [Wed, 13 Sep 2017 21:59:11 +0000 (21:59 +0000)]
Merge "Refactor CompareResult<> class and its call sites"
am:
60eae6e621
Change-Id: I3d463e29d8ba806d69596bee64234a28d0c6f34d
Hall Liu [Wed, 13 Sep 2017 20:40:34 +0000 (20:40 +0000)]
Merge "Unhide EMBMS download API"
Hall Liu [Wed, 13 Sep 2017 19:55:58 +0000 (19:55 +0000)]
Merge changes from topics "embms-0804-adjustments", "prepare-download-unhide"
* changes:
Make EMBMS adjustments for 08/04
Prepare EMBMS apis for un-hiding
Treehugger Robot [Wed, 13 Sep 2017 19:03:47 +0000 (19:03 +0000)]
Merge "Bluetooth: thread-safe callback invocation"
Jakub Pawlowski [Wed, 13 Sep 2017 16:33:34 +0000 (09:33 -0700)]
Bluetooth: thread-safe callback invocation
Bug:
65596701
Test: manual
Change-Id: I92a436328a3070ea842e8e652891e485406c2ed7
Treehugger Robot [Wed, 13 Sep 2017 17:31:30 +0000 (17:31 +0000)]
Merge "Bluetooth: fix GATT race conditions when using Handler"
Jakub Pawlowski [Tue, 12 Sep 2017 21:48:30 +0000 (14:48 -0700)]
Bluetooth: fix GATT race conditions when using Handler
Bug:
65596701
Test: manual
Change-Id: Id703cea0543626bdd5a583da95615b650bbcc331
Nicolas Geoffray [Wed, 13 Sep 2017 13:21:00 +0000 (14:21 +0100)]
Special handling of priv-apps in Zygote.
If pm.dexopt.priv-apps is set to false, disable verifier and
only allow loading oat files from system.
bug:
30972906
bug:
63920015
Test: works as expected when pm.dexopt.priv-apps is true or false
Change-Id: Ib9e80c9b7b4106e82c0b9d1c7fbb8065c190ac1f
Nicolas Geoffray [Wed, 13 Sep 2017 11:59:21 +0000 (12:59 +0100)]
Missed these renames in last commit.
Test: builds
Change-Id: I6c2d03accc55aef8381f38f9b182f2367e25a915
Nicolas Geoffray [Wed, 13 Sep 2017 10:08:36 +0000 (11:08 +0100)]
resolve merge conflicts of
e017dae5873c to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I7008986501028ec9bee0505d41aae3ff27872b50
Hugo Benichi [Thu, 7 Sep 2017 05:18:33 +0000 (14:18 +0900)]
IpManagerTest: fix flaky test
Reset the callback mock for every onLinkPropertiesChange expected when
pushing address updates on the BaseNetworkObserver.
Bug:
32561414
Bug:
62918393
Test: runtest frameworks-net, IpManagerTest passes 200 times in a row
Change-Id: I4719b4dc86044438243887634191c2d21686b80f
Hugo Benichi [Fri, 8 Sep 2017 00:03:54 +0000 (09:03 +0900)]
Fix flaky NsdManagerTest
Bad synchronization between the mock handler and the test assertions
were causing testDiscoverService() to sometime fails (1/50 ~ 1/100 repro
rate).
Bug:
32561414
Bug:
62918393
Test: runtest frameworks-net, NsdManager#testDiscoverService now passes
1000 times without errors.
Change-Id: I0308cdf48fc6bdc2fc9b4e8f7d5241a1cf2ea443
Rubin Xu [Wed, 13 Sep 2017 09:35:04 +0000 (09:35 +0000)]
Merge "Refactor CompareResult<> class and its call sites"
Nicolas Geoffray [Wed, 13 Sep 2017 08:08:47 +0000 (08:08 +0000)]
Merge "Rename debugFlags to runtimeFlags."
Hugo Benichi [Mon, 31 Jul 2017 03:58:20 +0000 (12:58 +0900)]
Boostrap test for NetworkMonitor
This will finally allow to write captive portal detection unit tests.
Bug:
32561414
Bug:
62918393
Test: runtest frameworks-net
Change-Id: I38db1bb79ae80a82b4199dc9cb1b56257e0cf222
Nicolas Geoffray [Thu, 7 Sep 2017 13:13:29 +0000 (14:13 +0100)]
Rename debugFlags to runtimeFlags.
Also now pass the flags to the forked process through --runtime-flags instead
of converting to command line arguments and converting back to an integer.
bug:
30972906
bug:
63920015
Test: builds
Change-Id: I7f10c43dd916ca2d3b9b5141f17261eb7b64f49a
Rubin Xu [Tue, 12 Sep 2017 11:23:20 +0000 (11:23 +0000)]
Merge "Patch incoming LinkProperties before it's visible to the outside"
am:
7b625191e2
Change-Id: I032ba648ec0476ab8a02a710e2ae485ab4a590b8
Treehugger Robot [Tue, 12 Sep 2017 11:12:53 +0000 (11:12 +0000)]
Merge "Patch incoming LinkProperties before it's visible to the outside"
Rubin Xu [Mon, 11 Sep 2017 14:21:10 +0000 (15:21 +0100)]
Patch incoming LinkProperties before it's visible to the outside
Otherwise we risk a race condition when we are fixing the LinkProperties
routes, other parts of ConnectivityService is reading the field at the
same time.
Test: runtest frameworks-net -c com.android.server.ConnectivityServiceTest
Test: runtest frameworks-core -c android.net.LinkPropertiesTest
Bug:
65529483
Bug:
35995111
Change-Id: I539578703570a901e0a5dff0155422ca78c52401
Erik Kline [Tue, 12 Sep 2017 06:19:16 +0000 (06:19 +0000)]
Merge "Check for IControllOffload.getServer() returning null"
am:
c5932ab2a8
Change-Id: If27fca9aa594af2f58a470709d78f19f31bb316d
Treehugger Robot [Tue, 12 Sep 2017 06:10:45 +0000 (06:10 +0000)]
Merge "Check for IControllOffload.getServer() returning null"
Erik Kline [Mon, 11 Sep 2017 07:33:27 +0000 (16:33 +0900)]
Check for IControllOffload.getServer() returning null
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
29337859
Bug:
65529504
Merged-In: I5a57a9fd14dc53eaf1722fbc9a972f4f73280497
Merged-In: Ib2d1862367145260ac83f14d181646eb827538f8
Change-Id: I671487344000f1f2db92b8e4a693c096b680830c
(cherry picked from commit
87b3bfd5f2d3d0ccfc3ee1279b496d4ff289e38f)
Hugo Benichi [Mon, 4 Sep 2017 04:24:43 +0000 (13:24 +0900)]
Connectivity metrics: collect NFLOG wakeup events
This patch stores NFLOG packet wakeup events sent by Netd to the system
server into a ring buffer inside NetdEventListenerService. The content
of this buffer is accessible by $ dumpsys connmetrics or $ dumpsys
connmetrics list, and is added to bug reports.
The wakeup event buffer stores currently uid and timestamps.
Bug:
34901696
Bug:
62179647
Test: runtest frameworks-net, new unit tests
Change-Id: Ie8db6f8572b1a929a20398d8dc03e189bc488382
Jordan Liu [Mon, 11 Sep 2017 23:06:22 +0000 (23:06 +0000)]
Merge "Show 3G data icon for TD-SCDMA network type"
am:
9da895b5e1
Change-Id: Idb27d11834099a13bc86619b8c3ea089fb863970
Jordan Liu [Mon, 11 Sep 2017 22:52:20 +0000 (22:52 +0000)]
Merge "Show 3G data icon for TD-SCDMA network type"
Adam Lesinski [Mon, 11 Sep 2017 21:50:55 +0000 (21:50 +0000)]
Merge "AAPT2: Fix processing of quotes in XML"
am:
9b65f03abf
Change-Id: I41709d30869830436aa833c3ab6aebe88a8caeed
Adam Lesinski [Mon, 11 Sep 2017 21:41:27 +0000 (21:41 +0000)]
Merge "Revert "OMS: fix listener callbacks triggered by changes to target package""
am:
8303fb42e0
Change-Id: I0d241d8d861b75c6c9350f4cf3183e82fe868309
Treehugger Robot [Mon, 11 Sep 2017 21:34:53 +0000 (21:34 +0000)]
Merge "AAPT2: Fix processing of quotes in XML"
Treehugger Robot [Mon, 11 Sep 2017 21:10:12 +0000 (21:10 +0000)]
Merge "Revert "OMS: fix listener callbacks triggered by changes to target package""
Wileen Chiu [Fri, 18 Sep 2015 22:17:54 +0000 (15:17 -0700)]
Show 3G data icon for TD-SCDMA network type
- The data annunciator on the UI shows up as
"G" instead of "3G"
- Map the 3G telephony icon to network type
TD-SCDMA
Bug:
36802489
Test: manual
Change-Id: I63a0e54aab7fda2bcc6f098bb0b43799aad2f6c2
Ping Sun [Mon, 11 Sep 2017 20:11:37 +0000 (20:11 +0000)]
Merge "Add ims registration status"
am:
d217a0c5a7 -s ours
Change-Id: I79d8729bd09208fe0c1088ad1efbf491d180c2f6
Adam Lesinski [Fri, 30 Jun 2017 00:53:36 +0000 (17:53 -0700)]
AAPT2: Fix processing of quotes in XML
When processing attributes in XML, quotes can't be used to mark a
section as whitespace preserving, so the assumption should be that the
entire string is whitespace preserving, which makes quote characters
literals.
Bug:
62840718
Bug:
62840406
Test: make aapt2_tests
Change-Id: I4afff02148b5b8e78833abf1f323c2f5325d6155
Treehugger Robot [Mon, 11 Sep 2017 19:44:31 +0000 (19:44 +0000)]
Merge "Add ims registration status"
Brad Ebinger [Mon, 11 Sep 2017 19:42:43 +0000 (19:42 +0000)]
Merge "Add ims registration status" into stage-aosp-master
Adam Lesinski [Mon, 11 Sep 2017 19:05:04 +0000 (19:05 +0000)]
Revert "OMS: fix listener callbacks triggered by changes to target package"
Some internal tests broke due to this. Revert for now to unblock, and investigate why this occurred.
This reverts commit
f08ad98acbb83abf7d30b6583bdfc188145a4215.
Bug:
65319218
Change-Id: I1bfb2d4937708441eac2ee5909717abec10f4971
nharold [Mon, 11 Sep 2017 18:07:07 +0000 (18:07 +0000)]
Merge "Un-hide TelephonyManager.getSignalStrength()"
am:
3e884ce13c
Change-Id: I0692185c533ca4a0999cbf3237c3afabd4b87972
nharold [Mon, 11 Sep 2017 17:44:34 +0000 (17:44 +0000)]
Merge "Un-hide TelephonyManager.getSignalStrength()"
Amit Mahajan [Mon, 11 Sep 2017 17:31:06 +0000 (17:31 +0000)]
Merge "Remove config_tether_apndata for Telstra."
am:
777d0cd7c3
Change-Id: Iafa5e25bd94db3ce16a043a4a801ce82c97f9e13
Treehugger Robot [Mon, 11 Sep 2017 17:19:35 +0000 (17:19 +0000)]
Merge "Remove config_tether_apndata for Telstra."
Amit Mahajan [Thu, 31 Aug 2017 20:49:28 +0000 (13:49 -0700)]
Remove config_tether_apndata for Telstra.
Test: manual
Bug:
63564491
Change-Id: Iaca29bfd474b7df6489b1daeaeea182ebf8d81ae