OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Drop REASON_FORCED_DEXOPT."
Nicolas Geoffray [Mon, 24 Apr 2017 10:42:41 +0000 (10:42 +0000)]
Merge "Drop REASON_FORCED_DEXOPT."

7 years agoMerge "Clarify IControlsTethering LOCAL_ONLY state name" into oc-dev am: e125b7bafd
Erik Kline [Sat, 22 Apr 2017 09:56:18 +0000 (09:56 +0000)]
Merge "Clarify IControlsTethering LOCAL_ONLY state name" into oc-dev am: e125b7bafd
am: 9bad4886f2

Change-Id: I864546012721f0d5b5a3b570068eb9f1310ae132

7 years agoMerge "Clarify IControlsTethering LOCAL_ONLY state name" into oc-dev
Erik Kline [Sat, 22 Apr 2017 09:49:52 +0000 (09:49 +0000)]
Merge "Clarify IControlsTethering LOCAL_ONLY state name" into oc-dev
am: e125b7bafd

Change-Id: I6980fa26013d8821ea80e1e5f1b85ee871d35298

7 years agoMerge "Clarify IControlsTethering LOCAL_ONLY state name" into oc-dev
TreeHugger Robot [Sat, 22 Apr 2017 09:42:45 +0000 (09:42 +0000)]
Merge "Clarify IControlsTethering LOCAL_ONLY state name" into oc-dev

7 years agoMerge "Watchdog: add graphics composer to HALs of interest" into oc-dev am: c9c690856b
Chia-I Wu [Sat, 22 Apr 2017 09:13:28 +0000 (09:13 +0000)]
Merge "Watchdog: add graphics composer to HALs of interest" into oc-dev am: c9c690856b
am: a8adc64b5f

Change-Id: I8ef51309b340b1750eabfb96c75a4014bb41e82c

7 years agoMerge "Watchdog: add graphics composer to HALs of interest" into oc-dev
Chia-I Wu [Sat, 22 Apr 2017 09:06:53 +0000 (09:06 +0000)]
Merge "Watchdog: add graphics composer to HALs of interest" into oc-dev
am: c9c690856b

Change-Id: I293354194d306dd0aac92f833512be7c57c94e25

7 years agoMerge "Watchdog: add graphics composer to HALs of interest" into oc-dev
TreeHugger Robot [Sat, 22 Apr 2017 09:00:07 +0000 (09:00 +0000)]
Merge "Watchdog: add graphics composer to HALs of interest" into oc-dev

7 years agoMerge "Clarify the meaning of ViewNodes methods used for Autofill purposes." into...
Felipe Leme [Sat, 22 Apr 2017 04:34:32 +0000 (04:34 +0000)]
Merge "Clarify the meaning of ViewNodes methods used for Autofill purposes." into oc-dev am: 7bb113566f
am: 4778d6d5d8

Change-Id: I41425c9a1e875885c4a8c9729b5b1b942d5fdf05

7 years agoMerge "Clarify the meaning of ViewNodes methods used for Autofill purposes." into...
Felipe Leme [Sat, 22 Apr 2017 04:28:33 +0000 (04:28 +0000)]
Merge "Clarify the meaning of ViewNodes methods used for Autofill purposes." into oc-dev
am: 7bb113566f

Change-Id: Ie16d1154d61a6fc323a53998d09456f524b9e3b4

7 years agoMerge "Clarify the meaning of ViewNodes methods used for Autofill purposes." into...
TreeHugger Robot [Sat, 22 Apr 2017 04:20:37 +0000 (04:20 +0000)]
Merge "Clarify the meaning of ViewNodes methods used for Autofill purposes." into oc-dev

7 years agoMerge "Show new colored icon for PDF printer" into oc-dev am: f160c57eb1
Philip P. Moltmann [Sat, 22 Apr 2017 04:02:32 +0000 (04:02 +0000)]
Merge "Show new colored icon for PDF printer" into oc-dev am: f160c57eb1
am: 899d16a88a

Change-Id: I03251bd7e07c300a44eb889273ad54b2225177c9

7 years agoMerge "Show new colored icon for PDF printer" into oc-dev
Philip P. Moltmann [Sat, 22 Apr 2017 03:55:59 +0000 (03:55 +0000)]
Merge "Show new colored icon for PDF printer" into oc-dev
am: f160c57eb1

Change-Id: I98fb3d00cc9d6b92bced36c7f51834136ecca9c3

7 years agoMerge "Show new colored icon for PDF printer" into oc-dev
TreeHugger Robot [Sat, 22 Apr 2017 03:50:00 +0000 (03:50 +0000)]
Merge "Show new colored icon for PDF printer" into oc-dev

7 years agoMerge "Added accessibility type on Autofill save dialog." into oc-dev am: 05204cb775
Felipe Leme [Sat, 22 Apr 2017 03:09:38 +0000 (03:09 +0000)]
Merge "Added accessibility type on Autofill save dialog." into oc-dev am: 05204cb775
am: da8ead2a9a

Change-Id: I167f4bdd822e922f5e8d39e8caf0d153a174f0a1

7 years agoMerge "Added accessibility type on Autofill save dialog." into oc-dev
Felipe Leme [Sat, 22 Apr 2017 03:02:41 +0000 (03:02 +0000)]
Merge "Added accessibility type on Autofill save dialog." into oc-dev
am: 05204cb775

Change-Id: I4895ad3ce5349381540d8923537ab5ff6a66fe03

7 years agoMerge "Workaround apps that override surfaceCreated" into oc-dev am: 0850a4c6a5
John Reck [Sat, 22 Apr 2017 02:53:50 +0000 (02:53 +0000)]
Merge "Workaround apps that override surfaceCreated" into oc-dev am: 0850a4c6a5
am: 3419689fe5

Change-Id: I16ab55bb2223f97444f8f2f4ef14e92e84b38d0d

7 years agoMerge "Added accessibility type on Autofill save dialog." into oc-dev
TreeHugger Robot [Sat, 22 Apr 2017 02:53:06 +0000 (02:53 +0000)]
Merge "Added accessibility type on Autofill save dialog." into oc-dev

7 years agoMerge "Workaround apps that override surfaceCreated" into oc-dev
John Reck [Sat, 22 Apr 2017 02:48:23 +0000 (02:48 +0000)]
Merge "Workaround apps that override surfaceCreated" into oc-dev
am: 0850a4c6a5

Change-Id: I228f13b413ae1b86eaf8d611b6649f12f3bdac44

7 years agoMerge "Fix a spelling." into oc-dev am: 1939550fba
Sudheer Shanka [Sat, 22 Apr 2017 02:45:24 +0000 (02:45 +0000)]
Merge "Fix a spelling." into oc-dev am: 1939550fba
am: ba16a5b5e9

Change-Id: Ibde673514841f823df5bc2c7e6a1220955537d26

7 years agoMerge "Workaround apps that override surfaceCreated" into oc-dev
TreeHugger Robot [Sat, 22 Apr 2017 02:41:50 +0000 (02:41 +0000)]
Merge "Workaround apps that override surfaceCreated" into oc-dev

7 years agoMerge "Fix a spelling." into oc-dev
Sudheer Shanka [Sat, 22 Apr 2017 02:38:57 +0000 (02:38 +0000)]
Merge "Fix a spelling." into oc-dev
am: 1939550fba

Change-Id: Ic2604fa1bd426a9fdfa5269f8a408ba5bb69b62e

7 years agoMerge "Fix a spelling." into oc-dev
TreeHugger Robot [Sat, 22 Apr 2017 02:32:34 +0000 (02:32 +0000)]
Merge "Fix a spelling." into oc-dev

7 years agoMerge "Second pass of eMBMS api." am: c90fcbd660 am: d61dc9e842 am: 4779240573
Hall Liu [Sat, 22 Apr 2017 02:20:46 +0000 (02:20 +0000)]
Merge "Second pass of eMBMS api." am: c90fcbd660 am: d61dc9e842 am: 4779240573
am: 404acdc8a1

Change-Id: I70e694f5e1adcf382f2ac93ef25aa7298ec9dd52

7 years agoMerge "Second pass of eMBMS api." am: c90fcbd660 am: d61dc9e842
Hall Liu [Sat, 22 Apr 2017 02:12:58 +0000 (02:12 +0000)]
Merge "Second pass of eMBMS api." am: c90fcbd660 am: d61dc9e842
am: 4779240573

Change-Id: I56a0c0dc4ddbb3d168c1a386e92158b4a1d2bdde

7 years agoMerge "Second pass of eMBMS api." am: c90fcbd660
Hall Liu [Sat, 22 Apr 2017 02:06:28 +0000 (02:06 +0000)]
Merge "Second pass of eMBMS api." am: c90fcbd660
am: d61dc9e842

Change-Id: I9fa9152affeca04d18a1d185efd989b42fea3d49

7 years agoMerge "Second pass of eMBMS api."
Hall Liu [Sat, 22 Apr 2017 02:00:18 +0000 (02:00 +0000)]
Merge "Second pass of eMBMS api."
am: c90fcbd660

Change-Id: If77c71951d6514429752fa9c1ba0f8835c7e610b

7 years agoMerge "Second pass of eMBMS api."
Hall Liu [Sat, 22 Apr 2017 01:53:11 +0000 (01:53 +0000)]
Merge "Second pass of eMBMS api."

7 years agoMerge "Don't clear restart counter when bringing up the service." into oc-dev am...
Sudheer Shanka [Sat, 22 Apr 2017 01:47:03 +0000 (01:47 +0000)]
Merge "Don't clear restart counter when bringing up the service." into oc-dev am: 6007cae425
am: ba4b617a0a

Change-Id: I6e6a75d82668ab8b472185abfc2df8b7f133e127

7 years agoMerge "Upgrade logging for UsbDeviceManager to narrow down bugs." into oc-dev am...
Jerry Zhang [Sat, 22 Apr 2017 01:45:19 +0000 (01:45 +0000)]
Merge "Upgrade logging for UsbDeviceManager to narrow down bugs." into oc-dev am: 6d3747ebe2
am: 7f986ba87b

Change-Id: I45d4b1f7fbf9268206e0c90636f02bf0d3ae5d66

7 years agoMerge "Don't clear restart counter when bringing up the service." into oc-dev
Sudheer Shanka [Sat, 22 Apr 2017 01:37:55 +0000 (01:37 +0000)]
Merge "Don't clear restart counter when bringing up the service." into oc-dev
am: 6007cae425

Change-Id: I14996b3e998e918c75223ed4716c35d9f0a436ec

7 years agoMerge "Upgrade logging for UsbDeviceManager to narrow down bugs." into oc-dev
Jerry Zhang [Sat, 22 Apr 2017 01:35:52 +0000 (01:35 +0000)]
Merge "Upgrade logging for UsbDeviceManager to narrow down bugs." into oc-dev
am: 6d3747ebe2

Change-Id: I902c104cb912c834f06d2abf4a816622c414d08f

7 years agoMerge "Don't clear restart counter when bringing up the service." into oc-dev
Sudheer Shanka [Sat, 22 Apr 2017 01:31:18 +0000 (01:31 +0000)]
Merge "Don't clear restart counter when bringing up the service." into oc-dev

7 years agoMerge "Upgrade logging for UsbDeviceManager to narrow down bugs." into oc-dev
TreeHugger Robot [Sat, 22 Apr 2017 01:26:08 +0000 (01:26 +0000)]
Merge "Upgrade logging for UsbDeviceManager to narrow down bugs." into oc-dev

7 years agoMerge "Don't put non-resizeable activities on secondary displays" into oc-dev am...
Andrii Kulian [Sat, 22 Apr 2017 01:13:56 +0000 (01:13 +0000)]
Merge "Don't put non-resizeable activities on secondary displays" into oc-dev am: b216d0f09f
am: 9ca1490cbe

Change-Id: Id1ddad10cf696e96d556fb2a77f8ee6458f384a0

7 years agoMerge changes I5187d17c,I49a76582 am: 7781a6d4c1 am: f2e5cf715d am: 31259c219f
Hugo Benichi [Sat, 22 Apr 2017 01:07:59 +0000 (01:07 +0000)]
Merge changes I5187d17c,I49a76582 am: 7781a6d4c1 am: f2e5cf715d am: 31259c219f
am: bcdf1214c7

Change-Id: I63b2fe14fe830b1000414328e79bee8c8233d40f

7 years agoMerge "Don't put non-resizeable activities on secondary displays" into oc-dev
Andrii Kulian [Sat, 22 Apr 2017 01:07:58 +0000 (01:07 +0000)]
Merge "Don't put non-resizeable activities on secondary displays" into oc-dev
am: b216d0f09f

Change-Id: I026dfe6834c891251731fcf852366d20a112b864

7 years agoMerge "NsdManager: add unit tests" am: dc54ad7fc3 am: 40ab8401b2 am: d2181235b9
Hugo Benichi [Sat, 22 Apr 2017 01:06:17 +0000 (01:06 +0000)]
Merge "NsdManager: add unit tests" am: dc54ad7fc3 am: 40ab8401b2 am: d2181235b9
am: 658f2e5cd7

Change-Id: I86a9db7fe4f925162e1632152862c7b246230db9

7 years agoMerge "Don't put non-resizeable activities on secondary displays" into oc-dev
Andrii Kulian [Sat, 22 Apr 2017 00:59:31 +0000 (00:59 +0000)]
Merge "Don't put non-resizeable activities on secondary displays" into oc-dev

7 years agoMerge changes I5187d17c,I49a76582 am: 7781a6d4c1 am: f2e5cf715d
Hugo Benichi [Sat, 22 Apr 2017 00:59:36 +0000 (00:59 +0000)]
Merge changes I5187d17c,I49a76582 am: 7781a6d4c1 am: f2e5cf715d
am: 31259c219f

Change-Id: I174179db3a08ba51aef737cfb3956d1cf789b362

7 years agoMerge "NsdManager: add unit tests" am: dc54ad7fc3 am: 40ab8401b2
Hugo Benichi [Sat, 22 Apr 2017 00:57:48 +0000 (00:57 +0000)]
Merge "NsdManager: add unit tests" am: dc54ad7fc3 am: 40ab8401b2
am: d2181235b9

Change-Id: I7a5202be0e6a6274f3bd11737f30fee0ef947235

7 years agoMerge "Fix flaky tests in ConnOnActivityStartTest." into oc-dev am: 9ebd87de8e
Sudheer Shanka [Sat, 22 Apr 2017 00:57:13 +0000 (00:57 +0000)]
Merge "Fix flaky tests in ConnOnActivityStartTest." into oc-dev am: 9ebd87de8e
am: cf0f217d1b

Change-Id: Id118ce161b034c524bbb8d7ce5a3296f5e69eb26

7 years agoMerge changes I5187d17c,I49a76582 am: 7781a6d4c1
Hugo Benichi [Sat, 22 Apr 2017 00:51:03 +0000 (00:51 +0000)]
Merge changes I5187d17c,I49a76582 am: 7781a6d4c1
am: f2e5cf715d

Change-Id: Ia7298c92e50e00e139829498af00d80a5840d4cb

7 years agoMerge "NsdManager: add unit tests" am: dc54ad7fc3
Hugo Benichi [Sat, 22 Apr 2017 00:49:19 +0000 (00:49 +0000)]
Merge "NsdManager: add unit tests" am: dc54ad7fc3
am: 40ab8401b2

Change-Id: Ie8b30310a8da64e6247472fa17945d003b1894e8

7 years agoMerge "Fix flaky tests in ConnOnActivityStartTest." into oc-dev
Sudheer Shanka [Sat, 22 Apr 2017 00:48:36 +0000 (00:48 +0000)]
Merge "Fix flaky tests in ConnOnActivityStartTest." into oc-dev
am: 9ebd87de8e

Change-Id: I95b0d92677d192dbf80271a22bb73a71c47021a6

7 years agoMerge "Address various JobScheduler API feedback." into oc-dev am: e3cc9287ac
Dianne Hackborn [Sat, 22 Apr 2017 00:47:37 +0000 (00:47 +0000)]
Merge "Address various JobScheduler API feedback." into oc-dev am: e3cc9287ac
am: 626a97618e

Change-Id: I280c45eff7eda9a036c2165b418f7672a5544ad4

7 years agoMerge changes I5187d17c,I49a76582
Hugo Benichi [Sat, 22 Apr 2017 00:43:07 +0000 (00:43 +0000)]
Merge changes I5187d17c,I49a76582
am: 7781a6d4c1

Change-Id: I9c484916a9e8adf11342c01b77077e8016a29b5f

7 years agoMerge "NsdManager: add unit tests"
Hugo Benichi [Sat, 22 Apr 2017 00:40:56 +0000 (00:40 +0000)]
Merge "NsdManager: add unit tests"
am: dc54ad7fc3

Change-Id: I928f19e359b7423d43d792c413de4195a64141a7

7 years agoMerge "Address various JobScheduler API feedback." into oc-dev
Dianne Hackborn [Sat, 22 Apr 2017 00:39:09 +0000 (00:39 +0000)]
Merge "Address various JobScheduler API feedback." into oc-dev
am: e3cc9287ac

Change-Id: I8801bb55abacae1aa2f1cf4d109087dc0209e4cf

7 years agoMerge "Merge "Remove default public ctor from RttModifyStatus" am: d065cf049e am...
Hall Liu [Sat, 22 Apr 2017 00:38:29 +0000 (00:38 +0000)]
Merge "Merge "Remove default public ctor from RttModifyStatus" am: d065cf049e am: cb93ac533d am: f2a3b8af49" into oc-dev-plus-aosp
am: 54488bdb8c

Change-Id: Ic4125b316562a6396eb3e7dff98050e82591b845

7 years agoMerge "Fix flaky tests in ConnOnActivityStartTest." into oc-dev
Sudheer Shanka [Sat, 22 Apr 2017 00:34:36 +0000 (00:34 +0000)]
Merge "Fix flaky tests in ConnOnActivityStartTest." into oc-dev

7 years agoMerge changes I5187d17c,I49a76582
Hugo Benichi [Sat, 22 Apr 2017 00:34:07 +0000 (00:34 +0000)]
Merge changes I5187d17c,I49a76582

* changes:
  ConnectivityService: regroup bool <-> int conversions
  ConnectivityService: move reportNetworkConnectivity to handler

7 years agoMerge "Address various JobScheduler API feedback." into oc-dev
Dianne Hackborn [Sat, 22 Apr 2017 00:33:43 +0000 (00:33 +0000)]
Merge "Address various JobScheduler API feedback." into oc-dev

7 years agoMerge "NsdManager: add unit tests"
Hugo Benichi [Sat, 22 Apr 2017 00:31:27 +0000 (00:31 +0000)]
Merge "NsdManager: add unit tests"

7 years agoMerge "Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into oc...
Stanley Tng [Sat, 22 Apr 2017 00:30:15 +0000 (00:30 +0000)]
Merge "Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into oc-dev am: afe32d2fb1
am: 96ce732cba

Change-Id: Icdc667537d1b139bc63f2bf1da763a10695da04a

7 years agoMerge "Merge "Remove default public ctor from RttModifyStatus" am: d065cf049e am...
Android Build Merger (Role) [Sat, 22 Apr 2017 00:26:41 +0000 (00:26 +0000)]
Merge "Merge "Remove default public ctor from RttModifyStatus" am: d065cf049e am: cb93ac533d am: f2a3b8af49" into oc-dev-plus-aosp

7 years agoMerge "Remove default public ctor from RttModifyStatus" am: d065cf049e am: cb93ac533d
Hall Liu [Sat, 22 Apr 2017 00:25:54 +0000 (00:25 +0000)]
Merge "Remove default public ctor from RttModifyStatus" am: d065cf049e am: cb93ac533d
am: f2a3b8af49

Change-Id: I0406a73c03969d38feb283e638dd2e36496b4141

7 years agoMerge "Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into oc-dev
Stanley Tng [Sat, 22 Apr 2017 00:23:59 +0000 (00:23 +0000)]
Merge "Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into oc-dev
am: afe32d2fb1

Change-Id: Id2111268de8fb0195e47e35909a3edfffa81e337

7 years agoMerge "Remove default public ctor from RttModifyStatus" am: d065cf049e
Hall Liu [Sat, 22 Apr 2017 00:19:47 +0000 (00:19 +0000)]
Merge "Remove default public ctor from RttModifyStatus" am: d065cf049e
am: cb93ac533d

Change-Id: I3e34e7bbebf2e4bfd12c0562d32037ece5c43ff6

7 years agoMerge "Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into oc-dev
TreeHugger Robot [Sat, 22 Apr 2017 00:17:24 +0000 (00:17 +0000)]
Merge "Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into oc-dev

7 years agoWorkaround apps that override surfaceCreated
John Reck [Sat, 22 Apr 2017 00:14:45 +0000 (17:14 -0700)]
Workaround apps that override surfaceCreated

Fixes: 34512969
Test: manual, tested repro in bug and verified
basic GLSurfaceView usage in ApiDemos works
without warnings

Change-Id: I0ce9128874af681e9cfbd3b0b2ef5e2df7080154

7 years agoMerge "Remove default public ctor from RttModifyStatus"
Hall Liu [Sat, 22 Apr 2017 00:14:14 +0000 (00:14 +0000)]
Merge "Remove default public ctor from RttModifyStatus"
am: d065cf049e

Change-Id: Ie4afbc705810b3f370fb8e8d57be9053c6135083

7 years agoMerge "Update fullscreen user switcher on the lock screen."
TreeHugger Robot [Sat, 22 Apr 2017 00:14:06 +0000 (00:14 +0000)]
Merge "Update fullscreen user switcher on the lock screen."

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev am: 63d52ca6bc -s ours
Bill Yi [Sat, 22 Apr 2017 00:02:18 +0000 (00:02 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am: 63d52ca6bc  -s ours
am: 63ce39cfe6  -s ours

Change-Id: I3c36011aff2035d32193ab7c3b73e4036af9280b

7 years agoMerge "Remove default public ctor from RttModifyStatus"
Treehugger Robot [Sat, 22 Apr 2017 00:01:50 +0000 (00:01 +0000)]
Merge "Remove default public ctor from RttModifyStatus"

7 years agoMerge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment" into oc-dev...
Jakub Pawlowski [Fri, 21 Apr 2017 23:57:45 +0000 (23:57 +0000)]
Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment" into oc-dev am: 08c90805b4
am: 263219560c

Change-Id: I0d6a86c027f49d57162d8e6b40847f5bb4696926

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Fri, 21 Apr 2017 23:56:10 +0000 (23:56 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am: 63d52ca6bc  -s ours

Change-Id: I9868606cd3aad069f740ec0e5d0498f30ffca306

7 years agoMerge "Mark Restricted APN connections as restricted." am: b90b2015d3 am: 1778682242...
Robert Greenwalt [Fri, 21 Apr 2017 23:50:37 +0000 (23:50 +0000)]
Merge "Mark Restricted APN connections as restricted." am: b90b2015d3 am: 1778682242 am: 88a6acb9f6  -s ours
am: 40917c44b2  -s ours

Change-Id: Ieae70ca90bff3747ef66c6f15258fef28d061ce4

7 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 23:50:03 +0000 (23:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev

7 years agoMerge "Fix @throws javadoc on SurfaceTexture ctors" into oc-dev am: aec1fbeaa3
John Reck [Fri, 21 Apr 2017 23:48:38 +0000 (23:48 +0000)]
Merge "Fix @throws javadoc on SurfaceTexture ctors" into oc-dev am: aec1fbeaa3
am: 30baf2affa

Change-Id: I55e33f2d6b4e536d93daac57ff543c1f0d4780e9

7 years agoMerge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment" into oc-dev
Jakub Pawlowski [Fri, 21 Apr 2017 23:47:10 +0000 (23:47 +0000)]
Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment" into oc-dev
am: 08c90805b4

Change-Id: I6a64de6594b0c54b0e12467780ea7bdc2dc29a91

7 years agoMerge "Behavior compat for child being manipulated outside Animatorset" into oc-dev...
Doris Liu [Fri, 21 Apr 2017 23:46:29 +0000 (23:46 +0000)]
Merge "Behavior compat for child being manipulated outside Animatorset" into oc-dev am: 4d72cd9550
am: ce680bfd06

Change-Id: I07401f285ae1abe18bf3932bf79618759f24c9bd

7 years agoMerge "Propagate density through AdaptiveIconDrawable and BitmapDrawable" into oc...
Adam Lesinski [Fri, 21 Apr 2017 23:40:31 +0000 (23:40 +0000)]
Merge "Propagate density through AdaptiveIconDrawable and BitmapDrawable" into oc-dev am: 5be3647a9e
am: 091fe96343

Change-Id: Ib313379b085c4d3ee435b22bb844aeeef6ff74cf

7 years agoMerge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 23:40:24 +0000 (23:40 +0000)]
Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment" into oc-dev

7 years agoMerge "Let unlocked profile verifyCredential under unified lock" into oc-dev am:...
Charles He [Fri, 21 Apr 2017 23:37:11 +0000 (23:37 +0000)]
Merge "Let unlocked profile verifyCredential under unified lock" into oc-dev am: faf37babb0
am: 04ccde83ff  -s ours

Change-Id: I8afa46a395b00482de07b81362acc76fd827edf8

7 years agoMerge "Mark Restricted APN connections as restricted." am: b90b2015d3 am: 1778682242
Robert Greenwalt [Fri, 21 Apr 2017 23:36:13 +0000 (23:36 +0000)]
Merge "Mark Restricted APN connections as restricted." am: b90b2015d3 am: 1778682242
am: 88a6acb9f6  -s ours

Change-Id: I7a0019557721593761ae605db8e28bf4e15c06b0

7 years agoMerge "Fix @throws javadoc on SurfaceTexture ctors" into oc-dev
John Reck [Fri, 21 Apr 2017 23:32:39 +0000 (23:32 +0000)]
Merge "Fix @throws javadoc on SurfaceTexture ctors" into oc-dev
am: aec1fbeaa3

Change-Id: I593f46bad6a3214d7a21f3581ea43c78843949ef

7 years agoMerge "Mark Restricted APN connections as restricted." am: b90b2015d3
Robert Greenwalt [Fri, 21 Apr 2017 23:29:47 +0000 (23:29 +0000)]
Merge "Mark Restricted APN connections as restricted." am: b90b2015d3
am: 1778682242

Change-Id: I2300c5e98b8e3339825bfac7ea1f6d514b5ae71f

7 years agoMerge "Fix @throws javadoc on SurfaceTexture ctors" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 23:25:48 +0000 (23:25 +0000)]
Merge "Fix @throws javadoc on SurfaceTexture ctors" into oc-dev

7 years agoMerge "Mark Restricted APN connections as restricted."
Robert Greenwalt [Fri, 21 Apr 2017 23:23:17 +0000 (23:23 +0000)]
Merge "Mark Restricted APN connections as restricted."
am: b90b2015d3

Change-Id: Icd54c671035da752663d9ec125f999298aa1d8e7

7 years agoMerge "Behavior compat for child being manipulated outside Animatorset" into oc-dev
Doris Liu [Fri, 21 Apr 2017 23:23:09 +0000 (23:23 +0000)]
Merge "Behavior compat for child being manipulated outside Animatorset" into oc-dev
am: 4d72cd9550

Change-Id: I37f564cb4b55572dae2a6cf93e2ba4528ddf8a93

7 years agoUpgrade logging for UsbDeviceManager to narrow down bugs.
Jerry Zhang [Fri, 21 Apr 2017 19:31:17 +0000 (12:31 -0700)]
Upgrade logging for UsbDeviceManager to narrow down bugs.

Will be reverted once bugs are caught.

Bug: 34873000
Test: None
Change-Id: Ia43e0ccb1c22c767c6ef3edbf04cef024662cd15

7 years agoMerge "Behavior compat for child being manipulated outside Animatorset" into oc-dev
Doris Liu [Fri, 21 Apr 2017 23:14:28 +0000 (23:14 +0000)]
Merge "Behavior compat for child being manipulated outside Animatorset" into oc-dev

7 years agoMerge "Mark Restricted APN connections as restricted."
Treehugger Robot [Fri, 21 Apr 2017 23:12:51 +0000 (23:12 +0000)]
Merge "Mark Restricted APN connections as restricted."

7 years agoMerge "Propagate density through AdaptiveIconDrawable and BitmapDrawable" into oc-dev
Adam Lesinski [Fri, 21 Apr 2017 22:42:31 +0000 (22:42 +0000)]
Merge "Propagate density through AdaptiveIconDrawable and BitmapDrawable" into oc-dev
am: 5be3647a9e

Change-Id: Ie0408d44a2641e704c18399c996aff7f996e2764

7 years agoMerge "Fix parameter name mismatch in getResourceIdentifier."
Stefan Ramsauer [Fri, 21 Apr 2017 22:37:30 +0000 (22:37 +0000)]
Merge "Fix parameter name mismatch in getResourceIdentifier."

7 years agoMerge "Propagate density through AdaptiveIconDrawable and BitmapDrawable" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 22:35:49 +0000 (22:35 +0000)]
Merge "Propagate density through AdaptiveIconDrawable and BitmapDrawable" into oc-dev

7 years agoMerge "Let unlocked profile verifyCredential under unified lock" into oc-dev
Charles He [Fri, 21 Apr 2017 22:34:42 +0000 (22:34 +0000)]
Merge "Let unlocked profile verifyCredential under unified lock" into oc-dev
am: faf37babb0

Change-Id: I0af254a0e04c093df8aff56489954f2c60f3b305

7 years agoMerge "Fix bug with translation in ExpandableNotificationRow."
TreeHugger Robot [Fri, 21 Apr 2017 22:29:32 +0000 (22:29 +0000)]
Merge "Fix bug with translation in ExpandableNotificationRow."

7 years agoMerge "Let unlocked profile verifyCredential under unified lock" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 22:27:43 +0000 (22:27 +0000)]
Merge "Let unlocked profile verifyCredential under unified lock" into oc-dev

7 years agoMerge "Use Vpn rules (not firewall) for always-on VPN" am: e4f56a7e44 am: cd8557d15a...
Robin Lee [Fri, 21 Apr 2017 22:24:31 +0000 (22:24 +0000)]
Merge "Use Vpn rules (not firewall) for always-on VPN" am: e4f56a7e44 am: cd8557d15a am: 4de3794c26
am: 5d30d86372

Change-Id: If94864a6320af8ae69777abca0483ce62ff2ebc9

7 years agoUpdate fullscreen user switcher on the lock screen.
Rakesh Iyer [Wed, 19 Apr 2017 18:28:26 +0000 (11:28 -0700)]
Update fullscreen user switcher on the lock screen.

The older implementation didn't scale well with an
increasing number of users, it just kept making the
user pods smaller and smaller. Replace the custom
GridView with a custom ViewPager with a paging
indicator.

Also remove all the text from the screen since we
don't need it anymore.

More changes to follow.

Bug: 36454400
Test: Created more users than can fit on one screen,
      booted up and switched between the users.
Change-Id: I6de323fbaa6bc4cefc2bdb73a4c68c4f092a08a6

7 years agoAllow the Bluetooth MAC address to be updated asynchronously (2/3)
Stanley Tng [Tue, 18 Apr 2017 05:35:45 +0000 (22:35 -0700)]
Allow the Bluetooth MAC address to be updated asynchronously (2/3)

There are intermittent issues where either the returned Bluetooth
MAC address to Java framework is uninitialized or this address update
arrives too late. This fix will do 2 things:
(1) Returns error when MAC address is unavailable in the native code.
(2) Updates the MAC address later by adding a new broadcast event.

Test: Check address for these cases: factory reset, system reboot, and
Bluetooth re-enable.
Bug: 36709382

Change-Id: I09720193e38fdf9139e1bb146f8e1847e2b65b1a
(cherry picked from commit ad4d1d8e28618546953e75d4983335631feb6f2a)

7 years agoMerge "Allow clipping of notifications to be toggled."
Anthony Chen [Fri, 21 Apr 2017 22:18:33 +0000 (22:18 +0000)]
Merge "Allow clipping of notifications to be toggled."

7 years agoMerge "Use Vpn rules (not firewall) for always-on VPN" am: e4f56a7e44 am: cd8557d15a
Robin Lee [Fri, 21 Apr 2017 22:17:15 +0000 (22:17 +0000)]
Merge "Use Vpn rules (not firewall) for always-on VPN" am: e4f56a7e44 am: cd8557d15a
am: 4de3794c26

Change-Id: Ic1e96eac68ddc8a713b3c71b5c126cb8b99c59f5

7 years agoShow new colored icon for PDF printer
Philip P. Moltmann [Thu, 20 Apr 2017 22:46:19 +0000 (15:46 -0700)]
Show new colored icon for PDF printer

The color matches the color of the printers reported by the Default
Print Service.

Change-Id: I12c19ab498fc5df3af88932eaeb6b3f7015e71d9
Fixes: 35766257
Test: Looked at Print UI

7 years agoMerge "Use Vpn rules (not firewall) for always-on VPN" am: e4f56a7e44
Robin Lee [Fri, 21 Apr 2017 22:11:05 +0000 (22:11 +0000)]
Merge "Use Vpn rules (not firewall) for always-on VPN" am: e4f56a7e44
am: cd8557d15a

Change-Id: I4e0aa1a88c259b77d7a9ac9e1dd02566e415005d

7 years agoMerge "Use Vpn rules (not firewall) for always-on VPN"
Robin Lee [Fri, 21 Apr 2017 22:05:33 +0000 (22:05 +0000)]
Merge "Use Vpn rules (not firewall) for always-on VPN"
am: e4f56a7e44

Change-Id: I80b3607fd1c61875be8354439e09db56a0bd391d

7 years agoAddress various JobScheduler API feedback.
Dianne Hackborn [Fri, 21 Apr 2017 21:17:23 +0000 (14:17 -0700)]
Address various JobScheduler API feedback.

- New sample code.
- Fix/improve some docs.
- Hide JobWorkItem Parcl constructor.

Also:

- Add new JobWorkItem API to get the number of times it has been
delivered.
- Do a bit more optimization of checking if a job is ready.

Bug: 37534393  API Review: JobInfo.Builder
Bug: 37544057  API Review: JobServiceEngine
Bug: 37544153  API Review: JobWorkItem

Test: bit CtsJobSchedulerTestCases:*
Change-Id: I66891a038fba752f45dcaed43e615fa9209b71fc

7 years agoMark Restricted APN connections as restricted.
Robert Greenwalt [Mon, 10 Apr 2017 21:32:23 +0000 (14:32 -0700)]
Mark Restricted APN connections as restricted.

If anything unrestricted is bundled in the whole thing has to be
unrestricted (we can't restrict based on destination or intent)
but the NOT_METERED flag wasn't taken into account.

This wasn't a problem before because telephony set that statically
and late, but a change caused it to be marked NOT_METERED earlier
which exposed this bug.

bug: 37208956
Merged-In: I7b7a1c38621ce0ecde8cf041e82b1ebb7a9c6f15
Test: new NetworkCapabilitiesTest.  Fails without fix, works with.
Change-Id: I86c1b2854413a94662aa53e697d32380695ab9ac

7 years agoMerge "Introduce TextView attribute for control justification." into oc-dev am: 31eeb...
Seigo Nonaka [Fri, 21 Apr 2017 21:58:39 +0000 (21:58 +0000)]
Merge "Introduce TextView attribute for control justification." into oc-dev am: 31eeb08bdb
am: e7c2e03d22

Change-Id: I276206b9bff862e8147339e77e77faeb1a938f97