OSDN Git Service
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
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
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."
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."
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 20:07:15 +0000 (20:07 +0000)]
Merge "Update Telecom APIs to include multi-hfp" am:
025718e8f6
am:
3dd41b7b29
Change-Id: I27922fafa9c092e281c80fc6aa5f96c8e4e0c461
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"
Adam Lesinski [Fri, 10 Nov 2017 17:50:49 +0000 (17:50 +0000)]
Merge "AAPT2: Differentiate between Android and Java package names" into oc-mr1-dev
am:
07d8249c4b
Change-Id: I0a3235052cea9041cf6c944f71879d304bce5a56
Jon Dormody [Fri, 10 Nov 2017 17:39:42 +0000 (17:39 +0000)]
Merge "Docs: Fixed a typo by changing "retu rn" to "return"" into oc-dev am:
ec741b83a3 am:
719e8b5412
am:
430ed07596
Change-Id: I672d6c2ff08bbe91c12bfacbe3b493ca17613ce1
Adam Lesinski [Fri, 10 Nov 2017 17:32:52 +0000 (17:32 +0000)]
Merge "AAPT2: Differentiate between Android and Java package names" into oc-mr1-dev
Jon Dormody [Fri, 10 Nov 2017 17:28:30 +0000 (17:28 +0000)]
Merge "Docs: Fixed a typo by changing "retu rn" to "return"" into oc-dev am:
ec741b83a3
am:
719e8b5412
Change-Id: I779bd97e6668809dfadf50d4361b6b88ee4ee710
Jon Dormody [Fri, 10 Nov 2017 17:14:04 +0000 (17:14 +0000)]
Merge "Docs: Fixed a typo by changing "retu rn" to "return"" into oc-dev
am:
ec741b83a3
Change-Id: I9d170c0baf186d074c77d2a98bd60bee66bfd701
Android Build Merger (Role) [Fri, 10 Nov 2017 17:13:37 +0000 (17:13 +0000)]
Merge "Merge "docs: Added SQLite versions used on API levels 26 and 27." into oc-mr1-dev am:
9e628b60ba" into oc-mr1-dev-plus-aosp
Kevin Hufnagle [Fri, 10 Nov 2017 17:10:14 +0000 (17:10 +0000)]
Merge "docs: Added SQLite versions used on API levels 26 and 27." into oc-mr1-dev
am:
9e628b60ba
Change-Id: Ic5825ded0298478088f25fb0b0d14e2a8c9cc27a
Tetsutoki Shiozawa [Fri, 10 Nov 2017 17:06:04 +0000 (17:06 +0000)]
Merge "Fix: WindowManagerGlobal#setStoppedState failed by IOOBE" am:
4741faa258
am:
949ea9bb2a
Change-Id: I8bc04464519557a7af8e4792f30bad901d206052
Kevin Hufnagle [Fri, 10 Nov 2017 17:01:17 +0000 (17:01 +0000)]
Merge "docs: Added SQLite versions used on API levels 26 and 27." into oc-mr1-dev
Jon Dormody [Fri, 10 Nov 2017 16:58:17 +0000 (16:58 +0000)]
Merge "Docs: Fixed a typo by changing "retu rn" to "return"" into oc-dev
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"
Yoshinori Hirano [Fri, 10 Nov 2017 15:25:16 +0000 (15:25 +0000)]
Merge "Send broadcast when location mode is about to change DO NOT MERGE" am:
a524e7d87d -s ours
am:
120f85a516
Change-Id: I00d764427db65fd2dcc8a93846cbe825a91b33ac
Yoshinori Hirano [Fri, 10 Nov 2017 15:15:44 +0000 (15:15 +0000)]
Merge "Send broadcast when location mode is about to change DO NOT MERGE"
am:
a524e7d87d -s ours
Change-Id: I5af03e211cda75d016131db6001ac6b79836a018
Treehugger Robot [Fri, 10 Nov 2017 15:07:04 +0000 (15:07 +0000)]
Merge "Send broadcast when location mode is about to change DO NOT MERGE"
Victor Hsieh [Fri, 10 Nov 2017 10:41:58 +0000 (10:41 +0000)]
Merge "DO NOT MERGE Change pm.dexopt.priv-apps to .priv-apps-oob" am:
41f1ef8c02 -s ours
am:
69692df44e
Change-Id: Ie309cd0f3441719e8b63a584aad547ee3ef9d833
Victor Hsieh [Fri, 10 Nov 2017 10:32:37 +0000 (10:32 +0000)]
Merge "DO NOT MERGE Change pm.dexopt.priv-apps to .priv-apps-oob"
am:
41f1ef8c02 -s ours
Change-Id: Icf296e0f93486f2ab9c9a1bdd6e8274b58341809
Treehugger Robot [Fri, 10 Nov 2017 10:22:17 +0000 (10:22 +0000)]
Merge "DO NOT MERGE Change pm.dexopt.priv-apps to .priv-apps-oob"
Adam Lesinski [Fri, 10 Nov 2017 10:13:26 +0000 (10:13 +0000)]
Merge "AAPT2: Workaround for feature splits without namespacing" into oc-mr1-dev
am:
751e69b38b
Change-Id: I8791a0cbfb32c25a0c73552c47509cce1d5f06e2
TreeHugger Robot [Fri, 10 Nov 2017 10:01:37 +0000 (10:01 +0000)]
Merge "AAPT2: Workaround for feature splits without namespacing" into oc-mr1-dev
Jakub Pawlowski [Fri, 10 Nov 2017 08:31:40 +0000 (08:31 +0000)]
Merge "Move createSocketChannel into IBluetoothSocketManager (3/3)" am:
3e9b9b74b4
am:
7b38581ded
Change-Id: I87b40395aa73c8f2d159adf2ac46a95cc70f300c
Jakub Pawlowski [Fri, 10 Nov 2017 08:22:05 +0000 (08:22 +0000)]
Merge "Move createSocketChannel into IBluetoothSocketManager (3/3)"
am:
3e9b9b74b4
Change-Id: Ic98a1281eb6f3f6d1deb450c5123913b2c8d25a6
Treehugger Robot [Fri, 10 Nov 2017 08:11:26 +0000 (08:11 +0000)]
Merge "Move createSocketChannel into IBluetoothSocketManager (3/3)"
Yoshinori Hirano [Tue, 24 Oct 2017 09:23:09 +0000 (18:23 +0900)]
Send broadcast when location mode is about to change DO NOT MERGE
Send "com.android.settings.location.MODE_CHANGING" broadcast intent
when the location mode is about to be changed on Settings app or
Quick Settings.
Fixes:
28057031
Test: manual - turn the location setting on
Change-Id: Ia2db3554755a643609cfb5f0fc30f2dc2cc1beeb