OSDN Git Service
Jeff Sharkey [Mon, 27 Nov 2017 21:30:57 +0000 (21:30 +0000)]
Merge "Clarify docs, sanity check roaming state."
am:
419ec05284
Change-Id: Ic30d5aaadf2c59978162c53d7e7781847244ce52
Jeff Sharkey [Mon, 27 Nov 2017 21:19:40 +0000 (21:19 +0000)]
Merge "Clarify docs, sanity check roaming state."
Jeff Sharkey [Thu, 9 Nov 2017 20:11:50 +0000 (13:11 -0700)]
Clarify docs, sanity check roaming state.
Update public docs to hide the fact that NetworkCapabilities is only
used inside NetworkRequest as an implementation detail.
Take up less room on the wire when passing NetworkCapabilities around
via NetworkRequest.
Sanity check that the roaming state between NetworkInfo and
NetworkCapabilities is in agreement.
Test: bit FrameworksNetTests:android.net.,com.android.server.net.,com.android.server.connectivity.,com.android.server.ConnectivityServiceTest
Bug:
67040695
Change-Id: I982b4c3c41a140934bbad3b8ca8f12dc3814e86c
Yifan Hong [Wed, 22 Nov 2017 23:06:33 +0000 (23:06 +0000)]
Merge "android.os.HidlSupport: add getPidIfSharable() for HALs"
am:
e72b6f0d31
Change-Id: I7ea5895cdfd09786732b597be600329a334c1cb4
Yifan Hong [Wed, 22 Nov 2017 22:51:19 +0000 (22:51 +0000)]
Merge "android.os.HidlSupport: add getPidIfSharable() for HALs"
Jordan Liu [Wed, 22 Nov 2017 22:17:47 +0000 (22:17 +0000)]
Merge "Update javadocs for ACTION_CONFIGURE_VOICEMAIL"
am:
80aefae026
Change-Id: Ie18492114c58d1c83c060712d2a936687353ea99
Jordan Liu [Wed, 22 Nov 2017 22:09:33 +0000 (22:09 +0000)]
Merge "Update javadocs for ACTION_CONFIGURE_VOICEMAIL"
Brad Ebinger [Wed, 22 Nov 2017 19:23:16 +0000 (19:23 +0000)]
Merge "Refactor ImsService to AIDL"
am:
8a02c63f16
Change-Id: I195d7ccff8498241b6c7be819d2ee96b661d51e1
Brad Ebinger [Wed, 22 Nov 2017 19:16:21 +0000 (19:16 +0000)]
Merge "Refactor ImsService to AIDL"
Hugo Benichi [Wed, 22 Nov 2017 05:19:01 +0000 (05:19 +0000)]
Merge "Light refactors to packet wakeup events."
am:
e887e2b9c1
Change-Id: I40f637114cbfc04bce4058af0a1f43f38bd461db
Hugo Benichi [Wed, 22 Nov 2017 05:08:50 +0000 (05:08 +0000)]
Merge "Light refactors to packet wakeup events."
Jonathan Basseri [Wed, 22 Nov 2017 01:51:46 +0000 (01:51 +0000)]
Merge "Javadoc cleanup of IpSecManager API."
am:
d09d106ec0
Change-Id: Iaf206b0980d3bed14fe6b8318d2073577212b460
Jonathan Basseri [Wed, 22 Nov 2017 01:32:06 +0000 (01:32 +0000)]
Merge "Javadoc cleanup of IpSecManager API."
Hugo Benichi [Tue, 14 Nov 2017 13:42:46 +0000 (22:42 +0900)]
Light refactors to packet wakeup events.
This patch uses the recently added MacAddress class in WakeupEvent and
WakeupStats for replacing the byte array representation of dest mac
addresses in packet wakeup events.
Bug:
28806131
Test: runtest frameworks-net
Merged-In: I5a3c76498a4b720f0d9308a65b5dd4b32377d0d1
(partial cherry pick from
884970e0ba74c96f7c375454d3c58bb3fdc0bf46)
Change-Id: I878d51d4cc53c6d9a2cc3c55faa15b86156afbd7
Malcolm Chen [Tue, 21 Nov 2017 23:18:13 +0000 (23:18 +0000)]
Merge "Provide materials for Mobile network settings UI."
am:
8b759f234b -s ours
Change-Id: I1e4627084e000f0e3a45005b4a2df34e51fcc0fa
Treehugger Robot [Tue, 21 Nov 2017 23:05:21 +0000 (23:05 +0000)]
Merge "Provide materials for Mobile network settings UI."
tiansiming [Tue, 21 Nov 2017 22:40:35 +0000 (22:40 +0000)]
Merge "Avoid clearing default browser setting when unnecessary"
am:
ef32746fc5
Change-Id: I647c96b9a96612c4745e6ebec5d44cebd6d42767
Treehugger Robot [Tue, 21 Nov 2017 22:22:08 +0000 (22:22 +0000)]
Merge "Avoid clearing default browser setting when unnecessary"
Andreas Gampe [Tue, 21 Nov 2017 20:55:13 +0000 (20:55 +0000)]
Merge "PackageManager: Extend cmd interface feedback"
am:
d66bc0aaae
Change-Id: Ic89e1e9e4b5e250bc867d288cf4870690926248c
Treehugger Robot [Tue, 21 Nov 2017 20:38:18 +0000 (20:38 +0000)]
Merge "PackageManager: Extend cmd interface feedback"
Andreas Gampe [Tue, 21 Nov 2017 01:03:17 +0000 (17:03 -0800)]
PackageManager: Extend cmd interface feedback
When running cmd package compile -a, print the progress, as this
may be a long-running operation.
Test: m
Test: manual
Merged-In: Ic5c8123f972656b722da882d6a19d555b8c60832
Change-Id: Ic5c8123f972656b722da882d6a19d555b8c60832
Malcolm Chen [Tue, 21 Nov 2017 00:48:30 +0000 (00:48 +0000)]
Merge "Adding "Mobile data" and "Data usage" button in mobile settings."
am:
06e314f6cc -s ours
Change-Id: I3e7e4818688b8e046499513557825809772a1085
Treehugger Robot [Tue, 21 Nov 2017 00:35:42 +0000 (00:35 +0000)]
Merge "Adding "Mobile data" and "Data usage" button in mobile settings."
Chih-hung Hsieh [Mon, 20 Nov 2017 21:33:00 +0000 (21:33 +0000)]
Merge "Use -Werror in frameworks/base"
am:
a29836ad04
Change-Id: Ie76322acc3b471da60a033cfa2474c1039d70339
Philip P. Moltmann [Mon, 20 Nov 2017 21:19:57 +0000 (21:19 +0000)]
Merge "Make SharedPreferences check with higher precision"
am:
9ca31879b0 -s ours
Change-Id: Ie7065c2281bdf6a97af69c2d758d4c2ff55956ae
Chih-hung Hsieh [Mon, 20 Nov 2017 21:18:52 +0000 (21:18 +0000)]
Merge "Use -Werror in frameworks/base"
Treehugger Robot [Mon, 20 Nov 2017 21:04:10 +0000 (21:04 +0000)]
Merge "Make SharedPreferences check with higher precision"
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"
Yifan Hong [Wed, 15 Nov 2017 00:14:04 +0000 (16:14 -0800)]
android.os.HidlSupport: add getPidIfSharable() for HALs
... that returns PID of the process for debuggable builds.
This calls into the C++ equivalent of the function.
Test: lshal
Bug:
68992575
Change-Id: Ia177c709c6930510035cff33dc2389441a76351d
Chih-Hung Hsieh [Mon, 20 Nov 2017 18:57:19 +0000 (10:57 -0800)]
Use -Werror in frameworks/base
Bug:
66996870
Test: build with WITH_TIDY=1
Change-Id: Ibfe36a62d9a91b7df813b42e18dafaa58dc8b60d
Jonathan Basseri [Fri, 21 Apr 2017 22:53:51 +0000 (15:53 -0700)]
Javadoc cleanup of IpSecManager API.
This changes only comments and annotations, which results
in minor API changes.
Bug:
63777932
Test: `make update-api` and visually inspect generated HTML.
Change-Id: I7a7a9244eade6cc55aca17a47e0a838cd6f84cc9
Philip P. Moltmann [Mon, 17 Jul 2017 19:41:53 +0000 (12:41 -0700)]
Make SharedPreferences check with higher precision
When two processes modify shared preferences we use the timestamp to
figure out if the file was changes underneath. Do this with the highest
precision available (instead of sec) as before.
It would be possible to make the check more reliable by writing a unique
id to the shared pref file, but this would make this check much more
expensive in the common case that nothing changed. Considering that this
has not been a problem and we don't officially give any guarantee for
this sounds like a good middle-ground.
(cherry picked from commit
ffe74357aec5330098795000e131e8d581b8b274)
Merged-In: I04c96b6a946618d5599c26410c88d7cd654d31fb
Change-Id: I04c96b6a946618d5599c26410c88d7cd654d31fb
Test: SharedPreferencesTest
Fixes:
62949739
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"
Brad Ebinger [Thu, 9 Nov 2017 18:22:49 +0000 (10:22 -0800)]
Refactor ImsService to AIDL
The ImsService was originally designed as a flat
interface, all ImsFeatures would be forwarded
through ImsService. This has been refactored to
using AIDL interfaces for each feature, as it
is more straightforward.
Test: Manual, Telephony IMS Unit Tests
Change-Id: Ibe065ddec6f180eabda03cf06f842c642a11114f
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