OSDN Git Service
Ashutosh Joshi [Wed, 21 Dec 2016 00:34:41 +0000 (16:34 -0800)]
Move ContextHubService to a better location.
Move ContextHub service from system core to a more appropriate place
for a service.
Test: GTS tests pass.
Change-Id: Ie0f25414fc472a0214c0dd94e7ad4564cd38f842
Android Build Merger (Role) [Mon, 19 Dec 2016 18:46:46 +0000 (18:46 +0000)]
Merge changes from topic 'am-
2e3c510745c349ef8379b216cc85be0a'
* changes:
Merge changes I1450c126,I8926a922,I54403377,Idf216797 into nyc-mr2-dev am:
85f3996d72 am:
2cb7bad13e
DO NOT MERGE IP Connectivity metrics: add connect() statistics am:
2299a1c401 am:
e55546a127 -s ours
DO NOT MERGE Fix IP connectivity metrics tests am:
93c0de0a35 am:
6b480eca3f -s ours
DO NOT MERGE IP connectivity metrics: introduce ConnectStatistics and DNS statistics am:
097bde6c8f am:
3fc3dc2602 -s ours
DO NOT MERGE IP connectivity metrics: add transport field. am:
4c9d3f19cd am:
66346ab78c -s ours
Hugo Benichi [Mon, 19 Dec 2016 18:43:55 +0000 (18:43 +0000)]
Merge changes I1450c126,I8926a922,I54403377,Idf216797 into nyc-mr2-dev am:
85f3996d72
am:
2cb7bad13e
Change-Id: If2ba4a13847da63a8596195afbc302693c49eeb3
Hugo Benichi [Mon, 19 Dec 2016 18:43:05 +0000 (18:43 +0000)]
DO NOT MERGE IP Connectivity metrics: add connect() statistics am:
2299a1c401
am:
e55546a127 -s ours
Change-Id: I667c809069821d722d912c68b04ebabf861617fc
Hugo Benichi [Mon, 19 Dec 2016 18:42:07 +0000 (18:42 +0000)]
DO NOT MERGE Fix IP connectivity metrics tests am:
93c0de0a35
am:
6b480eca3f -s ours
Change-Id: I5ccac93d3815a7ad967fa1494d6e48220beaf88b
Sergei Vasilinetc [Mon, 19 Dec 2016 18:41:15 +0000 (18:41 +0000)]
Merge "Support Bitmap.copy for hardware bitmaps"
Hugo Benichi [Mon, 19 Dec 2016 18:40:59 +0000 (18:40 +0000)]
DO NOT MERGE IP connectivity metrics: introduce ConnectStatistics and DNS statistics am:
097bde6c8f
am:
3fc3dc2602 -s ours
Change-Id: I8248f4b65f7e7cf208693fa4b9bc60b8c5c61d03
Hugo Benichi [Mon, 19 Dec 2016 18:40:10 +0000 (18:40 +0000)]
DO NOT MERGE IP connectivity metrics: add transport field. am:
4c9d3f19cd
am:
66346ab78c -s ours
Change-Id: I6bf335abf876cdf4e7b7e33ea4317039405627a7
Android Build Merger (Role) [Mon, 19 Dec 2016 18:39:50 +0000 (18:39 +0000)]
Merge "Merge changes Iadf7f15d,I74702938,Ib8a725cd into nyc-mr2-dev am:
05d36569b6 am:
58b3f35e9f"
Philipp Weiß [Mon, 19 Dec 2016 18:39:40 +0000 (18:39 +0000)]
Merge "Rework Device Monitoring Dialog in Quicksettings"
Hugo Benichi [Mon, 19 Dec 2016 18:38:36 +0000 (18:38 +0000)]
Merge changes Iadf7f15d,I74702938,Ib8a725cd into nyc-mr2-dev am:
05d36569b6
am:
58b3f35e9f
Change-Id: I31100e69ff88052daf387adf9063abdaa1ce4db2
Android Build Merger (Role) [Mon, 19 Dec 2016 18:38:08 +0000 (18:38 +0000)]
Merge "DO NOT MERGE Network notifications: revamp keying scheme am:
84daaea8fd am:
7f907b0341 -s ours"
Hugo Benichi [Mon, 19 Dec 2016 18:36:10 +0000 (18:36 +0000)]
DO NOT MERGE Network notifications: revamp keying scheme am:
84daaea8fd
am:
7f907b0341 -s ours
Change-Id: Id9b2466b97aa706a57434520ffcec78140563e1c
Android Build Merger (Role) [Mon, 19 Dec 2016 18:35:45 +0000 (18:35 +0000)]
Merge "DO NOT MERGE Define Network notification proto constants. am:
065acc5a6c am:
4778249ab0 -s ours"
Hugo Benichi [Mon, 19 Dec 2016 18:34:51 +0000 (18:34 +0000)]
DO NOT MERGE Define Network notification proto constants. am:
065acc5a6c
am:
4778249ab0 -s ours
Change-Id: I3efb0a3632c8d97d765448f690d414a1304d9726
Android Build Merger (Role) [Mon, 19 Dec 2016 18:34:27 +0000 (18:34 +0000)]
Merge "DO NOT MERGE Unit tests for NetworkNotificationManager am:
d3da17a260 am:
04507a635b -s ours"
Hugo Benichi [Mon, 19 Dec 2016 18:33:39 +0000 (18:33 +0000)]
DO NOT MERGE Unit tests for NetworkNotificationManager am:
d3da17a260
am:
04507a635b -s ours
Change-Id: Idd8f1032790fea21bf69a7e8e00744f0a1e5c3c5
Android Build Merger (Role) [Mon, 19 Dec 2016 18:33:09 +0000 (18:33 +0000)]
Merge changes from topic 'am-
f02ad5c3f5b3496088762ec97d2006ca'
* changes:
Merge "DO NOT MERGE Netd events: record connect() success/errno" into nyc-mr2-dev am:
64bc2580e3 am:
7f58ca8af4 -s ours
DO NOT MERGE Netd events: record connect() success/errno am:
e8fe0aaab9 am:
2f30e611eb -s ours
Manu Cornet [Mon, 19 Dec 2016 18:32:14 +0000 (18:32 +0000)]
Merge "2d Recents: show full task thumbnail and don't overlap header"
Hugo Benichi [Mon, 19 Dec 2016 18:31:39 +0000 (18:31 +0000)]
Merge "DO NOT MERGE Netd events: record connect() success/errno" into nyc-mr2-dev am:
64bc2580e3
am:
7f58ca8af4 -s ours
Change-Id: I75ad49afa95f8c4d401bb86527ca6ecd7473c136
Manu Cornet [Mon, 19 Dec 2016 18:31:29 +0000 (18:31 +0000)]
Merge "2D Recents: tweak task view header height"
Hugo Benichi [Mon, 19 Dec 2016 18:30:46 +0000 (18:30 +0000)]
DO NOT MERGE Netd events: record connect() success/errno am:
e8fe0aaab9
am:
2f30e611eb -s ours
Change-Id: I7eb91b8907c07da6b2501d89be3deab2ed0ea543
Hugo Benichi [Mon, 19 Dec 2016 18:29:41 +0000 (18:29 +0000)]
Captive portals: login activity probes like NetworkMonitor am:
cdf3ba48cc
am:
403ea607a5
Change-Id: I57a5a1a92385d4a3bf2fdd6bedeaf93430ecc158
Michael Rosenfeld [Mon, 19 Dec 2016 18:28:38 +0000 (18:28 +0000)]
Merge "Clean up local hprofs" am:
9ab94e15c7 am:
1876d82450 am:
67fd9f3968
am:
bf5546b1e2
Change-Id: I0a84ef4f43e10cc9692b5541eb3379b042daab17
Marie Janssen [Mon, 19 Dec 2016 18:27:22 +0000 (18:27 +0000)]
Merge "Bluetooth: fix issues re-enabling after crash" am:
e2c22e38d5 am:
ff0d3e1c8d -s ours am:
7fd7bc57ee
am:
02daba1e72
Change-Id: I9a866a2249a51f074c87c194df8ed0df2f34801b
Joe Fernandez [Mon, 19 Dec 2016 18:25:42 +0000 (18:25 +0000)]
Merge "docs: Add deprecation message for the developer.android.com docs am:
b9bd6cca9e am:
045ae0458a am:
e161f75d38 am:
536dc4ecc4 am:
206d947de9" into nyc-mr2-dev-plus-aosp
am:
21014b81be
Change-Id: Ia637bcffda2a41783c305497d60de479f1c98a3a
Joe Fernandez [Mon, 19 Dec 2016 18:25:32 +0000 (18:25 +0000)]
docs: Add deprecation message for the developer.android.com docs am:
b9bd6cca9e am:
045ae0458a am:
e161f75d38 am:
536dc4ecc4 am:
206d947de9
am:
88136284e2
Change-Id: I66433a3e02c046d074127a4df070dc497adbc93e
Joe Fernandez [Mon, 19 Dec 2016 18:24:10 +0000 (18:24 +0000)]
docs: Add deprecation message for the developer.android.com docs am:
b9bd6cca9e am:
045ae0458a am:
e161f75d38 am:
536dc4ecc4 am:
bd7fab30dc
am:
4c7e06b361
Change-Id: I2169912d343f7ceacf9ed9f6b3874a747d398f70
Svet Ganov [Mon, 19 Dec 2016 18:22:25 +0000 (18:22 +0000)]
Merge "[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am:
c3db570a00 -s ours am:
c91845f753 am:
5034efbaf3 am:
0dca3a2fba am:
5857a47008" into nyc-mr2-dev-plus-aosp
am:
89bf2239de -s ours
Change-Id: I5dd4f2ed9033ef754b2a6377dbe8afdcfdcb1e2f
Svet Ganov [Mon, 19 Dec 2016 18:22:21 +0000 (18:22 +0000)]
[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am:
c3db570a00 -s ours am:
c91845f753 am:
5034efbaf3 am:
0dca3a2fba am:
5857a47008
am:
a3044b0214 -s ours
Change-Id: Iee75953a488af374f1d112fef99b3b6e874842d9
Svet Ganov [Mon, 19 Dec 2016 18:21:11 +0000 (18:21 +0000)]
[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am:
c3db570a00 -s ours am:
c91845f753 am:
5034efbaf3 am:
0dca3a2fba am:
d10857f210
am:
c2181a63e0 -s ours
Change-Id: I79fae2e78f0795d6d150a28fce70c748bd7a4621
Mark Lu [Mon, 19 Dec 2016 18:19:27 +0000 (18:19 +0000)]
Merge "Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev am:
88e64bb739 am:
1474527789 am:
760d127583" into nyc-mr2-dev-plus-aosp
am:
1784848976
Change-Id: I417c5d5f34d9b36cc649679d388e84819d8abbd9
Mark Lu [Mon, 19 Dec 2016 18:19:18 +0000 (18:19 +0000)]
Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev am:
88e64bb739 am:
1474527789 am:
760d127583
am:
dc031941bf
Change-Id: I5899a8d7ed6d5fbb27a2407b74566c7c364e736e
Mark Lu [Mon, 19 Dec 2016 18:17:30 +0000 (18:17 +0000)]
Merge "Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev am:
88e64bb739 am:
1474527789 am:
68b2be6105" into nyc-mr2-dev-plus-aosp
am:
60dbafb19c
Change-Id: I9c4fe1812e91fbb37377472602a027a14de039e5
Mark Lu [Mon, 19 Dec 2016 18:17:24 +0000 (18:17 +0000)]
Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev am:
88e64bb739 am:
1474527789 am:
68b2be6105
am:
ce2d5723cb
Change-Id: I0ae10e6687075ccd62bd35eeb916f951cffc0d0f
Mark Lu [Mon, 19 Dec 2016 18:15:48 +0000 (18:15 +0000)]
Merge "docs: update description for BitmapFactory.Options#inBitmap am:
a8f4286272 am:
58d24b22ed am:
c9328c18a4" into nyc-mr2-dev-plus-aosp
am:
38dbcd1997
Change-Id: I4f9ae27d4a3a5fceadda582fe83e50407bf5fc94
Mark Lu [Mon, 19 Dec 2016 18:15:42 +0000 (18:15 +0000)]
docs: update description for BitmapFactory.Options#inBitmap am:
a8f4286272 am:
58d24b22ed am:
c9328c18a4
am:
1c64c32051
Change-Id: Ib95f1acc4d2067d905bfe00d2e51711337ac1199
Mark Lu [Mon, 19 Dec 2016 18:14:24 +0000 (18:14 +0000)]
docs: update description for BitmapFactory.Options#inBitmap am:
a8f4286272 am:
58d24b22ed am:
2b77de3a44
am:
f34e9fc48d
Change-Id: I856c71a7b0dd930ecc0b5cc8805060a65a197324
Justin Klaassen [Mon, 19 Dec 2016 18:13:05 +0000 (18:13 +0000)]
Merge "Reset BatteryStats when too large for clients to handle" into nyc-mr2-dev am:
868a859fd7
am:
0169932c51
Change-Id: I4039c5b4b300c9029c82fecf36163e444768eaaa
Adam Lesinski [Mon, 19 Dec 2016 18:12:00 +0000 (18:12 +0000)]
Reset BatteryStats when too large for clients to handle am:
45489787d7
am:
66c7e9c20e
Change-Id: I20e9da9f7580b6f483332649459a32d7562ca2cf
Philip P. Moltmann [Mon, 19 Dec 2016 18:10:55 +0000 (18:10 +0000)]
Merge "Increment vers of PrintRecommendationService" am:
08bff42ef4 am:
a791fee2bc am:
fbdcaa7278
am:
72c7cce18f
Change-Id: I9310e60014e51c7b64a7ff6bd8c251ac86c37f70
Vitalii Tomkiv [Mon, 19 Dec 2016 18:08:50 +0000 (18:08 +0000)]
Merge changes Ic85892b4,I627e47c6 am:
d995c94426 am:
d49df21f80 am:
82160ca083
am:
f50eacf203
Change-Id: Ic679b1f3000adbc12d976fb0778f50869b62ebde
Vitalii Tomkiv [Mon, 19 Dec 2016 18:07:36 +0000 (18:07 +0000)]
Make sure Zygote is running at process priority 0 after VM has started. am:
1e52ce48a6 am:
7f797cc54c am:
9dd81c9170
am:
9d6fd9d734
Change-Id: Ied768127fb3252462379d8555dc83c21b8a1a521
Todd Kjos [Mon, 19 Dec 2016 18:06:42 +0000 (18:06 +0000)]
Revert "Add boost to increase the load on newly-forked zygote processes." am:
8175f0955a am:
501875bbe8 -s ours am:
391d3e1aad
am:
e9e98f9cea
Change-Id: I48a8fa87a05cdcfa0c60dae638b0b8c24cce30cc
Kweku Adams [Mon, 19 Dec 2016 18:05:33 +0000 (18:05 +0000)]
Merge "Fixing issue in current and max duration calculations." into nyc-mr2-dev am:
1decad5e8c
am:
05cf63f3d7
Change-Id: I2db03bfba8bcab2a2ae52f38582aae3151d99840
Kweku Adams [Mon, 19 Dec 2016 18:04:22 +0000 (18:04 +0000)]
Fixing issue in current and max duration calculations. am:
c6bd4243a4
am:
c9430110da
Change-Id: I00f8b5298d4c313b4c4d8cc1c2116085b16b2bee
Adrian Roos [Mon, 19 Dec 2016 18:03:14 +0000 (18:03 +0000)]
Merge "Assist app is not launched when long-pressing on Home key" into nyc-mr2-dev am:
31b96311bf
am:
ca504aae64
Change-Id: I434d05ea7354eb9de535ef5279d7a1c5302fed1b
Kaori Katou [Mon, 19 Dec 2016 18:02:10 +0000 (18:02 +0000)]
Assist app is not launched when long-pressing on Home key am:
ed7bf5eecc
am:
ea00cbb776
Change-Id: Icc3c6ae23a92c2c15cf6df6d14f869586a0d4787
Junda Liu [Mon, 19 Dec 2016 18:00:50 +0000 (18:00 +0000)]
Merge "Add carrier config key KEY_EDITABLE_TETHER_APN_BOOL." into nyc-mr2-dev am:
565fcb4b95
am:
b5ee93791a
Change-Id: I151f2ac74a096463932d891c579d648628c98a7e
Lei Yu [Mon, 19 Dec 2016 17:55:18 +0000 (17:55 +0000)]
Merge "Remove hardcode color for battery_detail"
phweiss [Fri, 2 Dec 2016 13:31:04 +0000 (14:31 +0100)]
Rework Device Monitoring Dialog in Quicksettings
If a device owner is active, the layout is changed from a
standard AlertDialog with only one string to a custom dialog
that includes information on Device Owners, and VPN and Network Logging,
if enabled.
BUG:
29748723
BUG:
33126622
Test: Manual, CTS-Verifier tests will be added later
Change-Id: I2bfca9d9d02a42d9c3b17683625eda29e9369666
TreeHugger Robot [Mon, 19 Dec 2016 15:31:03 +0000 (15:31 +0000)]
Merge "Use junit instead of junit4-target"
Andrew Scull [Mon, 19 Dec 2016 14:48:33 +0000 (14:48 +0000)]
Merge "Don't save the password metrics to disk."
Paul Duffin [Mon, 19 Dec 2016 14:01:32 +0000 (14:01 +0000)]
Use junit instead of junit4-target
Bug:
30188076
Test: make checkbuild
Change-Id: I61bf0d812d433d3622e9be33c549da16e511a359
Diego Perez [Mon, 19 Dec 2016 12:06:54 +0000 (12:06 +0000)]
Merge "Create new layoutlib-legacy to be included in the SDK"
Diego Perez [Tue, 6 Dec 2016 11:59:36 +0000 (11:59 +0000)]
Create new layoutlib-legacy to be included in the SDK
This version of the jar file only contains a Bridge that returns an
error (or an image if you ask for it) contaning a message that says that
the SDK version of layoutlib is not supported.
Test: Manually tested
Change-Id: I3d24df86a3112c52858649c3286270a31496961b
TreeHugger Robot [Mon, 19 Dec 2016 11:57:08 +0000 (11:57 +0000)]
Merge "Enforce DISALLOW_ADD_MANAGED_PROFILE"
Esteban Talavera [Thu, 15 Dec 2016 11:16:44 +0000 (11:16 +0000)]
Enforce DISALLOW_ADD_MANAGED_PROFILE
Only the device owner should be able to create a managed
profile if that restriction is set
Test: runtest -c com.android.server.devicepolicy.DevicePolicyManagerTest frameworks-services
Bug:
31952368
Change-Id: Ia5170e54594ccba1e5bcedffaec98c2af42264c0
Calin Juravle [Mon, 19 Dec 2016 11:23:49 +0000 (11:23 +0000)]
Merge "Report non-primary dex files loads to PM"
Hugo Benichi [Mon, 19 Dec 2016 08:40:43 +0000 (08:40 +0000)]
Merge changes I1450c126,I8926a922,I54403377,Idf216797 into nyc-mr2-dev
am:
85f3996d72
Change-Id: Ia780475dbbd9ebd58f5bcc9cefa74108f48ca53b
Hugo Benichi [Mon, 19 Dec 2016 08:40:37 +0000 (08:40 +0000)]
DO NOT MERGE IP Connectivity metrics: add connect() statistics
am:
2299a1c401
Change-Id: I7ad93b1b3a3446ffd6dce7c0799ddb9a2b43955f
Hugo Benichi [Mon, 19 Dec 2016 08:39:55 +0000 (08:39 +0000)]
DO NOT MERGE Fix IP connectivity metrics tests
am:
93c0de0a35
Change-Id: Ia6a28b09263729caa72786062e134f8c684e3ccb
Hugo Benichi [Mon, 19 Dec 2016 08:38:54 +0000 (08:38 +0000)]
DO NOT MERGE IP connectivity metrics: introduce ConnectStatistics and DNS statistics
am:
097bde6c8f
Change-Id: Ibe6d3945cda64f55c6aab7ef4fc4a6cd8a6daf05
Hugo Benichi [Mon, 19 Dec 2016 08:38:10 +0000 (08:38 +0000)]
DO NOT MERGE IP connectivity metrics: add transport field.
am:
4c9d3f19cd
Change-Id: I1e6b0f9e7b8f2e2808d85e302fdd3ca1dc4d5a41
Hugo Benichi [Mon, 19 Dec 2016 08:31:10 +0000 (08:31 +0000)]
Merge changes I1450c126,I8926a922,I54403377,Idf216797 into nyc-mr2-dev
* changes:
DO NOT MERGE IP Connectivity metrics: add connect() statistics
DO NOT MERGE Fix IP connectivity metrics tests
DO NOT MERGE IP connectivity metrics: introduce ConnectStatistics and DNS statistics
DO NOT MERGE IP connectivity metrics: add transport field.
Hugo Benichi [Mon, 19 Dec 2016 08:29:30 +0000 (08:29 +0000)]
Merge changes Iadf7f15d,I74702938,Ib8a725cd into nyc-mr2-dev
am:
05d36569b6
Change-Id: I09bbd93408e2de8b4ce159a7b22d3650a04ba081
Hugo Benichi [Mon, 19 Dec 2016 08:29:23 +0000 (08:29 +0000)]
DO NOT MERGE Network notifications: revamp keying scheme
am:
84daaea8fd
Change-Id: Ibad7d0210b2c69826462b781f43a82d65849ebfb
Hugo Benichi [Mon, 19 Dec 2016 08:29:16 +0000 (08:29 +0000)]
DO NOT MERGE Define Network notification proto constants.
am:
065acc5a6c
Change-Id: Ic1bb6306d6a0f2e5a764abb1834f75ad796c9f28
Hugo Benichi [Mon, 19 Dec 2016 08:29:11 +0000 (08:29 +0000)]
DO NOT MERGE Unit tests for NetworkNotificationManager
am:
d3da17a260
Change-Id: I873ea4a5625c526d61017967604305ada548f907
Hugo Benichi [Mon, 19 Dec 2016 08:25:25 +0000 (08:25 +0000)]
Merge changes Iadf7f15d,I74702938,Ib8a725cd into nyc-mr2-dev
* changes:
DO NOT MERGE Network notifications: revamp keying scheme
DO NOT MERGE Define Network notification proto constants.
DO NOT MERGE Unit tests for NetworkNotificationManager
Hugo Benichi [Mon, 19 Dec 2016 06:00:34 +0000 (06:00 +0000)]
Merge "DO NOT MERGE Netd events: record connect() success/errno" into nyc-mr2-dev
am:
64bc2580e3
Change-Id: I24ab257a4f9646edf25bde3c95f31b88ff35aa48
Hugo Benichi [Mon, 19 Dec 2016 06:00:28 +0000 (06:00 +0000)]
DO NOT MERGE Netd events: record connect() success/errno
am:
e8fe0aaab9
Change-Id: Ia9d271d4dac362e930c7c3463bdbafd9a85ca739
Hugo Benichi [Mon, 19 Dec 2016 05:55:21 +0000 (05:55 +0000)]
Merge "DO NOT MERGE Netd events: record connect() success/errno" into nyc-mr2-dev
Hugo Benichi [Mon, 19 Dec 2016 02:07:41 +0000 (02:07 +0000)]
Captive portals: login activity probes like NetworkMonitor
am:
cdf3ba48cc
Change-Id: Ie85df7dd734b872cc361d0820edbfffc928f9f3a
Hugo Benichi [Tue, 13 Dec 2016 23:23:40 +0000 (08:23 +0900)]
Captive portals: login activity probes like NetworkMonitor
This patch changes CaptivePortalLoginActivity captive portal test to be
consistent with NetworkMonitor by:
- using Network.java to open the http connection.
- adding a UserAgent property to the request header.
Test: manually tested.
Bug:
32369183
Change-Id: I33cbcdab9809c712d998da6d925bdd4e3093f8ff
Michael Rosenfeld [Sun, 18 Dec 2016 00:28:42 +0000 (00:28 +0000)]
Merge "Clean up local hprofs" am:
9ab94e15c7 am:
1876d82450
am:
67fd9f3968
Change-Id: I8eaea581cfda4844c3ea81f7ee63f0cfc40ef3e0
Marie Janssen [Sun, 18 Dec 2016 00:24:42 +0000 (00:24 +0000)]
Merge "Bluetooth: fix issues re-enabling after crash" am:
e2c22e38d5 am:
ff0d3e1c8d -s ours
am:
7fd7bc57ee
Change-Id: I711edb691cd0cbbd4c5f52d4ebdc27fd7adb2d26
Michael Rosenfeld [Sun, 18 Dec 2016 00:21:19 +0000 (00:21 +0000)]
Merge "Clean up local hprofs" am:
9ab94e15c7
am:
1876d82450
Change-Id: I16c2e27c21d933e6090adb48af144c731a2c8ac6
Marie Janssen [Sun, 18 Dec 2016 00:20:18 +0000 (00:20 +0000)]
Merge "Bluetooth: fix issues re-enabling after crash" am:
e2c22e38d5
am:
ff0d3e1c8d -s ours
Change-Id: I5e891c190c1c86d33176f83a2e92ce807af45472
Junda Liu [Sat, 17 Dec 2016 22:55:37 +0000 (22:55 +0000)]
Merge "resolve merge conflicts of
0c62aa5 to master"
TreeHugger Robot [Sat, 17 Dec 2016 07:52:33 +0000 (07:52 +0000)]
Merge "Fix ScanResult array parceling."
Android Build Merger (Role) [Sat, 17 Dec 2016 05:10:32 +0000 (05:10 +0000)]
Merge "docs: Add deprecation message for the developer.android.com docs am:
b9bd6cca9e am:
045ae0458a am:
e161f75d38 am:
536dc4ecc4 am:
206d947de9" into nyc-mr2-dev-plus-aosp
Joe Fernandez [Sat, 17 Dec 2016 05:09:40 +0000 (05:09 +0000)]
docs: Add deprecation message for the developer.android.com docs am:
b9bd6cca9e am:
045ae0458a am:
e161f75d38 am:
536dc4ecc4
am:
206d947de9
Change-Id: I56fe38f6bb41a9ddc17b197a1284361600443d23
Joe Fernandez [Sat, 17 Dec 2016 05:09:37 +0000 (05:09 +0000)]
docs: Add deprecation message for the developer.android.com docs am:
b9bd6cca9e am:
045ae0458a am:
e161f75d38 am:
536dc4ecc4
am:
bd7fab30dc
Change-Id: I1764cf01406aa25d009df76ce4e76e1763ab1be7
Joe Fernandez [Sat, 17 Dec 2016 04:59:06 +0000 (04:59 +0000)]
docs: Add deprecation message for the developer.android.com docs am:
b9bd6cca9e am:
045ae0458a am:
e161f75d38
am:
536dc4ecc4
Change-Id: I431cc25fd1658a08497c562abefa05f55df9382f
Joe Fernandez [Sat, 17 Dec 2016 04:59:05 +0000 (04:59 +0000)]
docs: Add deprecation message for the developer.android.com docs am:
b9bd6cca9e am:
045ae0458a am:
e161f75d38
am:
536dc4ecc4
Change-Id: I00433f2c53c4ae494082ce21a4edb63717347906
Joe Fernandez [Sat, 17 Dec 2016 04:48:04 +0000 (04:48 +0000)]
docs: Add deprecation message for the developer.android.com docs am:
b9bd6cca9e am:
045ae0458a
am:
e161f75d38
Change-Id: I622c23e61f4e8db5a51a9d2425cc1fe379ec9505
Joe Fernandez [Sat, 17 Dec 2016 04:37:05 +0000 (04:37 +0000)]
docs: Add deprecation message for the developer.android.com docs am:
b9bd6cca9e
am:
045ae0458a
Change-Id: I2257467a9b263897d2af594720de61d29a982709
Joe Fernandez [Sat, 17 Dec 2016 04:26:02 +0000 (04:26 +0000)]
docs: Add deprecation message for the developer.android.com docs
am:
b9bd6cca9e
Change-Id: I3ba7d4519c491bdf09836f096106b4a6bc52e116
Android Build Merger (Role) [Sat, 17 Dec 2016 04:05:25 +0000 (04:05 +0000)]
Merge "[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am:
c3db570a00 -s ours am:
c91845f753 am:
5034efbaf3 am:
0dca3a2fba am:
5857a47008" into nyc-mr2-dev-plus-aosp
Svet Ganov [Sat, 17 Dec 2016 04:04:35 +0000 (04:04 +0000)]
[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am:
c3db570a00 -s ours am:
c91845f753 am:
5034efbaf3 am:
0dca3a2fba
am:
5857a47008
Change-Id: Idfc7dbcdc5dea568f07b2b47c9cbedb176527fb4
Svet Ganov [Sat, 17 Dec 2016 04:04:31 +0000 (04:04 +0000)]
[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am:
c3db570a00 -s ours am:
c91845f753 am:
5034efbaf3 am:
0dca3a2fba
am:
d10857f210
Change-Id: Ibb218fa69c45aa9404be89a7f5394023395417b1
Svet Ganov [Sat, 17 Dec 2016 03:54:05 +0000 (03:54 +0000)]
[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am:
c3db570a00 -s ours am:
c91845f753 am:
5034efbaf3
am:
0dca3a2fba
Change-Id: Ifd62443464dfa77b022552a1fada1288cfd42afe
Svet Ganov [Sat, 17 Dec 2016 03:54:00 +0000 (03:54 +0000)]
[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am:
c3db570a00 -s ours am:
c91845f753 am:
5034efbaf3
am:
0dca3a2fba
Change-Id: Ieb84f199c9cfe49045dc969a3c9a620037e7587a
Manu Cornet [Sat, 17 Dec 2016 03:50:55 +0000 (19:50 -0800)]
2D Recents: tweak task view header height
Bug:
32101881
Test: On local sw600dp device, checked recents layout
Change-Id: Ia463fa67a59e51e4644a84ba85ec61cb567dfb9b
Svet Ganov [Sat, 17 Dec 2016 03:42:58 +0000 (03:42 +0000)]
[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am:
c3db570a00 -s ours am:
c91845f753
am:
5034efbaf3
Change-Id: I22c38f921047ba7ecea5826701e3024de9a3d110
Svet Ganov [Sat, 17 Dec 2016 03:32:01 +0000 (03:32 +0000)]
[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file am:
c3db570a00 -s ours
am:
c91845f753
Change-Id: Ia85d2855dd8360b94fecb4bf6cd280ea4518d0e1
Svet Ganov [Sat, 17 Dec 2016 03:21:28 +0000 (03:21 +0000)]
[DO NOT MERGE] Fix vulnerability in MemoryIntArray - fix build file
am:
c3db570a00 -s ours
Change-Id: I63b03cd2b057f95aefab23cdb4a29766ec304544
Android Build Merger (Role) [Sat, 17 Dec 2016 02:40:21 +0000 (02:40 +0000)]
Merge "Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev am:
88e64bb739 am:
1474527789 am:
760d127583" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Sat, 17 Dec 2016 02:39:47 +0000 (02:39 +0000)]
Merge "Merge "docs: update description for BitmapFactory.Options#inBitmap" into nyc-mr1-dev am:
88e64bb739 am:
1474527789 am:
68b2be6105" into nyc-mr2-dev-plus-aosp
OSDN Git Service
