OSDN Git Service
Hugo Benichi [Wed, 22 Nov 2017 05:27:11 +0000 (05:27 +0000)]
Merge "Light refactors to packet wakeup events." am:
e887e2b9c1
am:
c6dc6baf4f
Change-Id: I4c19f1cdfe7a9fb47aad23a21b0aa0ae8e03277a
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 02:00:53 +0000 (02:00 +0000)]
Merge "Javadoc cleanup of IpSecManager API." am:
d09d106ec0
am:
2a82aa70b5
Change-Id: I53e9b3d18fda1122f6a8a6300185c743cc26dbf6
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:29:53 +0000 (23:29 +0000)]
Merge "Provide materials for Mobile network settings UI." am:
8b759f234b -s ours
am:
4b7d25e374 -s ours
Change-Id: I71fa4cdd2170bc1ccf39f04f092ea9447f988d1f
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:49:19 +0000 (22:49 +0000)]
Merge "Avoid clearing default browser setting when unnecessary" am:
ef32746fc5
am:
3ee9594a27
Change-Id: If8d39e9cb350861913deda62b1351d8a4e52607a
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 21:04:36 +0000 (21:04 +0000)]
Merge "PackageManager: Extend cmd interface feedback" am:
d66bc0aaae
am:
362a3b9e2a
Change-Id: I7b3ba7adde559c66ed9b8c02d5dd8134a9aa2b38
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:58:19 +0000 (00:58 +0000)]
Merge "Adding "Mobile data" and "Data usage" button in mobile settings." am:
06e314f6cc -s ours
am:
959385c314 -s ours
Change-Id: Ie6d211fd5ebfeb5a191e1d96a7d3bb37ee9b7d23
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."
Bill Yi [Mon, 20 Nov 2017 22:27:19 +0000 (22:27 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
c7d9045105 -s ours
Change-Id: I4e65a2c460b3bcfa2e258a2952677b16d89e4d85
TreeHugger Robot [Mon, 20 Nov 2017 22:13:17 +0000 (22:13 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Chih-hung Hsieh [Mon, 20 Nov 2017 21:40:59 +0000 (21:40 +0000)]
Merge "Use -Werror in frameworks/base" am:
a29836ad04
am:
267a2a8c8a
Change-Id: Ibfc63a029813ef952dc94f11baae7a96850e94d6
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:27:45 +0000 (21:27 +0000)]
Merge "Make SharedPreferences check with higher precision" am:
9ca31879b0 -s ours
am:
79d7319d7e -s ours
Change-Id: Ifd52e21336a32ecd195e61336ac90777ba990925
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:44:02 +0000 (20:44 +0000)]
Merge "Add output file and dependencies to fontchain_lint" am:
b0a3e9dc83
am:
4db8be0bb3
Change-Id: Ied0b30fca889b55dbf4d0c7075424cf6244178b3
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"
Bill Yi [Mon, 20 Nov 2017 19:51:02 +0000 (11:51 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ic8d1823c3ff2b69bbbe2d215cb8981dc97cbed41
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
Donald Chai [Sat, 18 Nov 2017 03:19:30 +0000 (03:19 +0000)]
Merge "AAPT2: whitelist alphanums instead of blacklisting hyphens in package names." into oc-mr1-dev
am:
e7b0a330db
Change-Id: I7943dc35ceeca0c3fdb4df668a761889cd0add2d
TreeHugger Robot [Sat, 18 Nov 2017 03:03:19 +0000 (03:03 +0000)]
Merge "AAPT2: whitelist alphanums instead of blacklisting hyphens in package names." into oc-mr1-dev
Cassie [Sat, 18 Nov 2017 00:39:17 +0000 (00:39 +0000)]
Merge "Update the comments for all CellIdentity*." am:
2610ad0556
am:
4f95fd8532
Change-Id: I8ee47862cb6651baae20a79360f7c0c9a94137cc
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*."
Nan Zhang [Fri, 17 Nov 2017 22:20:57 +0000 (22:20 +0000)]
Merge "Build fontchain_lint using python_binary_host" am:
7ecac139ea
am:
7ade558ad2
Change-Id: Ie920005b39a476b281333b12fbed9e586a2ce3e7
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:36:07 +0000 (19:36 +0000)]
Merge "Add missing } on @link tag." am:
31b0c6fb32
am:
80bfc216ca
Change-Id: Id241939f950517df7b09171913c958cdc6360a3b
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:12:52 +0000 (19:12 +0000)]
Merge "Allow unknown mcc/mnc when constructing a CellIdentity from Parcel." am:
3df706dcd9
am:
ea01b02f71
Change-Id: I8871aeb7f3d1618883439df6f78f2d34955cc29e
Ahmad Melegy [Fri, 17 Nov 2017 19:04:55 +0000 (19:04 +0000)]
Merge "Fix typo" am:
913f396c11
am:
8c7c6e3952
Change-Id: Ieed26cd7bb6be66c6084dd0fc8f0dcc05d9156d0
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:55:15 +0000 (02:55 +0000)]
Merge "Workaround to get passed the broken install flow" am:
b0e6508a5b
am:
af657ae978
Change-Id: I57ba9c85e4d5b4e301cb14ba068430c4454a4978
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:29:10 +0000 (02:29 +0000)]
Merge "Telephony: Allow custom looper for OnSubscriptionsChangedListener" am:
8055aec0da
am:
a3185b2ff2
Change-Id: Iaa074f6d99742605537c9f406c848a470c2c777c
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:48:14 +0000 (01:48 +0000)]
Merge "Add getProfileParentId (1/2)" am:
7a2c66359a
am:
b6946d8563
Change-Id: I3fe6f4300c9321fc57479fc4a9e952d2aa0c73cc
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 23:02:43 +0000 (23:02 +0000)]
Merge "Add MediaMetadata equals to make metadata comparisons easier" am:
12bc5b6289
am:
171dec7468
Change-Id: Ie210bbb4a9231377b795ca86219dfab7ee59ff8c
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:59:36 +0000 (18:59 +0000)]
Merge "Bluetooth HID Device API docs and helper" am:
a89f6150dc
am:
7c005ea373
Change-Id: Ic95f83d9884aea8d75ca33fed1ddf69d6c0e33e3
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:54:51 +0000 (01:54 +0000)]
Merge "API declarations for Call Handover." am:
d88abc7b60
am:
c376ca6bc1
Change-Id: Icac2039c60928af408d011c0062bcdcf4f207039
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
Cassie Han [Wed, 15 Nov 2017 23:43:55 +0000 (23:43 +0000)]
Merge "Revert "Allow unknown mcc/mnc when constructing a CellIdentity from Parcel."" am:
9b08e4cb8d
am:
866d2d553e
Change-Id: I1afee7200c84bc0058ce394c49eaaf46a917793f
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:50:22 +0000 (22:50 +0000)]
Merge "IP connectivity metrics: fix LINGER/UNLINGER logging" am:
e28513f150
am:
ec039b943a
Change-Id: I422ef3cd6eab19cf3de2d6d9520840a7597c4a65
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:31:37 +0000 (20:31 +0000)]
Merge "Add test case for user quota management in IpSecService" am:
cf1a4614e1
am:
c9c65317e8
Change-Id: I1022151e9317194ac45501a59f68c9bba89e16df
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 19:08:30 +0000 (19:08 +0000)]
Merge "Avoid overflow in focus fudge calculation" am:
795d4a5aa4
am:
e842e266a6
Change-Id: I0509b4debdf634075df7d8f63516d0b8e18e4b8c
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:24:50 +0000 (18:24 +0000)]
Merge "Bluetooth: Use elapsed real time for calculating onDuration" am:
22b12e6b06
am:
e57c02e860
Change-Id: If51a8d59d621cc9578d95df7d86903cec5628935
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
Bill Yi [Wed, 15 Nov 2017 03:32:04 +0000 (03:32 +0000)]
Import translations. DO NOT MERGE
am:
16277b2ac0 -s ours
Change-Id: Ibcda38cf1604c2eb125a6d42643cd43ea2736924
Koji Fukui [Wed, 15 Nov 2017 02:42:44 +0000 (02:42 +0000)]
Merge "Remove AutofillManagerClient after AutofillManager is finalized" am:
dd5384a4fe
am:
8d36beec24
Change-Id: I76ac103f2d6df4a32a49c0c460344a8049d7d3c3
OSDN Git Service
