OSDN Git Service
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
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
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
TreeHugger Robot [Sat, 22 Apr 2017 03:50:00 +0000 (03:50 +0000)]
Merge "Show new colored icon for PDF printer" 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
TreeHugger Robot [Sat, 22 Apr 2017 02:53:06 +0000 (02:53 +0000)]
Merge "Added accessibility type on Autofill save dialog." 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
TreeHugger Robot [Sat, 22 Apr 2017 02:41:50 +0000 (02:41 +0000)]
Merge "Workaround apps that override surfaceCreated" 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
TreeHugger Robot [Sat, 22 Apr 2017 02:32:34 +0000 (02:32 +0000)]
Merge "Fix a spelling." into oc-dev
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
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
Hall Liu [Sat, 22 Apr 2017 02:00:18 +0000 (02:00 +0000)]
Merge "Second pass of eMBMS api."
am:
c90fcbd660
Change-Id: If77c71951d6514429752fa9c1ba0f8835c7e610b
Hall Liu [Sat, 22 Apr 2017 01:53:11 +0000 (01:53 +0000)]
Merge "Second pass of eMBMS api."
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
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
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
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
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
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
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
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
Hugo Benichi [Sat, 22 Apr 2017 00:51:03 +0000 (00:51 +0000)]
Merge changes I5187d17c,I49a76582 am:
7781a6d4c1
am:
f2e5cf715d
Change-Id: Ia7298c92e50e00e139829498af00d80a5840d4cb
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
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
Hugo Benichi [Sat, 22 Apr 2017 00:43:07 +0000 (00:43 +0000)]
Merge changes I5187d17c,I49a76582
am:
7781a6d4c1
Change-Id: I9c484916a9e8adf11342c01b77077e8016a29b5f
Hugo Benichi [Sat, 22 Apr 2017 00:40:56 +0000 (00:40 +0000)]
Merge "NsdManager: add unit tests"
am:
dc54ad7fc3
Change-Id: I928f19e359b7423d43d792c413de4195a64141a7
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
Sudheer Shanka [Sat, 22 Apr 2017 00:34:36 +0000 (00:34 +0000)]
Merge "Fix flaky tests in ConnOnActivityStartTest." into oc-dev
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
Dianne Hackborn [Sat, 22 Apr 2017 00:33:43 +0000 (00:33 +0000)]
Merge "Address various JobScheduler API feedback." into oc-dev
Hugo Benichi [Sat, 22 Apr 2017 00:31:27 +0000 (00:31 +0000)]
Merge "NsdManager: add unit tests"
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
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
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
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
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
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
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
Treehugger Robot [Sat, 22 Apr 2017 00:01:50 +0000 (00:01 +0000)]
Merge "Remove default public ctor from RttModifyStatus"
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
TreeHugger Robot [Fri, 21 Apr 2017 23:50:03 +0000 (23:50 +0000)]
Merge "Import translations. DO NOT MERGE" 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
TreeHugger Robot [Fri, 21 Apr 2017 23:40:24 +0000 (23:40 +0000)]
Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment" into oc-dev
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
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
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
TreeHugger Robot [Fri, 21 Apr 2017 23:25:48 +0000 (23:25 +0000)]
Merge "Fix @throws javadoc on SurfaceTexture ctors" into oc-dev
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
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
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
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
Treehugger Robot [Fri, 21 Apr 2017 23:12:51 +0000 (23:12 +0000)]
Merge "Mark Restricted APN connections as restricted."
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
TreeHugger Robot [Fri, 21 Apr 2017 22:35:49 +0000 (22:35 +0000)]
Merge "Propagate density through AdaptiveIconDrawable and BitmapDrawable" 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
TreeHugger Robot [Fri, 21 Apr 2017 22:27:43 +0000 (22:27 +0000)]
Merge "Let unlocked profile verifyCredential under unified lock" into oc-dev
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)
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
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
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
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
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
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
Treehugger Robot [Fri, 21 Apr 2017 21:53:14 +0000 (21:53 +0000)]
Merge "Use Vpn rules (not firewall) for always-on VPN"
Seigo Nonaka [Fri, 21 Apr 2017 21:44:24 +0000 (21:44 +0000)]
Merge "Introduce TextView attribute for control justification." into oc-dev
am:
31eeb08bdb
Change-Id: If757a42d277a4a313eafe08196610eb1cebc2bf5
Hassan Shojania [Fri, 21 Apr 2017 21:42:07 +0000 (21:42 +0000)]
Merge "Fix for MediaPlayerStreamingStressTest/HLS" into oc-dev
am:
a72902a079
Change-Id: I6825cfec699dbe1135ee12df0ce81052d7e57304
Chen Xu [Fri, 21 Apr 2017 21:38:43 +0000 (21:38 +0000)]
Merge "telephony service support notification channel" into oc-dev
am:
53d9e9d094
Change-Id: I51432b33bce1cd957d2c1a139513d913a3b2c178
Hall Liu [Fri, 21 Apr 2017 21:33:12 +0000 (14:33 -0700)]
Remove default public ctor from RttModifyStatus
Test: builds
Bug:
37515063
Change-Id: I1e573d945b48e28d12621078cc8f37eb076d9ee3
Suprabh Shukla [Fri, 21 Apr 2017 21:31:45 +0000 (21:31 +0000)]
Merge "Renaming intent action for unknown sources" into oc-dev
am:
f277ccbca6
Change-Id: I836447e93964519f930e0ab1f9c08cdab406e2d6
TreeHugger Robot [Fri, 21 Apr 2017 21:31:13 +0000 (21:31 +0000)]
Merge "Introduce TextView attribute for control justification." into oc-dev
Makoto Onuki [Fri, 21 Apr 2017 21:29:07 +0000 (21:29 +0000)]
Merge "Add more log to track down the "idle until changed" issue." into oc-dev
am:
ba5c2d3e44
Change-Id: Ibf74cfc80511d6167c134d7e86e8e59921dc90c7
Hassan Shojania [Fri, 21 Apr 2017 21:28:34 +0000 (21:28 +0000)]
Merge "Fix for MediaPlayerStreamingStressTest/HLS" into oc-dev
Chen Xu [Fri, 21 Apr 2017 21:26:26 +0000 (21:26 +0000)]
Merge "telephony service support notification channel" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 21:22:05 +0000 (21:22 +0000)]
Merge "Renaming intent action for unknown sources" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 21:20:24 +0000 (21:20 +0000)]
Merge "Add more log to track down the "idle until changed" issue." into oc-dev
Wei Jia [Fri, 21 Apr 2017 21:19:36 +0000 (21:19 +0000)]
Merge "MediaPlayer: fix new API seekTo to address API review." into oc-dev
am:
62a3aa745a
Change-Id: I09feef76ad0ea67eaebecb6a14494b4fcb33e1e8
Seigo Nonaka [Fri, 21 Apr 2017 17:16:26 +0000 (10:16 -0700)]
Introduce TextView attribute for control justification.
Bug:
37447278
Test: am instrument -w -e class android.widget.cts.TextViewTest
android.widget.cts/android.support.test.runner.AndroidJUnitRunner
Change-Id: I7946f460ad8a6c2423b464c27225411d155d4d8d
Doris Liu [Fri, 21 Apr 2017 19:24:54 +0000 (12:24 -0700)]
Behavior compat for child being manipulated outside Animatorset
When a child animator is being manipulated outside of the AnimatorSet,
such as when the child animator is running before the AnimatorSet gets
started, we need to make sure we maintain the behavoir on N:
The child animator will be re-started at its scheduled start time in
the AnimatorSet.
BUG:
37507882
Test: Repro steps in comment #1 & ag/
2144081/
Change-Id: Ib97e85706f01d18a2e72fb4d1d678e22cf959894
TreeHugger Robot [Fri, 21 Apr 2017 21:10:47 +0000 (21:10 +0000)]
Merge "MediaPlayer: fix new API seekTo to address API review." into oc-dev
Eric Laurent [Fri, 21 Apr 2017 20:52:49 +0000 (20:52 +0000)]
Merge "audio service: simplify becoming noisy intent logic" into oc-dev
am:
910311b356
Change-Id: I13cbf5a51eaa884527f4df79fe215e4b012082e0
Jakub Pawlowski [Fri, 21 Apr 2017 20:50:07 +0000 (20:50 +0000)]
Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment" am:
c8d5f84fcf am:
e00b92e550
am:
b4be7093da
Change-Id: I712347c5e3ceaae00fd179e77d62311ef6bba89d
John Reck [Fri, 21 Apr 2017 17:50:59 +0000 (10:50 -0700)]
Fix @throws javadoc on SurfaceTexture ctors
Change-Id: I63bd76ec4e44251b7e06ad6fc8aa5a3372104656
Fixes:
37323694
Test: Looked at generated docs, verified correct
Jakub Pawlowski [Fri, 21 Apr 2017 20:43:55 +0000 (20:43 +0000)]
Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment" am:
c8d5f84fcf
am:
e00b92e550
Change-Id: I6805a973e91ac16cfc5d1c30567df04e7ed98ba2
TreeHugger Robot [Fri, 21 Apr 2017 20:43:45 +0000 (20:43 +0000)]
Merge "audio service: simplify becoming noisy intent logic" into oc-dev
Jakub Pawlowski [Fri, 21 Apr 2017 11:59:55 +0000 (04:59 -0700)]
Bluetooth: improve getLeMaximumAdvertisingDataLength comment
Bug:
37534792
Test: none
Change-Id: Ieff71356aceb0e2a4c6e81d9053f854448e0c927
(cherry picked from commit
4634b5cd27b274105e550f58f9d5fc51c79eb3fb)
Matthew Ng [Fri, 21 Apr 2017 20:39:21 +0000 (20:39 +0000)]
Merge "Increases the minimized width in landscape by statusbar height" into oc-dev
am:
e00febf61c
Change-Id: Icb24d1e3e2845544936268fbbb5d27b48681506d
Jakub Pawlowski [Fri, 21 Apr 2017 20:38:00 +0000 (20:38 +0000)]
Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment"
am:
c8d5f84fcf
Change-Id: Ieec563c19e318e6ffc0716009d554a11ff9f4847
TreeHugger Robot [Fri, 21 Apr 2017 20:30:46 +0000 (20:30 +0000)]
Merge "Increases the minimized width in landscape by statusbar height" into oc-dev
Jakub Pawlowski [Fri, 21 Apr 2017 20:28:44 +0000 (20:28 +0000)]
Merge "Bluetooth: improve getLeMaximumAdvertisingDataLength comment"
Jakub Pawlowski [Fri, 21 Apr 2017 11:59:55 +0000 (04:59 -0700)]
Bluetooth: improve getLeMaximumAdvertisingDataLength comment
Bug:
37534792
Test: none
Change-Id: Ieff71356aceb0e2a4c6e81d9053f854448e0c927
Jeff Sharkey [Fri, 21 Apr 2017 20:26:59 +0000 (20:26 +0000)]
Merge "Move PackageManager to new auto-doc feature!" into oc-dev
am:
0a02259bba
Change-Id: I10256e0e19e07f0636561a202cd5a5f38a59047f
Adam Lesinski [Sat, 15 Apr 2017 01:41:52 +0000 (18:41 -0700)]
Propagate density through AdaptiveIconDrawable and BitmapDrawable
Resources#getDrawableForDensity now propagates the overridden
density through to AdaptiveIconDrawable so that the density can be
propagated to leaf BitmapDrawables correctly.
This enables AdaptiveIconDrawable to support higher resolution
foreground/background bitmaps for use in Launcher.
Bug:
36039665
Test: bit CtsContentTestCases:android.content.res.cts.ResourcesTest
Change-Id: Iaa9a5592626e38e1ff839a76f7c6cfb9e16e5dc1
TreeHugger Robot [Fri, 21 Apr 2017 20:20:03 +0000 (20:20 +0000)]
Merge "Move PackageManager to new auto-doc feature!" into oc-dev
Sudheer Shanka [Thu, 20 Apr 2017 23:57:50 +0000 (16:57 -0700)]
Don't clear restart counter when bringing up the service.
There is no need for clearing the restart counter when bringing
up the service. If the service is being started because of rescheduling,
then we need to keep track of the counter and shouldn't clear it.
And if it is being started because some other process invoked
startService/bindService, then it needs to be cleared and we already do that
in unscheduleServiceRestartLocked. Also, update the condition for
checking if the service is waiting to restart since +ve restartDelay
doesn't always mean that the service is waiting to restart.
Bug:
36576035
Test: manual &&
cts-tradefed run singleCommand cts-dev -m CtsAppTestCases -t android.app.cts.ServiceTest
cts-tradefed run singleCommand cts-dev -m CtsAppTestCases -t android.app.cts.ActivityManagerTest
cts-tradefed run singleCommand cts-dev -m CtsAppTestCases -t android.app.cts.IntentServiceTest
Change-Id: I95b8adc84ef1918fd7dce727a87b71e2561b0938
Jeff Sharkey [Fri, 21 Apr 2017 20:10:50 +0000 (20:10 +0000)]
Merge "Fix code accounting bugs, track external app data." into oc-dev
am:
4b32f7c676
Change-Id: Ie14bf66fd93d6c461983a5232d4164c815cb56b7
Jeff Sharkey [Fri, 21 Apr 2017 20:01:36 +0000 (20:01 +0000)]
Merge "Fix code accounting bugs, track external app data." into oc-dev
Lucas Dupin [Fri, 21 Apr 2017 19:44:14 +0000 (19:44 +0000)]
Merge "Add transfer mode support to ColorDrawable" into oc-dev
am:
eedceb5721
Change-Id: If27a7e4154dabbeffd2b11ee2b788c9e30b3d9a7
Craig Donner [Fri, 21 Apr 2017 19:40:01 +0000 (19:40 +0000)]
Merge "Update HardwareBuffer API." into oc-dev
am:
649040c7f6
Change-Id: I49687761d304075acc048afa2e97e4b0b9b84680
Dianne Hackborn [Fri, 21 Apr 2017 19:32:27 +0000 (19:32 +0000)]
Merge "Fix issue #
32180780: Sync adapters inappropriately being run..." into oc-dev
am:
0fa2574ecb
Change-Id: I7ea8132d0dcda44c25d1d96a1ce4f52f6cb0e72c
OSDN Git Service
