OSDN Git Service
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
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
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"
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
Jayachandran Chinnakkannu [Fri, 10 Nov 2017 00:53:54 +0000 (00:53 +0000)]
Merge "Remove the OEM hook implementation and usage" am:
413a308126
am:
80662de731
Change-Id: I1e184e76efe01daf33c559e0a2d723bd4e9fb110
Jayachandran Chinnakkannu [Fri, 10 Nov 2017 00:43:56 +0000 (00:43 +0000)]
Merge "Remove the OEM hook implementation and usage"
am:
413a308126
Change-Id: Ib81fa81a4a87f4378b9ab137a8c3eb5e386d1f0f
Jayachandran Chinnakkannu [Fri, 10 Nov 2017 00:31:39 +0000 (00:31 +0000)]
Merge "Remove the OEM hook implementation and usage"
Jonathan Dormody [Thu, 9 Nov 2017 23:53:14 +0000 (16:53 -0700)]
Docs: Fixed a typo by changing "retu rn" to "return"
Test: make ds-docs
Bug:
32830129
Change-Id: I86b359c2cf65fbd3c9d50569bf81fd669111055e
Hall Liu [Wed, 8 Nov 2017 01:59:28 +0000 (17:59 -0800)]
Update Telecom APIs to include multi-hfp
* Add bluetooth devices to CallAudioState
* Add methods for specifying a bluetooth device to InCallService
* Add methods for specifying a bluetooth device to Connection (for
self-managed connections)
Bug:
64767509
Test: unit tests
Change-Id: I286b19b423dc2ee417dbc90eda7e8055b2da2444
Jakub Pawlowski [Thu, 9 Nov 2017 23:04:28 +0000 (23:04 +0000)]
Merge changes from topics "parcel_uuid_and_fd_native", "bluetooth_socket_manager_native" am:
b2bde067c2
am:
64a1fbb8cf
Change-Id: I8e480c1ca3c1cdbd61e2b854bf4b42d1e81087ae
Victor Hsieh [Thu, 9 Nov 2017 18:32:10 +0000 (10:32 -0800)]
DO NOT MERGE Change pm.dexopt.priv-apps to .priv-apps-oob
Other than the renaming, the meaning is now opposite.
Test: build
Bug:
67415855
Bug:
63920015
Change-Id: I349c0b233079b5958e4a308d6c7ad9b3a54f157a
Adam Lesinski [Wed, 8 Nov 2017 01:08:07 +0000 (17:08 -0800)]
AAPT2: Workaround for feature splits without namespacing
Android Instant Apps in its current iteration does not use namespaces,
but due to limitations on the Android resource runtime, needs to make
it look like it does.
This is due to a bug that treats any package ID that's not 0x01 or 0x7F
as a shared library. Shared libraries require unique package names.
As a workaround, and since Android Instant Apps can not have a feature
depend on another feature, we can alter the resource package name of a
feature split just before writing it out to disk. This avoids using a
unique package name while linking, thereby avoiding namespace issues.
Bug:
68820737
Test: manual
Merged-In: Ic553ed42656436bbb949393d0248ee7bb9d37860
Change-Id: Ic553ed42656436bbb949393d0248ee7bb9d37860
Jakub Pawlowski [Thu, 9 Nov 2017 23:00:46 +0000 (23:00 +0000)]
Add IBluetoothSocketManager (3/3) am:
422af4d049
am:
6e78c792b1
Change-Id: I391f671746b852cb61ed0f8422726de111e888f9
Jakub Pawlowski [Thu, 9 Nov 2017 22:30:31 +0000 (22:30 +0000)]
Merge changes from topics "parcel_uuid_and_fd_native", "bluetooth_socket_manager_native"
am:
b2bde067c2
Change-Id: I3c067c01d6fba25022e80950eb77c3d98405b481
Jakub Pawlowski [Thu, 9 Nov 2017 22:25:29 +0000 (22:25 +0000)]
Add IBluetoothSocketManager (3/3)
am:
422af4d049
Change-Id: Ic246d5e4f5a62b3f201c700a007faaffe2ebf9e3
Jakub Pawlowski [Mon, 6 Nov 2017 20:16:25 +0000 (12:16 -0800)]
Move createSocketChannel into IBluetoothSocketManager (3/3)
Bug:
68359837
Test: none
Change-Id: I52b03ff3d637bf661c70279b7ca18b105157f7a2
Jakub Pawlowski [Thu, 9 Nov 2017 22:11:38 +0000 (22:11 +0000)]
Merge changes from topics "parcel_uuid_and_fd_native", "bluetooth_socket_manager_native"
* changes:
Make ParcelUuid and ParcelFileDescriptor accesible to native Binder (2/2)
Add IBluetoothSocketManager (3/3)
Hemant Gupta [Thu, 9 Nov 2017 22:01:32 +0000 (22:01 +0000)]
Merge "OBEX : Handle Negative index Exception" am:
08d23cf07a
am:
1c0778dd36
Change-Id: Ib9df175617a6b5a3a934caded6d44e6b7cd621b4
Hemant Gupta [Thu, 9 Nov 2017 21:51:52 +0000 (21:51 +0000)]
Merge "OBEX : Handle Negative index Exception"
am:
08d23cf07a
Change-Id: Icd513d2060cf1e8fe8fcd06bbedfc0ef5bf5a6fd
Treehugger Robot [Thu, 9 Nov 2017 21:12:43 +0000 (21:12 +0000)]
Merge "OBEX : Handle Negative index Exception"
Hemant Gupta [Wed, 28 Dec 2016 06:40:47 +0000 (12:10 +0530)]
OBEX : Handle Negative index Exception
Use case:
1. Send file to remote device.
2. Wait for accepting the file transfer on remote device.
Use Specific remote device(that sends some
optional headers).
Failure:
No file acceptance popup seen on remote device.
Root cause:
Crash in com.android.bluetooth.
FATAL EXCEPTION: BtOpp ClientThread
Process: com.android.bluetooth, PID: 22527
java.lang.NegativeArraySizeException: -3
at javax.obex.ObexHelper.updateHeaderSet(ObexHelper.java:216)
at javax.obex.ClientSession.sendRequest(ClientSession.java:568)
at javax.obex.ClientSession.connect(ClientSession.java:148)
at com.android.bluetooth.opp.BluetoothOppObexClientSession$ClientThread.
connect(BluetoothOppObexClientSession.java:317)
at com.android.bluetooth.opp.BluetoothOppObexClientSession$ClientThread.
run(BluetoothOppObexClientSession.java:231)
am_crash( 1402): [22527,0,com.android.bluetooth,
818462277,java.lang.
NegativeArraySizeException,-3,ObexHelper.java,216]
Fix:
Add length check before allocate memory and break loop if length is less than
expected header length as per OBEX Specification to prevent crash.
Test: Verified that OPP Tx and Rx works successfully multiple times.
Bug:
35588578
Change-Id: I805e6b1d51f69645d5132c3c18db2e752d04b096
Jakub Pawlowski [Wed, 1 Nov 2017 22:27:17 +0000 (15:27 -0700)]
Make ParcelUuid and ParcelFileDescriptor accesible to native Binder (2/2)
Bug:
68359837
Test: compile
Change-Id: I3cec0b5b20dde33be09a5bbc451cd79273c67961
Jakub Pawlowski [Wed, 1 Nov 2017 17:12:36 +0000 (10:12 -0700)]
Add IBluetoothSocketManager (3/3)
Add IBluetoothSocketManager native Binder implementation. Thanks to it
we'll skip jni to native calls, and need to re-serialize data manually.
Bug:
68359837
Test: none
Change-Id: I6c99717aa18ab41addf96b7536e483ae12802601
Jordan Liu [Thu, 9 Nov 2017 19:35:09 +0000 (19:35 +0000)]
Merge "Add config to use a display rule that ServiceState was considered" am:
bbaa19cad3
am:
cd89929497
Change-Id: Ibc4bcf689d31d0841f97eac67578705ccc59dc8f
Jordan Liu [Thu, 9 Nov 2017 18:51:30 +0000 (18:51 +0000)]
Merge "Add config to use a display rule that ServiceState was considered"
am:
bbaa19cad3
Change-Id: I7adbdcdcefaf86e9cf6775aa23aac2618149cf92
Jordan Liu [Thu, 9 Nov 2017 18:24:16 +0000 (18:24 +0000)]
Merge "Add config to use a display rule that ServiceState was considered"
Kevin Hufnagle [Thu, 9 Nov 2017 17:50:14 +0000 (09:50 -0800)]
docs: Added SQLite versions used on API levels 26 and 27.
The android.database.sqlite package summary page now mentions the
versions of SQLite that are available on Android devices running Oreo
(API level 26) and API level 27.
Test: make ds-docs -j16
Bug:
69106585
Change-Id: I77a323c58343fa978ade5397d613566ba25f00c2
Jon Dormody [Thu, 9 Nov 2017 16:42:19 +0000 (16:42 +0000)]
Merge "Docs: Added a link to Updating Your Security Provider to Protect Against SSL Exploits" into oc-dev am:
459735662f am:
13e959bbec
am:
d9696eb356
Change-Id: I616cd581d38cdae91c53b31325e08919efd92a8c
Jon Dormody [Thu, 9 Nov 2017 16:26:50 +0000 (16:26 +0000)]
Merge "Docs: Added a link to Updating Your Security Provider to Protect Against SSL Exploits" into oc-dev am:
459735662f
am:
13e959bbec
Change-Id: Ic15e947e38c10d394081598e2c2886854388996a
Jon Dormody [Thu, 9 Nov 2017 16:17:35 +0000 (16:17 +0000)]
Merge "Docs: Added a link to Updating Your Security Provider to Protect Against SSL Exploits" into oc-dev
am:
459735662f
Change-Id: I31f036fa2365084454ac7899d92580e985bd9f21
Jon Dormody [Thu, 9 Nov 2017 16:05:13 +0000 (16:05 +0000)]
Merge "Docs: Added a link to Updating Your Security Provider to Protect Against SSL Exploits" into oc-dev
Hugo Benichi [Thu, 9 Nov 2017 12:43:52 +0000 (12:43 +0000)]
Merge "MacAddress follow-up: define the core of the class" am:
cd35c65b5b
am:
d39a50350a
Change-Id: I1063cbb5a468818f68ee5406e52b6cd74c85c4bf
Hugo Benichi [Thu, 9 Nov 2017 12:34:40 +0000 (12:34 +0000)]
Merge "MacAddress follow-up: define the core of the class"
am:
cd35c65b5b
Change-Id: Ic86df7e56a63d3f84ccaebefa904c7625105c581
Hugo Benichi [Thu, 9 Nov 2017 12:22:17 +0000 (12:22 +0000)]
Merge "MacAddress follow-up: define the core of the class"
Hugo Benichi [Wed, 8 Nov 2017 15:22:25 +0000 (00:22 +0900)]
MacAddress follow-up: define the core of the class
Test: new unit test parts of $ runtest frameworks-net
Change-Id: I08c57d2d656802f7bdd7a93fde711a7e77247583
Andreas Gampe [Thu, 9 Nov 2017 03:40:32 +0000 (03:40 +0000)]
Merge "Revert "PMSCompilerMapping: Hardcode a value for pm.dexopt.inactive"" am:
08efd36872
am:
8249a5d677
Change-Id: I28aa38d66ab9c59c269157aff71edec5bd440942
Andreas Gampe [Thu, 9 Nov 2017 03:32:07 +0000 (03:32 +0000)]
Merge "Revert "PMSCompilerMapping: Hardcode a value for pm.dexopt.inactive""
am:
08efd36872
Change-Id: I97b6bbce9a969f06b923bebd60ccf9a5dee91e9e
Treehugger Robot [Thu, 9 Nov 2017 03:21:27 +0000 (03:21 +0000)]
Merge "Revert "PMSCompilerMapping: Hardcode a value for pm.dexopt.inactive""
Adam Lesinski [Mon, 6 Nov 2017 18:44:46 +0000 (10:44 -0800)]
AAPT2: Differentiate between Android and Java package names
Android package names are more strict (ASCII only) than Java package names.
Also fixed an issue where trailing underscores were disallowed in Android
package names.
Bug:
68468089
Test: make aapt2_tests
Merged-In: I1052e9e82b6617db6065ce448d9bf7972bb68d59
Change-Id: I1052e9e82b6617db6065ce448d9bf7972bb68d59
Jonathan Dormody [Wed, 8 Nov 2017 23:58:16 +0000 (16:58 -0700)]
Docs: Added a link to Updating Your Security Provider to Protect Against
SSL Exploits
Test: make ds-docs
Bug:
19110275
Change-Id: I3b0a35715c16c4e30a47aab9cbaf991770426c57
Brad Ebinger [Wed, 8 Nov 2017 23:13:35 +0000 (23:13 +0000)]
Merge "Remove ImsService Feature Interfaces" am:
abfdf0e03d
am:
61fb76d9a0
Change-Id: Ib8602579b1028fd086c4fc0a13897a671bb6b73e
Brad Ebinger [Wed, 8 Nov 2017 23:04:09 +0000 (23:04 +0000)]
Merge "Remove ImsService Feature Interfaces"
am:
abfdf0e03d
Change-Id: Ie142d4673c2a3930b3e7c3bcba617e5e26c8fb9c
Brad Ebinger [Wed, 8 Nov 2017 22:54:33 +0000 (22:54 +0000)]
Merge "Remove ImsService Feature Interfaces"
Ivan Lozano [Wed, 8 Nov 2017 20:28:30 +0000 (20:28 +0000)]
Merge "Disable integer sanitizer in release function." am:
969ceebc5d
am:
cd9e2c04fa
Change-Id: I0c586b04bf232703ddc33bf162ac82148f241e11
Ivan Lozano [Wed, 8 Nov 2017 20:20:06 +0000 (20:20 +0000)]
Merge "Disable integer sanitizer in release function."
am:
969ceebc5d
Change-Id: If880a4a81b11c32a5906ccc3f0d999ae515cfbc8
Ivan Lozano [Wed, 8 Nov 2017 20:07:36 +0000 (20:07 +0000)]
Merge "Disable integer sanitizer in release function."
yuemingw [Wed, 8 Nov 2017 19:45:14 +0000 (19:45 +0000)]
Merge "Add OWNED_BY field." am:
107141be5c
am:
9c7be233c3
Change-Id: Icf11a35867625a5a47450f5dc9a1b05ec00de502
yuemingw [Wed, 8 Nov 2017 19:36:44 +0000 (19:36 +0000)]
Merge "Add OWNED_BY field."
am:
107141be5c
Change-Id: Ib3ee22a0407881e6e7e754ea3504f5568c0ac31a
Treehugger Robot [Wed, 8 Nov 2017 19:28:37 +0000 (19:28 +0000)]
Merge "Add OWNED_BY field."
nharold [Wed, 8 Nov 2017 18:20:06 +0000 (18:20 +0000)]
Merge "Fix signature for finalize() to resolve API Lint error" am:
c8ff280e73
am:
c09d405e1d
Change-Id: I1f8915547876e0e0045724eb9a1e29123ab4edda
Benedict Wong [Wed, 8 Nov 2017 18:12:25 +0000 (18:12 +0000)]
Merge "Update documentation for AES-GCM-ESP keymat length" am:
3db35dfcd5
am:
6491b03410
Change-Id: I5e61a9c28dac49f2dca554ce2fdf755ab7be0dab
nharold [Wed, 8 Nov 2017 18:11:20 +0000 (18:11 +0000)]
Merge "Fix signature for finalize() to resolve API Lint error"
am:
c8ff280e73
Change-Id: I1ad1ee6abafea702d9bb64f45ebad5ea307f25ec
OSDN Git Service
