OSDN Git Service
Sundeep Ghuman [Sun, 30 Apr 2017 04:59:19 +0000 (04:59 +0000)]
Merge "Don't show unset values in AccessPoint toString." into oc-dev
am:
606c05396d
Change-Id: Ie031883b24a4b8342253efaa34e1ec8ecdaa2a04
TreeHugger Robot [Sun, 30 Apr 2017 04:53:13 +0000 (04:53 +0000)]
Merge "Don't show unset values in AccessPoint toString." into oc-dev
Erik Kline [Sun, 30 Apr 2017 04:39:16 +0000 (04:39 +0000)]
Merge "Use ConnectivityService's NETWORK_STACK permission for SoftAp operations" into oc-dev
am:
d0e65f5ef0
Change-Id: I531d5f5964a1212af5842e682bb95d9ee01a6360
TreeHugger Robot [Sun, 30 Apr 2017 04:32:35 +0000 (04:32 +0000)]
Merge "Use ConnectivityService's NETWORK_STACK permission for SoftAp operations" into oc-dev
Ajay Panicker [Tue, 18 Apr 2017 03:42:22 +0000 (20:42 -0700)]
Limit btsnoop file size (3/8)
Limit btsnoop file size by rotating between snoop files. The rotation occurrs
when a fixed number of packets have been logged and will start overwriting
the older file.
Bug:
35998031
Test: Enable snoop logs from developer options and let logs get large
Change-Id: I40d5da4c1b1c9b45908e5790d130f1c5e804c773
(cherry picked from commit
00e82f235cb15d742eb7a25a81f0323b1b6408cf)
Selim Cinek [Sat, 29 Apr 2017 23:14:26 +0000 (23:14 +0000)]
Merge "Fixed an issue where notifications wouldn't have a channel" into oc-dev
am:
34c226d602
Change-Id: I188cf60bc893aa14869a84f5e699298faaf61469
TreeHugger Robot [Sat, 29 Apr 2017 23:09:36 +0000 (23:09 +0000)]
Merge "Fixed an issue where notifications wouldn't have a channel" into oc-dev
Winson Chung [Sat, 29 Apr 2017 22:44:51 +0000 (22:44 +0000)]
Merge "Fixing test due to null PiP default bounds." into oc-dev
am:
0152fd3686
Change-Id: Id14fa9d368f1c121f36ab3b20f0183a8cc5a8934
Yipeng Cao [Sat, 29 Apr 2017 22:42:25 +0000 (22:42 +0000)]
Merge "Fixed the hasCarrierFrequency flag in GnssStatus (part1)" into oc-dev
am:
80e1b2fc56
Change-Id: I9cff443fbb5009d3bb20d9050cd5980dc7c0b17f
TreeHugger Robot [Sat, 29 Apr 2017 22:36:56 +0000 (22:36 +0000)]
Merge "Fixing test due to null PiP default bounds." into oc-dev
Yipeng Cao [Sat, 29 Apr 2017 22:34:55 +0000 (22:34 +0000)]
Merge "Fixed the hasCarrierFrequency flag in GnssStatus (part1)" into oc-dev
Adam Lesinski [Sat, 29 Apr 2017 21:44:54 +0000 (21:44 +0000)]
Merge "AAPT2: binary parser should be more lenient with files" into oc-dev
am:
557a0c50a0
Change-Id: Ief1b27016f7a8555611d1c828d1e71722370ce92
TreeHugger Robot [Sat, 29 Apr 2017 21:39:26 +0000 (21:39 +0000)]
Merge "AAPT2: binary parser should be more lenient with files" into oc-dev
Adam Lesinski [Sat, 29 Apr 2017 21:08:47 +0000 (21:08 +0000)]
Merge "AAPT2: Fix string escaping" into oc-dev
am:
f6bc1402ed
Change-Id: I31f0c21dcf391384759e71112957ccdc281965d3
TreeHugger Robot [Sat, 29 Apr 2017 21:04:34 +0000 (21:04 +0000)]
Merge "AAPT2: Fix string escaping" into oc-dev
Adam Lesinski [Sat, 29 Apr 2017 20:44:17 +0000 (20:44 +0000)]
Merge changes I446fb6ab,Ife3bbd29 into oc-dev
am:
53c9898e79
Change-Id: Ie8ae301856c5734eef2fc919116944ef2e741aa9
TreeHugger Robot [Sat, 29 Apr 2017 20:38:15 +0000 (20:38 +0000)]
Merge changes I446fb6ab,Ife3bbd29 into oc-dev
* changes:
Valid resource IDs may be negative
AAPT2: Workaround for findViewById with package ID > 0x7f
Esteban Talavera [Sat, 29 Apr 2017 19:55:13 +0000 (19:55 +0000)]
Merge "Add managed profile whitelist to control NotificationListenerServices" into oc-dev
am:
5bb8294f92
Change-Id: I78a9d01c4e91cfbf8d6703d1c2c15590d0d72fa4
TreeHugger Robot [Sat, 29 Apr 2017 19:49:31 +0000 (19:49 +0000)]
Merge "Add managed profile whitelist to control NotificationListenerServices" into oc-dev
Bill Yi [Sat, 29 Apr 2017 18:22:29 +0000 (18:22 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
d95344d8aa -s ours
Change-Id: I0b97a8efe7a09d1b37d756a43efa4af083120d67
TreeHugger Robot [Sat, 29 Apr 2017 18:14:53 +0000 (18:14 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Jeff Sharkey [Sat, 29 Apr 2017 17:48:28 +0000 (17:48 +0000)]
Merge "Revert "Treat Telephony as legacy app for now."" into oc-dev
am:
e14159d2c5
Change-Id: Ia51f9f817a7792c5b4e63ad5af532ebd59cff95f
Jeff Sharkey [Sat, 29 Apr 2017 17:42:42 +0000 (17:42 +0000)]
Merge "Experimental features only on debuggable builds." into oc-dev
am:
d9f6946c42
Change-Id: I3d6228116545661eb30d997d8f7137f168adc79e
Jeff Sharkey [Sat, 29 Apr 2017 17:38:53 +0000 (17:38 +0000)]
Merge "Revert "Treat Telephony as legacy app for now."" into oc-dev
Jeff Sharkey [Sat, 29 Apr 2017 17:33:54 +0000 (17:33 +0000)]
Merge "Experimental features only on debuggable builds." into oc-dev
Jeff Sharkey [Sat, 29 Apr 2017 17:22:04 +0000 (17:22 +0000)]
Merge "API fixes for Companion renaming" into oc-dev
am:
0a482bda21
Change-Id: Ieae01b365a956afb48531a16adf3051e1624255d
Jeff Sharkey [Sat, 29 Apr 2017 17:15:12 +0000 (17:15 +0000)]
Merge "Rename Companion permissions" into oc-dev
am:
48c0dc6c4b
Change-Id: Ia52e6c6347969612dc1d4baf036fd696ac568c58
Jeff Sharkey [Sat, 29 Apr 2017 17:11:35 +0000 (17:11 +0000)]
Merge "API fixes for Companion renaming" into oc-dev
Jeff Sharkey [Sat, 29 Apr 2017 17:04:42 +0000 (17:04 +0000)]
Merge "Rename Companion permissions" into oc-dev
Jeff Sharkey [Sat, 29 Apr 2017 16:44:11 +0000 (16:44 +0000)]
Merge "Remove FontVariationAxis.InvalidFormatException." into oc-dev
am:
408ec0b463
Change-Id: I9d013dec3bffac03ddebbd5689f20f94d5d5f96d
Jeff Sharkey [Sat, 29 Apr 2017 16:39:32 +0000 (16:39 +0000)]
Merge "Remove FontVariationAxis.InvalidFormatException." into oc-dev
Makoto Onuki [Sat, 29 Apr 2017 16:25:22 +0000 (16:25 +0000)]
Merge "bringDownServiceLocked() shouldn't complain when mServicesByName..." into oc-dev
am:
1f1d372524
Change-Id: Ide5cfde6d0f8982c0fa51f6f8e10f1ce7a65389e
Makoto Onuki [Sat, 29 Apr 2017 16:19:39 +0000 (16:19 +0000)]
Merge "bringDownServiceLocked() shouldn't complain when mServicesByName..." into oc-dev
Phil Weaver [Sat, 29 Apr 2017 16:02:19 +0000 (16:02 +0000)]
Merge "A11y changes for API council" into oc-dev
am:
060f0f0341
Change-Id: I01903d823b11d558f415c2a15baa2cf69cbfdeda
TreeHugger Robot [Sat, 29 Apr 2017 15:54:21 +0000 (15:54 +0000)]
Merge "A11y changes for API council" into oc-dev
Julia Reynolds [Sat, 29 Apr 2017 14:23:20 +0000 (14:23 +0000)]
Merge "Autogrouped summaries should be muted" into oc-dev
am:
e97fae5110
Change-Id: I0f0ecdef0083d9bba0527f1d13510f15bdd30c1b
TreeHugger Robot [Sat, 29 Apr 2017 14:15:22 +0000 (14:15 +0000)]
Merge "Autogrouped summaries should be muted" into oc-dev
Erik Kline [Sat, 29 Apr 2017 07:50:31 +0000 (07:50 +0000)]
Merge "Use ConnectivityService's NETWORK_STACK permission for SoftAp operations" am:
169681db26 am:
b663a7d6d7
am:
b6ec8ed691
Change-Id: If6c7225e853e1969022d9b9d6cee127c477e0df7
Erik Kline [Sat, 29 Apr 2017 07:46:00 +0000 (07:46 +0000)]
Merge "Use ConnectivityService's NETWORK_STACK permission for SoftAp operations" am:
169681db26
am:
b663a7d6d7
Change-Id: I64d3251de665cead6b0067728574b367698619d2
Erik Kline [Sat, 29 Apr 2017 07:39:58 +0000 (07:39 +0000)]
Merge "Use ConnectivityService's NETWORK_STACK permission for SoftAp operations"
am:
169681db26
Change-Id: Ifd9e1c3645c2fa7c6671991edf52d1deb63d9d1c
Erik Kline [Sat, 29 Apr 2017 07:33:34 +0000 (07:33 +0000)]
Merge "Use ConnectivityService's NETWORK_STACK permission for SoftAp operations"
Wale Ogunwale [Sat, 29 Apr 2017 07:08:57 +0000 (07:08 +0000)]
Merge "Don't try to create user for task snapshot tests" into oc-dev
am:
ef1648c2cd
Change-Id: I4e39fbec806a0e5080dcbcc2902b3ec880f78d1e
TreeHugger Robot [Sat, 29 Apr 2017 07:03:50 +0000 (07:03 +0000)]
Merge "Don't try to create user for task snapshot tests" into oc-dev
Jakub Pawlowski [Sat, 29 Apr 2017 06:17:20 +0000 (06:17 +0000)]
Merge "Bluetooth: bluetooth.le API fixes" into oc-dev
am:
62c36e1c17
Change-Id: Ie480ec7cdb89e81953d635b155b3c6f54cc89c40
Jakub Pawlowski [Sat, 29 Apr 2017 06:11:34 +0000 (06:11 +0000)]
Merge "Bluetooth: bluetooth.le API fixes" into oc-dev
Erik Kline [Sat, 29 Apr 2017 04:20:04 +0000 (13:20 +0900)]
Use ConnectivityService's NETWORK_STACK permission for SoftAp operations
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
Bug:
37647880
Bug:
37750597
Change-Id: I4fb603b7491013bc13b0c08a785eae6cd37337b9
(cherry picked from commit
256be78f7d00c619cca9ed5a550b04fabd4cc48e)
Erik Kline [Sat, 29 Apr 2017 04:20:04 +0000 (13:20 +0900)]
Use ConnectivityService's NETWORK_STACK permission for SoftAp operations
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
Bug:
37647880
Bug:
37750597
Change-Id: I4fb603b7491013bc13b0c08a785eae6cd37337b9
Philip P. Moltmann [Sat, 29 Apr 2017 05:32:12 +0000 (05:32 +0000)]
Merge "Make autofilled highlight an attribute" into oc-dev
am:
c7bd554d06
Change-Id: I8a35929069510a1483a734febb695a6f06af88a2
Makoto Onuki [Sat, 29 Apr 2017 05:27:14 +0000 (05:27 +0000)]
Merge "Make sure to update oom-adjustment when a service starts." into oc-dev
am:
ee818db6b2
Change-Id: I99197f11f9cbab9b32b481fede9b747f9504b7fd
Philip P. Moltmann [Sat, 29 Apr 2017 05:24:03 +0000 (05:24 +0000)]
Merge "Add constant for autofill-service-add URL" into oc-dev
am:
09d8db0381
Change-Id: Icddb1688c646732f2bb1739d54cd480d4465996b
Philip P. Moltmann [Sat, 29 Apr 2017 05:16:34 +0000 (05:16 +0000)]
Merge "Make autofilled highlight an attribute" into oc-dev
Makoto Onuki [Sat, 29 Apr 2017 05:15:39 +0000 (05:15 +0000)]
Merge "Make sure to update oom-adjustment when a service starts." into oc-dev
Philip P. Moltmann [Sat, 29 Apr 2017 05:14:36 +0000 (05:14 +0000)]
Merge "Add constant for autofill-service-add URL" into oc-dev
Android Build Merger (Role) [Sat, 29 Apr 2017 03:20:24 +0000 (03:20 +0000)]
Merge "Merge "Add android.os.VintfRuntimeInfo" am:
4f8a375958 am:
e0bf06dd9e am:
5fe979b404" into oc-dev-plus-aosp
Yifan Hong [Sat, 29 Apr 2017 03:19:09 +0000 (03:19 +0000)]
Merge "Add android.os.VintfRuntimeInfo" am:
4f8a375958 am:
e0bf06dd9e
am:
5fe979b404
Change-Id: Iae202b22ecc136343d82711435d49ce3597fa74f
Philip P. Moltmann [Sat, 29 Apr 2017 03:16:13 +0000 (03:16 +0000)]
Merge changes I1b2f0726,Iaed2c7e7 into oc-dev
am:
183b476538
Change-Id: Iaf386fbcdbadf132a2ac45b8f0225bf2e890f95c
Yifan Hong [Sat, 29 Apr 2017 03:12:52 +0000 (03:12 +0000)]
Merge "Add android.os.VintfRuntimeInfo" am:
4f8a375958
am:
e0bf06dd9e
Change-Id: Iae968194f2dbaa2effcf19399b1165a233aa32ba
Christopher Tate [Sat, 29 Apr 2017 03:11:43 +0000 (03:11 +0000)]
Merge "API: make "what's the quota?" an operation on the backup data sinks" into oc-dev
am:
78a00503db
Change-Id: Id94c4377bff554a5d40179247b4c0299930a1033
Yifan Hong [Sat, 29 Apr 2017 03:07:09 +0000 (03:07 +0000)]
Merge "Add android.os.VintfRuntimeInfo"
am:
4f8a375958
Change-Id: If9e389879ac9fc7c601b99daed714b7618e701bb
TreeHugger Robot [Sat, 29 Apr 2017 03:06:02 +0000 (03:06 +0000)]
Merge changes I1b2f0726,Iaed2c7e7 into oc-dev
* changes:
Apply proper theme to SaveUi
Prevent clipping of shadow when button is pressed
TreeHugger Robot [Sat, 29 Apr 2017 03:05:25 +0000 (03:05 +0000)]
Merge "API: make "what's the quota?" an operation on the backup data sinks" into oc-dev
Treehugger Robot [Sat, 29 Apr 2017 03:00:06 +0000 (03:00 +0000)]
Merge "Add android.os.VintfRuntimeInfo"
Lifu Tang [Sat, 29 Apr 2017 02:52:37 +0000 (02:52 +0000)]
Merge "Throttle location update rate in proximity alert" into oc-dev
am:
23a66d44ea
Change-Id: Ie3ece0718017984004ef4fd8303a730c47bd8907
TreeHugger Robot [Sat, 29 Apr 2017 02:48:24 +0000 (02:48 +0000)]
Merge "Throttle location update rate in proximity alert" into oc-dev
Bill Yi [Sat, 29 Apr 2017 01:58:07 +0000 (18:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iad522d6efa2a0c3a0cc5d88ac4e61e8515ef2bce
Auto-generated-cl: translation import
Winson Chung [Fri, 28 Apr 2017 00:36:41 +0000 (17:36 -0700)]
Fixing test due to null PiP default bounds.
- Also moving the default bounds call into the pinned stack window
controller
Bug:
37682538
Test: bit FrameworksServicesTests:com.android.server.am.ActivityStackSupervisorTests\#testReplacingTaskInPinnedStack
Change-Id: Id6608d484617ec1a596e608aab649a082b4b1e95
Yifan Hong [Wed, 26 Apr 2017 18:38:01 +0000 (11:38 -0700)]
Add android.os.VintfRuntimeInfo
This is the Java API for ::android::vintf::RuntimeInfo.
This will be used by CTS for device info report purposes.
Bug:
28656227
Test: cts-tradefed run cts -m CtsEdiHostTestCases --skip-preconditions
Change-Id: Id87c95a17e77d7ec1794a6f850de97edf9ae892d
Selim Cinek [Fri, 28 Apr 2017 23:50:41 +0000 (16:50 -0700)]
Fixed an issue where notifications wouldn't have a channel
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationDataTest.java
Change-Id: I44e66fe7c1b1cac816f3ae51bfefca3e0dafb465
Fixes:
37754736
Makoto Onuki [Fri, 28 Apr 2017 23:27:15 +0000 (16:27 -0700)]
bringDownServiceLocked() shouldn't complain when mServicesByName...
doesn't contain the given record, which is what happens when this method
is called by bringUpServiceLocked().
Bug
37746449
Test: bit CtsAppTestCases:ServiceTest
Change-Id: Ie540f634a0a1d2a1f16df382f1ea09a083ffa483
Android Build Merger (Role) [Fri, 28 Apr 2017 23:16:20 +0000 (23:16 +0000)]
Merge "Merge "Revert "Temporarily enable GL validation"" into oc-dev am:
8f4ac4ac05" into oc-dev-plus-aosp
Chris Craik [Fri, 28 Apr 2017 23:15:34 +0000 (23:15 +0000)]
Merge "Revert "Temporarily enable GL validation"" into oc-dev
am:
8f4ac4ac05
Change-Id: I7a44ab6a8a2a05c124bbe0d84475f5c21b1b7bf4
Andreas Gampe [Fri, 28 Apr 2017 23:13:59 +0000 (23:13 +0000)]
Merge "Aapt2: Fix png leak" am:
f62e38583a am:
5d4c38c637
am:
caecc66ba0 -s ours
Change-Id: I91911edbd4b9203a11067bc678807b7ca46895a7
Philip P. Moltmann [Fri, 28 Apr 2017 22:28:00 +0000 (15:28 -0700)]
Make autofilled highlight an attribute
Fixes:
37738299
Test: - CtsAutoFillServiceTestCases
- CtsUiRenderingTestCases:.testclasses.AutofillHighlightTests
Change-Id: I6106f7b2e44d18cd8c80c084f25737e43cbc44de
Eugene Susla [Thu, 27 Apr 2017 21:34:59 +0000 (14:34 -0700)]
API fixes for Companion renaming
Test: Ensure renaming still works
Fixes:
37748634
Change-Id: I6a863200b1f12db857c308e3b935b0f27f20c85b
Pavel Grafov [Fri, 28 Apr 2017 23:07:47 +0000 (23:07 +0000)]
Merge "Use List instead of array in network logging API." into oc-dev
am:
83d139bd1b
Change-Id: Iede6b7a87dd76d931ebfd05c8701169ecf162a5e
Jeff Sharkey [Fri, 28 Apr 2017 23:05:44 +0000 (23:05 +0000)]
Merge "Respond to API council feedback." into oc-dev
am:
d275dc83be
Change-Id: Ibfe675230ef74e5dea9eb7974604a66003e548fc
Andreas Gampe [Fri, 28 Apr 2017 23:04:23 +0000 (23:04 +0000)]
Merge "Aapt2: Fix png leak" am:
f62e38583a
am:
5d4c38c637
Change-Id: I0a14e885d6e2cf886b9e87f395ffa5a600ef7f28
Chris Craik [Fri, 28 Apr 2017 23:03:57 +0000 (23:03 +0000)]
Merge "Revert "Temporarily enable GL validation"" into oc-dev
TreeHugger Robot [Fri, 28 Apr 2017 22:59:55 +0000 (22:59 +0000)]
Merge "Use List instead of array in network logging API." into oc-dev
Matthew Ng [Fri, 28 Apr 2017 22:59:03 +0000 (22:59 +0000)]
Merge "Window can only be fully drawn if app window is not relaunching" into oc-dev
am:
f7e6f581c0
Change-Id: I9556d5c24d9192674338cbcf45cd042e02740a73
Andreas Gampe [Fri, 28 Apr 2017 22:57:50 +0000 (22:57 +0000)]
Merge "Aapt2: Fix png leak"
am:
f62e38583a
Change-Id: I902d6350fa90ebb18b49c3abe6050cfe5471dbb7
Chad Brubaker [Fri, 28 Apr 2017 22:57:17 +0000 (22:57 +0000)]
Merge "Create Instant App cookie dir if it doesn't exist" into oc-dev
am:
d2cc513e9f
Change-Id: I28d2e598a9599ded68f9682a058133fcb12eec9e
Jeff Sharkey [Fri, 28 Apr 2017 22:54:34 +0000 (22:54 +0000)]
Merge "Respond to API council feedback." into oc-dev
TreeHugger Robot [Fri, 28 Apr 2017 22:49:21 +0000 (22:49 +0000)]
Merge "Window can only be fully drawn if app window is not relaunching" into oc-dev
Andreas Gampe [Fri, 28 Apr 2017 22:45:25 +0000 (22:45 +0000)]
Merge "Aapt2: Fix png leak"
Dianne Hackborn [Fri, 28 Apr 2017 22:44:35 +0000 (22:44 +0000)]
Merge "Fix issue #
37324532: API Review: android.content.pm.InstrumentationInfo" into oc-dev
am:
fb5840b0e6
Change-Id: Ib6855dbaec382426038855ab43d5be6d7dcb8892
Lifu Tang [Fri, 24 Mar 2017 06:48:00 +0000 (23:48 -0700)]
Throttle location update rate in proximity alert
Bug:
36197768
Test: manual
Change-Id: I2427ed7e77e9153c20e7c65e8f861de4c7ffeac6
TreeHugger Robot [Fri, 28 Apr 2017 22:39:46 +0000 (22:39 +0000)]
Merge "Create Instant App cookie dir if it doesn't exist" into oc-dev
Hall Liu [Fri, 28 Apr 2017 22:38:27 +0000 (22:38 +0000)]
Merge "eMBMS API update" am:
99b21ccb34 am:
6b4841d116
am:
cfb792830c
Change-Id: I4d227eeae02910f4be020b3e9abf3ec5decc168d
Dianne Hackborn [Fri, 28 Apr 2017 22:34:48 +0000 (22:34 +0000)]
Merge "Fix issue #
37324532: API Review: android.content.pm.InstrumentationInfo" into oc-dev
Adam Lesinski [Fri, 28 Apr 2017 22:34:52 +0000 (15:34 -0700)]
AAPT2: binary parser should be more lenient with files
Some APKs have file references that reference files that don't exist.
For now, just be lenient and ignore the files themselves.
Keep the actual reference until such a time as general resource
stripping is implemented.
Bug:
37749644
Test: manual
Change-Id: I773685acf41212405b71b064d64045fb4556dcfc
Hall Liu [Fri, 28 Apr 2017 22:32:52 +0000 (22:32 +0000)]
Merge "eMBMS API update" am:
99b21ccb34
am:
6b4841d116
Change-Id: I54ea1661b0d7a341ea94c3a2348d1e6233fd0d80
Chad Brubaker [Fri, 28 Apr 2017 22:31:23 +0000 (22:31 +0000)]
Merge "Allow Instant Apps to read Settings defined by apps" into oc-dev
am:
5d80c9d5fe
Change-Id: I75ae6c210ccd1903d0bd4a814c231e0c570c6288
Hall Liu [Fri, 28 Apr 2017 22:25:53 +0000 (22:25 +0000)]
Merge "eMBMS API update"
am:
99b21ccb34
Change-Id: Ic459910f1a06979cf8e1813d18400236eeb1ad49
TreeHugger Robot [Fri, 28 Apr 2017 22:25:46 +0000 (22:25 +0000)]
Merge "Allow Instant Apps to read Settings defined by apps" into oc-dev
Seigo Nonaka [Fri, 28 Apr 2017 19:53:31 +0000 (12:53 -0700)]
Remove FontVariationAxis.InvalidFormatException.
Use IllegalArgumentException instead.
Bug:
37769084
Bug:
37765945
Test: am instrument -w -e class android.widget.cts.TextViewTest
android.widget.cts/android.support.test.runner.AndroidJUnitRunner
Test: am instrument -w -e class android.graphics.cts.TypefaceTest
android.graphics.cts/android.support.test.runner.AndroidJUnitRunner
Test: am instrument -w -e class android.graphics.cts.PaintTest
android.graphics.cts/android.support.test.runner.AndroidJUnitRunner
Test: am instrument -w -e class android.graphics.cts.FontVariationAxisTest
android.graphics.cts/android.support.test.runner.AndroidJUnitRunner
Test: am instrument -w -e class android.text.VariationParserTest
com.android.frameworks.coretests/\
android.support.test.runner.AndroidJUnitRunner
Change-Id: I50b70e3e7e37585c937dcce2416a83353de62a5d
Hall Liu [Fri, 28 Apr 2017 22:17:50 +0000 (22:17 +0000)]
Merge "eMBMS API update"
Wale Ogunwale [Fri, 28 Apr 2017 22:11:16 +0000 (15:11 -0700)]
Don't try to create user for task snapshot tests
Seems user creation can fail in test harness some times.
Also, I am not sure there is a need to create a user in this
case when we can just use the user id of the current process.
Also removed SettingBackupTest from @Presubmit since it is still
failing.
Bug:
37684646
Bug:
37682538
Test: SettingsBackupTest
Test: TaskSnapshotPersisterLoaderTest
Change-Id: I523bb576217f7782027741916f9ea14fc6d7fb50
Android Build Merger (Role) [Fri, 28 Apr 2017 22:06:55 +0000 (22:06 +0000)]
Merge "Merge "Bluetooth: bluetooth.le API fixes" am:
cf95973276 am:
6af9bde898 am:
62fc08f684" into oc-dev-plus-aosp
Jakub Pawlowski [Fri, 28 Apr 2017 22:06:06 +0000 (22:06 +0000)]
Merge "Bluetooth: bluetooth.le API fixes" am:
cf95973276 am:
6af9bde898
am:
62fc08f684
Change-Id: I7f8f4cb532afd05df48147068c4e51d1cba310d1
OSDN Git Service
