OSDN Git Service
Colin Cross [Mon, 20 Nov 2017 20:36:15 +0000 (20:36 +0000)]
Merge "Add output file and dependencies to fontchain_lint"
am:
b0a3e9dc83
Change-Id: I835565031398b97c995260a0bfc9c8f1f50cef2e
Treehugger Robot [Mon, 20 Nov 2017 20:24:26 +0000 (20:24 +0000)]
Merge "Add output file and dependencies to fontchain_lint"
Cassie [Sat, 18 Nov 2017 00:27:09 +0000 (00:27 +0000)]
Merge "Update the comments for all CellIdentity*."
am:
2610ad0556
Change-Id: I81f4e4a6bd0960ce3d2d51bfe15711a5c3eda9fb
Treehugger Robot [Sat, 18 Nov 2017 00:16:37 +0000 (00:16 +0000)]
Merge "Update the comments for all CellIdentity*."
Cassie [Fri, 17 Nov 2017 22:16:01 +0000 (14:16 -0800)]
Update the comments for all CellIdentity*.
Bug:
63984327
Test: Basic telephony sanity
Change-Id: Icb9ba99cefb93a7c4a39cbc653ae046df8649cf9
Nan Zhang [Fri, 17 Nov 2017 22:12:58 +0000 (22:12 +0000)]
Merge "Build fontchain_lint using python_binary_host"
am:
7ecac139ea
Change-Id: I4fef971c8fc8837f73644667988ddc3e7f4305ec
Treehugger Robot [Fri, 17 Nov 2017 22:03:27 +0000 (22:03 +0000)]
Merge "Build fontchain_lint using python_binary_host"
Tyler Gunn [Fri, 17 Nov 2017 19:27:12 +0000 (19:27 +0000)]
Merge "Add missing } on @link tag."
am:
31b0c6fb32
Change-Id: I2249cab4a50a9788cd8decb23fd8c60419ab6c21
Tyler Gunn [Fri, 17 Nov 2017 19:13:53 +0000 (19:13 +0000)]
Merge "Add missing } on @link tag."
Cassie Han [Fri, 17 Nov 2017 19:01:44 +0000 (19:01 +0000)]
Merge "Allow unknown mcc/mnc when constructing a CellIdentity from Parcel."
am:
3df706dcd9
Change-Id: I83ebfa9404af1b8045c6d9c7e8a3634469420adc
Ahmad Melegy [Fri, 17 Nov 2017 18:55:53 +0000 (18:55 +0000)]
Merge "Fix typo"
am:
913f396c11
Change-Id: I244ccafe5bf76718cdc48b2fa7d9ce8270b0dd33
Cassie Han [Fri, 17 Nov 2017 18:47:59 +0000 (18:47 +0000)]
Merge "Allow unknown mcc/mnc when constructing a CellIdentity from Parcel."
Treehugger Robot [Fri, 17 Nov 2017 18:47:43 +0000 (18:47 +0000)]
Merge "Fix typo"
Colin Cross [Sat, 11 Nov 2017 04:30:56 +0000 (20:30 -0800)]
Add output file and dependencies to fontchain_lint
Keep fontchain_lint from rerunning on every make checkbuild by
making it touch an output file and giving it dependencies on
anything that should cause it to rerun.
Bug:
27727331
Test: m checkbuild
Change-Id: I0d8a41b308cac04844e27beb51c12dbf46cb1a4a
Nan Zhang [Thu, 9 Nov 2017 04:48:46 +0000 (20:48 -0800)]
Build fontchain_lint using python_binary_host
Test: out/host/linux-x86/bin/fontchain_lint
out/target/product/generic/system true external/unicode
Bug: b/
27727331
Change-Id: Ib9353d2338c3b939027069f49e3e847c65526581
Tyler Gunn [Fri, 17 Nov 2017 16:36:41 +0000 (08:36 -0800)]
Add missing } on @link tag.
Test: Compiled code (this is a non-code change).
Bug:
69439905
Change-Id: I334ef7d74ac9802378b43a8f95979dcaf82c592f
Calin Juravle [Fri, 17 Nov 2017 02:46:57 +0000 (02:46 +0000)]
Merge "Workaround to get passed the broken install flow"
am:
b0e6508a5b
Change-Id: Icbad0d985b4d8d3e206ee5e426cdd1f58955aec1
Calin Juravle [Fri, 17 Nov 2017 02:36:29 +0000 (02:36 +0000)]
Merge "Workaround to get passed the broken install flow"
Jack He [Fri, 17 Nov 2017 02:19:02 +0000 (02:19 +0000)]
Merge "Telephony: Allow custom looper for OnSubscriptionsChangedListener"
am:
8055aec0da
Change-Id: If1757262ce5da5f2ab1055cfb238ea570550f7f7
Treehugger Robot [Fri, 17 Nov 2017 02:10:07 +0000 (02:10 +0000)]
Merge "Telephony: Allow custom looper for OnSubscriptionsChangedListener"
Jakub Pawlowski [Fri, 17 Nov 2017 01:40:05 +0000 (01:40 +0000)]
Merge "Add getProfileParentId (1/2)"
am:
7a2c66359a
Change-Id: Iea965e42bb79f939381971e8dd9466b824606ee0
Jakub Pawlowski [Fri, 17 Nov 2017 01:33:31 +0000 (01:33 +0000)]
Merge "Add getProfileParentId (1/2)"
Jeff Sharkey [Thu, 16 Nov 2017 02:07:14 +0000 (19:07 -0700)]
Workaround to get passed the broken install flow
For fresh installs the PM does not set the app uid before invoking
dexopt; so we would always get a bogus GID.
This is a temporary workaround which fixes the GID of newly
installed apps to an arbitrary UNKNOWN gid.
Test: adb install
Bug:
64548938
Bug:
69331247
(cherry picked from commit
a73e165c2ea0bb6499b89dd335d6ef878c92b8e9)
Change-Id: I6438ec8cfca88df813e166f9ef5821e62faf524a
Jack He [Thu, 16 Nov 2017 23:54:14 +0000 (15:54 -0800)]
Telephony: Allow custom looper for OnSubscriptionsChangedListener
* Add OnSubscriptionsChangedListener(Looper looper) constructor
Bug:
69429540
Test: Use this constructor in HeadsetPhoneState.java
Change-Id: I37b6c8d970384466527acc8df7a818625865ab16
Ajay Panicker [Thu, 16 Nov 2017 22:53:19 +0000 (22:53 +0000)]
Merge "Add MediaMetadata equals to make metadata comparisons easier"
am:
12bc5b6289
Change-Id: Ie622564ba02ec7a39d8f3574ea8885b225596c67
Treehugger Robot [Thu, 16 Nov 2017 22:43:40 +0000 (22:43 +0000)]
Merge "Add MediaMetadata equals to make metadata comparisons easier"
Ajay Panicker [Thu, 9 Nov 2017 18:16:35 +0000 (10:16 -0800)]
Add MediaMetadata equals to make metadata comparisons easier
Bug:
68854188
Test: Compare two metadata objects with the same title, album, and
artist
Change-Id: I89d1944bf237f8f3f1c52ccdb8ff385422b19070
Hansong Zhang [Thu, 16 Nov 2017 18:50:16 +0000 (18:50 +0000)]
Merge "Bluetooth HID Device API docs and helper"
am:
a89f6150dc
Change-Id: I4b91cd3e528f480ea216e9ffb0414910d4762d3b
Treehugger Robot [Thu, 16 Nov 2017 18:38:06 +0000 (18:38 +0000)]
Merge "Bluetooth HID Device API docs and helper"
Sanket Padawe [Thu, 16 Nov 2017 01:45:25 +0000 (01:45 +0000)]
Merge "API declarations for Call Handover."
am:
d88abc7b60
Change-Id: I0be6f240073408bf9520766238ecf791c016a40b
Sanket Padawe [Thu, 16 Nov 2017 01:34:58 +0000 (01:34 +0000)]
Merge "API declarations for Call Handover."
Hansong Zhang [Wed, 8 Nov 2017 17:57:12 +0000 (09:57 -0800)]
Bluetooth HID Device API docs and helper
* Add a builder for BluetoothHidDeviceAppQosSettings
* Add documentation for BluetoothHidDeviceAppSdpSettings
and BluetoothHidDeviceAppQosSettings
* Fix the behavior of and BluetoothHidDeviceAppSdpSettings.equals()
and BluetoothHidDeviceAppQosSettings.equals()
Bug:
63384609
Test: test with HID device apps
Change-Id: I933f4ec3034e1f704ddd614e48b76d27fda8b6ff
Cassie [Thu, 16 Nov 2017 01:11:17 +0000 (17:11 -0800)]
Allow unknown mcc/mnc when constructing a CellIdentity from Parcel.
Bug:
63984327
Test: Basic telephony sanity
Change-Id: Ia7670b7cd49db244e7c8309419ea8d7b1280a7fa
Jakub Pawlowski [Wed, 15 Nov 2017 22:50:43 +0000 (14:50 -0800)]
Add getProfileParentId (1/2)
Bluetooth service needs to natively access id of parent profile. Add
method exposing it.
Test: cts-tradefed run cts-dev -m DevicePolicyManager --test
com.android.cts.devicepolicy.ManagedProfileTest#testBluetooth
Bug:
69284968
Change-Id: I697906f2959b0736c1d3cc6af7560c27d77ce11b
Cassie Han [Wed, 15 Nov 2017 23:29:37 +0000 (23:29 +0000)]
Merge "Revert "Allow unknown mcc/mnc when constructing a CellIdentity from Parcel.""
am:
9b08e4cb8d
Change-Id: Ie34638da4087987c19bbc7f9935854ca8fa5688d
Cassie Han [Wed, 15 Nov 2017 23:21:33 +0000 (23:21 +0000)]
Merge "Revert "Allow unknown mcc/mnc when constructing a CellIdentity from Parcel.""
Hugo Benichi [Wed, 15 Nov 2017 22:42:50 +0000 (22:42 +0000)]
Merge "IP connectivity metrics: fix LINGER/UNLINGER logging"
am:
e28513f150
Change-Id: I6f10845788ba5558637703da6d8c5c41324935cc
Hugo Benichi [Wed, 15 Nov 2017 22:31:59 +0000 (22:31 +0000)]
Merge "IP connectivity metrics: fix LINGER/UNLINGER logging"
Sanket Padawe [Fri, 3 Nov 2017 18:07:35 +0000 (11:07 -0700)]
API declarations for Call Handover.
Design doc:
https://docs.google.com/document/d/1qY3oAzjff_4A1ttYb_CGrE_OwTRmXMG_KGsIuPT1ey8/edit#
Bug:
65415068
Test: manual.
Change-Id: I0c2f561d92ad6504f858eadde09980fc1ce8727f
Di Lu [Wed, 15 Nov 2017 20:23:14 +0000 (20:23 +0000)]
Merge "Add test case for user quota management in IpSecService"
am:
cf1a4614e1
Change-Id: Ib1887b2395f0b1391711a9df9bebe224b6be1643
Di Lu [Wed, 15 Nov 2017 20:12:38 +0000 (20:12 +0000)]
Merge "Add test case for user quota management in IpSecService"
Niklas Brunlid [Wed, 15 Nov 2017 18:59:35 +0000 (18:59 +0000)]
Merge "Avoid overflow in focus fudge calculation"
am:
795d4a5aa4
Change-Id: Id15034f5a02f93a4fe8487b5516993a9bf6f4ada
Treehugger Robot [Wed, 15 Nov 2017 18:42:28 +0000 (18:42 +0000)]
Merge "Avoid overflow in focus fudge calculation"
Marie Janssen [Wed, 15 Nov 2017 18:11:38 +0000 (18:11 +0000)]
Merge "Bluetooth: Use elapsed real time for calculating onDuration"
am:
22b12e6b06
Change-Id: Ide20da5af6ea64f1c5c0e325e8864034798eface
Cassie Han [Wed, 15 Nov 2017 17:27:31 +0000 (17:27 +0000)]
Revert "Allow unknown mcc/mnc when constructing a CellIdentity from Parcel."
Bug:
69349963
Bug:
69096589
Bug:
63984327
This reverts commit
993203c7e0d397f193b80c01774b4be925242dae.
Change-Id: I52839aa5991541399651904587aa342a858a5915
Treehugger Robot [Wed, 15 Nov 2017 17:06:41 +0000 (17:06 +0000)]
Merge "Bluetooth: Use elapsed real time for calculating onDuration"
Marie Janssen [Mon, 26 Jun 2017 14:21:03 +0000 (07:21 -0700)]
Bluetooth: Use elapsed real time for calculating onDuration
The system time can change after boot. Using elapsed real time avoids
this problem.
Test: start factory reset device, adb shell dumpsys bluetooth_manager
Change-Id: Ieea2a2bc8b4bcb375897e609275207b6c3eccdce
Fixes:
62985817
Koji Fukui [Wed, 15 Nov 2017 02:35:18 +0000 (02:35 +0000)]
Merge "Remove AutofillManagerClient after AutofillManager is finalized"
am:
dd5384a4fe
Change-Id: If0b092c5e18005fb4b8c1fd8405f4d666c98de5a
Treehugger Robot [Wed, 15 Nov 2017 02:23:27 +0000 (02:23 +0000)]
Merge "Remove AutofillManagerClient after AutofillManager is finalized"
Ahmad Melegy [Tue, 14 Nov 2017 21:27:28 +0000 (21:27 +0000)]
Fix typo
Fix typo in Activity class in requestPermissions method
Test: Existing unit tests still pass.
Bugs: None
Change-Id: If81117a0e769bca2f303e1ebce57ecda9544e129
Signed-off-by: Ahmad Melegy <ahmad.melegy@gmail.com>
Xin Li [Tue, 14 Nov 2017 20:31:11 +0000 (12:31 -0800)]
Merge commit '
98e12851336b7db16e583f9afac63ecc97465980' from
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master.
Change-Id: Ia7b8da4a00d215160e4a4fa40f6044208d1297b7
Merged-In: I19846d2a3ee27aecbae2367a74ee49082eea154d
yinxu [Tue, 14 Nov 2017 20:25:16 +0000 (20:25 +0000)]
Merge "Fix the comments of onError() callback"
am:
5f291e5e06
Change-Id: If034888c0baeaae882e150eff477083974541541
Treehugger Robot [Tue, 14 Nov 2017 20:12:02 +0000 (20:12 +0000)]
Merge "Fix the comments of onError() callback"
Tianran Li [Tue, 14 Nov 2017 19:47:34 +0000 (19:47 +0000)]
Merge "TimePickerDialog OTG keyboard entry discarded"
am:
8c2cb6ff08
Change-Id: Ib28468e637c146e69d59ee352b5a019654b3dc14
Treehugger Robot [Tue, 14 Nov 2017 19:35:20 +0000 (19:35 +0000)]
Merge "TimePickerDialog OTG keyboard entry discarded"
Jeff Sharkey [Tue, 14 Nov 2017 17:04:06 +0000 (17:04 +0000)]
Merge "Better, consistent definition of AID_SHARED_GID."
am:
7e875df695
Change-Id: Ifad7e44a21aeebdeaab3b31c93ece145f86a1cb9
Cassie [Tue, 14 Nov 2017 16:57:15 +0000 (16:57 +0000)]
Merge "Allow unknown mcc/mnc when constructing a CellIdentity from Parcel."
am:
45e1c58591
Change-Id: Ic4da1daf9e47e064068d007f3e5a4fff3d8ef2e6
Jeff Sharkey [Tue, 14 Nov 2017 16:49:30 +0000 (16:49 +0000)]
Merge "Better, consistent definition of AID_SHARED_GID."
Treehugger Robot [Tue, 14 Nov 2017 16:42:41 +0000 (16:42 +0000)]
Merge "Allow unknown mcc/mnc when constructing a CellIdentity from Parcel."
Hugo Benichi [Fri, 10 Nov 2017 23:06:43 +0000 (08:06 +0900)]
IP connectivity metrics: fix LINGER/UNLINGER logging
This patch fixes a regression introduced by commit
97bfd276fb008
for logging NetworkEvents when lingering and unlingering a network.
Commit
97bfd276fb008 removed an overloaded constructor for the
NetworkEvent class, which caused NetworkEvents with event type of
LINGER or UNLINGER logged in ConnectivityService to have incorrect
event types (set to the network id instead) and incorrect duration
(set as the event type instead).
Bug:
34901696
Test: runtest frameworks-net
Change-Id: Iab97a58ca805413617c8e8b4553404625a820ceb
Paul Duffin [Tue, 14 Nov 2017 13:15:37 +0000 (13:15 +0000)]
Merge "Stop using c.a.i.u.Predicate outside test-runner"
am:
ee2fb3c59e
Change-Id: I197bd9e2458ff9f966754c459ee77f03c3517eb5
Treehugger Robot [Tue, 14 Nov 2017 13:05:20 +0000 (13:05 +0000)]
Merge "Stop using c.a.i.u.Predicate outside test-runner"
Paul Duffin [Tue, 14 Nov 2017 10:11:18 +0000 (10:11 +0000)]
Stop using c.a.i.u.Predicate outside test-runner
This class has been deprecated and should only be used in the
frameworks/base/test-runner directory.
Bug:
30188076
Test: make checkbuild
Change-Id: I61059a96aa6045c44546239b94b329c02bb745a1
Niklas Brunlid [Thu, 2 Nov 2017 08:26:37 +0000 (09:26 +0100)]
Avoid overflow in focus fudge calculation
When comparing decoding the next View to get focus, the last-resort
calculation (magic number and square of distance between the View
corners) could overflow, giving a false positive. This causes the
focus to jump around in certain cases. Change from int to long to
avoid in the foreseeable future.
Test: Manual
- Use a phone with an 18:9 ratio (1080*2160)
- make FrameworksCoreTests
- adb install -r out/target/product/aurora/data/app/FrameworksCoreTests/FrameworksCoreTests.apk
- adb shell am instrument -r -w -e class android.widget.scroll.ScrollViewButtonsAndLabelsTest#testArrowScrollUpOffScreenVerticalFadingEdge com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I119cd66f563cfa312c2304bb910c27075e674e59
Calin Juravle [Tue, 14 Nov 2017 03:03:56 +0000 (03:03 +0000)]
Merge "Create secondary dex profiles relative to the provided dex path"
am:
f7f5732e2c
Change-Id: I6f2eb760e07959e26d46f8a0f3d4b4358b9a5a1e
Treehugger Robot [Tue, 14 Nov 2017 02:54:59 +0000 (02:54 +0000)]
Merge "Create secondary dex profiles relative to the provided dex path"
Calin Juravle [Tue, 5 Sep 2017 00:32:23 +0000 (17:32 -0700)]
Create secondary dex profiles relative to the provided dex path
We previously used the realpath to simplify the validation and processing
in installd. However it ended up making things more complicated when
cleaning up the profiles, especially because of /data/user/0 symlinks to
/data/data/.
Instead of using the realpath of the dex file to compute the profile
location, use the file path as given. This makes things consistent with
DexManager registration and allows for easier dex file reconciliation in
the presence of symlinks.
Bug:
64460009
Test: manual
(cherry picked from commit
c119c5a8c1d8e3ba6c90300a82d2086273d0d3f3)
Merged-In: I2362f32a679324d4bc1e8a0fe83b5b17ee523e7a
Change-Id: Ic9c38a920c5eef85f26ac33f2b8a37c3694bfbad
brycelee [Mon, 13 Nov 2017 23:30:22 +0000 (23:30 +0000)]
Merge "DO NOT MERGE Remove orientation restriction to only fullscreen activities."
am:
62893396bd -s ours
Change-Id: If48b9be41b03c30a5eeed2d497f99535c2c82219
brycelee [Mon, 13 Nov 2017 23:21:09 +0000 (23:21 +0000)]
Merge "DO NOT MERGE Remove orientation restriction to only fullscreen activities."
ludi [Mon, 16 Oct 2017 22:09:41 +0000 (15:09 -0700)]
Add test case for user quota management in IpSecService
Test: runtest frameworks-net
Bug:
65688605
Change-Id: I3210c4920d0ac1d09fecb56c25e392e2bcba641f
Jordan Liu [Mon, 13 Nov 2017 22:02:52 +0000 (22:02 +0000)]
Merge "Customize the default value of Enhanced 4G LTE mode"
am:
0f113b2f25
Change-Id: I85dde983b57cf901e710cd1f1ac3e409b3b7976e
Jordan Liu [Mon, 13 Nov 2017 21:53:24 +0000 (21:53 +0000)]
Merge "Customize the default value of Enhanced 4G LTE mode"
Bryce Lee [Tue, 31 Oct 2017 22:40:33 +0000 (15:40 -0700)]
DO NOT MERGE Remove orientation restriction to only fullscreen activities.
This changelist removes checks that enforce that only fullscreen,
opaque activities may request orientation changes. An application
may itself be compatible with the change and update their SDK level.
However, it is possible they use a library that has not itself been
updated and still leverages this feature for non-fullscreen
activities.
Fixes:
68684796
Test: bit FrameworksServicesTests:com.android.server.wm.AppWindowTokenTests
Change-Id: I75bbda96b132694c722b0b535e33ea5e1b9a55db
Koji Fukui [Mon, 13 Nov 2017 20:53:35 +0000 (20:53 +0000)]
Merge "Stop observing death of PrintManager listener when it is removed"
am:
e7240a52e2
Change-Id: Idc81f05fe3820d1bcbfd81d6497c0608ef37fae3
Treehugger Robot [Mon, 13 Nov 2017 20:42:09 +0000 (20:42 +0000)]
Merge "Stop observing death of PrintManager listener when it is removed"
Cassie [Fri, 10 Nov 2017 00:19:19 +0000 (16:19 -0800)]
Allow unknown mcc/mnc when constructing a CellIdentity from Parcel.
Bug:
69096589
Bug:
63984327
Test: Basic telephony sanity
Change-Id: I0fe5b3a17b1a68c918f912ee98a00cfec4c5657b
Hugo Benichi [Mon, 13 Nov 2017 13:24:10 +0000 (13:24 +0000)]
Merge "IP connectivity metrics: NetworkEvents have transports"
am:
f8fdb06c27
Change-Id: I92dfce6a78de18036ca0b54fdf2ee95e715c678b
Hugo Benichi [Mon, 13 Nov 2017 13:13:44 +0000 (13:13 +0000)]
Merge "IP connectivity metrics: NetworkEvents have transports"
Tianran Li [Wed, 22 Mar 2017 11:38:19 +0000 (20:38 +0900)]
TimePickerDialog OTG keyboard entry discarded
A user can manually enter time value using a keyboard.
NumberPicker then evaluates its value when focus is changed.
Currently when the dialog is closed by pressing OK, the value
from the focused NumberPicker is not taken into consideration.
To ensure retrieval of the correct value when closing the
dialog, the focus must be removed from the NumberPicker as
is done in DatePickerDialog.
Bug:
65664546
Test: Manual
1. Connect physical keyboard via OTG connector
2. Enter Settings and set time manually
3. Select keyboard entry
4. Change time and tap OK
The entered time should be applied
Change-Id: I8a77cb3aaa54acb228ec1ce0e9385e2eb5e88e9b
Koji Fukui [Fri, 20 Oct 2017 07:42:51 +0000 (16:42 +0900)]
Stop observing death of PrintManager listener when it is removed
Symptom:
Global reference table overflow happens on system_server.
Root cause:
When a listener is added to the PrintManager, death notification for
the listener is registered. So the listener is added to global
reference table.
But the death notification is not unregistered when the listener is
removed from PrintManager. The listener isn't removed from the global
reference table until client process die. If client process repeatedly
add/remove listener, the global reference table overflow.
Solution:
Call unlinkToDeath() when the listener is removed from PrintManager.
Test: cts-tradefed run cts-dev -m Print
Bug:
68746445
Change-Id: I0b133e4607317a15e51bdf6e1248552dcc920d6d
Hugo Benichi [Fri, 10 Nov 2017 23:06:43 +0000 (08:06 +0900)]
IP connectivity metrics: NetworkEvents have transports
Also removes netId field from inside NetworkEvent and stop populating
the network_id field of the NetworkEvent field, deprecating it.
Bug:
34901696
Test: runtest frameworks-net,
manually looking at $ adb shell dumpsys connmetrics
Change-Id: I2c36860f976898883714f72f4d18e06da250c6a6
Hugo Benichi [Mon, 13 Nov 2017 04:06:11 +0000 (04:06 +0000)]
Merge "Add L2~L4 information to packet wakeup logs and metrics"
am:
6ee20ca7d3
Change-Id: I8fea75c477d4b5fbbded7dee2dff8644c6f97241
Hugo Benichi [Mon, 13 Nov 2017 03:58:34 +0000 (03:58 +0000)]
Merge "Add L2~L4 information to packet wakeup logs and metrics"
Hugo Benichi [Sun, 12 Nov 2017 22:36:21 +0000 (22:36 +0000)]
Merge "Add Network security watchlist service"
am:
e672ab4c0a
Change-Id: I3e3d8dbc220879752826faa7570f04585c2f1107
Hugo Benichi [Sun, 12 Nov 2017 22:24:56 +0000 (22:24 +0000)]
Merge "Add Network security watchlist service"
Ricky Wai [Fri, 27 Oct 2017 13:46:01 +0000 (14:46 +0100)]
Add Network security watchlist service
Partial cherry pick from commit
1a6e667cb6e9211908d02eb21c50c006473376f9
adding a new INetdEventCallback type.
Bug:
63908748
Test: built, flashed, $ runtest frameworks-net
Change-Id: I1b95cc4e5cbbfbdbd7429d61e2dcb67b90d278bb
Merged-In: I09595178bac0070a867bc5e0501a7bf2c840e398
Hugo Benichi [Thu, 12 Oct 2017 12:33:40 +0000 (21:33 +0900)]
Add L2~L4 information to packet wakeup logs and metrics
Example of $ adb shell dumpsys connmetrics list:
...
WakeupStats(wlan0, 21851s, total: 85, root: 0, system: 4, apps: 63, non-apps: 0, no uid: 18, l2 unicast/multicast/broadcast: 85/0/0, ethertype 0x800: 23, ethertype 0x86dd: 62, ipNxtHdr 6: 74, ipNxtHdr 17: 1, ipproto 58: 10)
...
WakeupEvent(06:55:54.094, wlan0, -1, eth=0x800, dstHw=10:e:7e:26:3f:c1, ipNxtHdr=6, srcIp=216.58.200.110, dstIp=100.112.108.29, srcPort=443, dstPort=46878)
WakeupEvent(06:57:14.379, wlan0, -1, eth=0x86dd, dstHw=10:e:7e:26:3f:c1, ipNxtHdr=58, srcIp=ff02::1, dstIp=fe80::fa00:4:fd00:1)
WakeupEvent(06:57:52.786, wlan0, 1000, eth=0x800, dstHw=10:e:7e:26:3f:c1, ipNxtHdr=6, srcIp=172.217.27.67, dstIp=100.112.108.29, srcPort=80, dstPort=49360)
WakeupEvent(06:58:02.919, wlan0, 10004, eth=0x86dd, dstHw=10:e:7e:26:3f:c1, ipNxtHdr=6, srcIp=2401:fa00:4:fd00:a585:13d1:6a23:4fb4, dstIp=2404:6800:4006:809::200a, srcPort=443, dstPort=46197)
WakeupEvent(06:58:05.586, wlan0, 10004, eth=0x86dd, dstHw=10:e:7e:26:3f:c1, ipNxtHdr=6, srcIp=2401:fa00:4:fd00:a585:13d1:6a23:4fb4, dstIp=2404:6800:4006:803::200a, srcPort=443, dstPort=46096)
Bug:
66869042
Test: runtest frameworks-net
+ manual testing by monitoring $ dumpsys connmetrics list
Change-Id: I03215c0c9fb7feda3e6ceb1b916f61f4ffb15344
Pirama Arumuga Nainar [Sat, 11 Nov 2017 13:37:00 +0000 (13:37 +0000)]
Merge "Remove GCC-specific pragma and disabled Clang warning"
am:
bcf27fa6a7
Change-Id: If8aa81372dd6fcc433867892e27c37670184fbc6
Treehugger Robot [Sat, 11 Nov 2017 13:29:23 +0000 (13:29 +0000)]
Merge "Remove GCC-specific pragma and disabled Clang warning"
Jakub Pawlowski [Sat, 11 Nov 2017 00:22:27 +0000 (00:22 +0000)]
Merge "Move connectSocket into IBluetoothSocketManager (3/3)"
am:
8d742759cc
Change-Id: Id850f587e6ee58b18ffbe1651c0526a7fd39491f
Jakub Pawlowski [Sat, 11 Nov 2017 00:13:41 +0000 (00:13 +0000)]
Merge "Move connectSocket into IBluetoothSocketManager (3/3)"
Pirama Arumuga Nainar [Fri, 10 Nov 2017 21:51:10 +0000 (13:51 -0800)]
Remove GCC-specific pragma and disabled Clang warning
Bug: http://b/
68236396
Do not suppress the GCC-specific -Wunused-but-set-variable warning,
which Clang doesn't support.
Test: Build the topic
Change-Id: Ibeaaf927f44fe65f939d3d728c6fe642bcca595f
Jakub Pawlowski [Mon, 6 Nov 2017 20:17:30 +0000 (12:17 -0800)]
Move connectSocket into IBluetoothSocketManager (3/3)
Bug:
68359837
Test: none
Merged-In: I1161a5fe74b034fba0112fd3a78bdf1fbace6e12
Change-Id: I1161a5fe74b034fba0112fd3a78bdf1fbace6e12
Hall Liu [Fri, 10 Nov 2017 21:14:01 +0000 (21:14 +0000)]
Merge changes from topics "embms-cts-6", "embms-cts-5"
am:
f6b2b77e40
Change-Id: I1c740fee4e612253098aa56ebdb70dafc83c6f43
Hall Liu [Fri, 10 Nov 2017 21:10:01 +0000 (21:10 +0000)]
Add @TestApi for DownloadStateCallback CTS
am:
63c5fd60ac
Change-Id: I3ffa9e070f014a0280486cd5a9a58af205ac7aab
Hall Liu [Fri, 10 Nov 2017 20:46:19 +0000 (20:46 +0000)]
Merge changes from topics "embms-cts-6", "embms-cts-5"
* changes:
Add @TestApi for MbmsDownloadReceiver CTS
Add @TestApi for DownloadStateCallback CTS
Hall Liu [Fri, 10 Nov 2017 19:58:20 +0000 (19:58 +0000)]
Merge "Update Telecom APIs to include multi-hfp"
am:
025718e8f6
Change-Id: I08e0646c4dc20d45ea50d43d7e8b0deddf147bda
Hall Liu [Fri, 10 Nov 2017 19:49:01 +0000 (19:49 +0000)]
Merge "Update Telecom APIs to include multi-hfp"
Tetsutoki Shiozawa [Fri, 10 Nov 2017 16:57:22 +0000 (16:57 +0000)]
Merge "Fix: WindowManagerGlobal#setStoppedState failed by IOOBE"
am:
4741faa258
Change-Id: Ifc79d7ccd5d6837a39263b6ba9728f8b4d82f81d
Treehugger Robot [Fri, 10 Nov 2017 16:47:00 +0000 (16:47 +0000)]
Merge "Fix: WindowManagerGlobal#setStoppedState failed by IOOBE"