OSDN Git Service
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"
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
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"
Xin Li [Wed, 15 Nov 2017 01:30:08 +0000 (01:30 +0000)]
Merge commit '
98e12851336b7db16e583f9afac63ecc97465980' from oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-
am:
220871a697 -s ours
Change-Id: I2d08ca9a952babfd1480278ca6331b697be2a32e
Bill Yi [Tue, 14 Nov 2017 23:52:57 +0000 (15:52 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I919a3f3b5178a31b309ba22c593d5a16875a6e74
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>
yinxu [Tue, 14 Nov 2017 20:32:59 +0000 (20:32 +0000)]
Merge "Fix the comments of onError() callback" am:
5f291e5e06
am:
802f191b2b
Change-Id: I949d1c3ed1155af86e19428ca1e4877303baaaa7
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:55:16 +0000 (19:55 +0000)]
Merge "TimePickerDialog OTG keyboard entry discarded" am:
8c2cb6ff08
am:
2973f63816
Change-Id: Ia9904d1654ec70e1c039d8f1fed6c1211863ee38
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:19:57 +0000 (17:19 +0000)]
Merge "Better, consistent definition of AID_SHARED_GID." am:
7e875df695
am:
42064a3aa2
Change-Id: I85979f6f70bbef34d6041495310b442cb0405d2d
Cassie [Tue, 14 Nov 2017 17:07:26 +0000 (17:07 +0000)]
Merge "Allow unknown mcc/mnc when constructing a CellIdentity from Parcel." am:
45e1c58591
am:
59439e38a6
Change-Id: Ia6ff98854a32b54b5f4a2bb8c5b533e62ff27b65
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:24:31 +0000 (13:24 +0000)]
Merge "Stop using c.a.i.u.Predicate outside test-runner" am:
ee2fb3c59e
am:
847df2cafc
Change-Id: I3d5f64b3551df8d5b3af1a18dfd63147fa186df7
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:14:34 +0000 (03:14 +0000)]
Merge "Create secondary dex profiles relative to the provided dex path" am:
f7f5732e2c
am:
310bc2b571
Change-Id: Ic639fd4d9f0e0a76669c1dd05bc0c0a86f84a074
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"
brycelee [Tue, 14 Nov 2017 02:08:33 +0000 (02:08 +0000)]
Merge "DO NOT MERGE Remove orientation restriction to only fullscreen activities." am:
62893396bd -s ours
am:
09494f6c01
Change-Id: I22d823483b8db90bb6a8721c0a91be609776d4f2
Jordan Liu [Tue, 14 Nov 2017 01:57:39 +0000 (01:57 +0000)]
Merge "Customize the default value of Enhanced 4G LTE mode" am:
0f113b2f25
am:
df79be072d
Change-Id: I65d3b0a60ad69cb6e5c07297eeb8166230b9f720
Koji Fukui [Tue, 14 Nov 2017 01:51:30 +0000 (01:51 +0000)]
Merge "Stop observing death of PrintManager listener when it is removed" am:
e7240a52e2
am:
5cb172d17e
Change-Id: I2169c5d3a0a1d8b4bd6729c4ca56b7a1de2a6249
Hugo Benichi [Tue, 14 Nov 2017 01:46:23 +0000 (01:46 +0000)]
Merge "IP connectivity metrics: NetworkEvents have transports" am:
f8fdb06c27
am:
f3ada43f6e
Change-Id: I8cd50ea805fe3e533c0fc21b220827155cb0d23b
Hugo Benichi [Tue, 14 Nov 2017 01:40:06 +0000 (01:40 +0000)]
Merge "Add L2~L4 information to packet wakeup logs and metrics" am:
6ee20ca7d3
am:
ab15f7fc64
Change-Id: I9dba29b10c824d382b08b16313e49cc8c775f7eb
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
Hugo Benichi [Tue, 14 Nov 2017 01:35:24 +0000 (01:35 +0000)]
Merge "Add Network security watchlist service" am:
e672ab4c0a
am:
1aff5336e0
Change-Id: I08c10fccb2a8c814c1bedb6ad2a17b843a5af722
Pirama Arumuga Nainar [Tue, 14 Nov 2017 01:28:33 +0000 (01:28 +0000)]
Merge "Remove GCC-specific pragma and disabled Clang warning" am:
bcf27fa6a7
am:
48a80c1a27
Change-Id: Ib564870756d7dc89c7e65c9fa50439a65cd3f115
Jakub Pawlowski [Tue, 14 Nov 2017 01:23:04 +0000 (01:23 +0000)]
Merge "Move connectSocket into IBluetoothSocketManager (3/3)" am:
8d742759cc
am:
9c26701b35
Change-Id: I8d0d486b73f8b8130db216a42f1ff045875e3849
Hall Liu [Tue, 14 Nov 2017 01:16:42 +0000 (01:16 +0000)]
Merge changes from topics "embms-cts-6", "embms-cts-5" am:
f6b2b77e40
am:
2cd6464e9b
Change-Id: I33811f8c6198da52d7ec5a863528e8c6ed723f2d
Hall Liu [Tue, 14 Nov 2017 01:11:51 +0000 (01:11 +0000)]
Add @TestApi for DownloadStateCallback CTS am:
63c5fd60ac
am:
b96d49e91f
Change-Id: I6ba017e942c0da8a345e34b45badde6662a5abdd
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"