OSDN Git Service
Lorenzo Colitti [Fri, 14 Apr 2017 17:02:27 +0000 (17:02 +0000)]
resolve merge conflicts of
4db137b0599a to oc-dev-plus-aosp
am:
d6af00f5e4 -s ours
Change-Id: If109b819ad9cfa71890e6a377a6d2b08d35ead87
Jorim Jaggi [Fri, 14 Apr 2017 17:01:19 +0000 (17:01 +0000)]
Merge "Don't consider app as top app if alpha = 0" into oc-dev am:
4a2be133d4
am:
054a99d029
Change-Id: I00fa7330cb0f5452c1d1c11323cf13981c3355fb
Jesse Hall [Fri, 14 Apr 2017 17:00:13 +0000 (17:00 +0000)]
Merge "Allow disabling GL preload even if gfxdriver isn't updatable" into oc-dev am:
8cafe5d9b4
am:
e20f42b8a9
Change-Id: I5d7df6e69e0f3c1688873cff747d62e5ddd1f78d
Adam Lesinski [Fri, 14 Apr 2017 16:59:07 +0000 (16:59 +0000)]
Merge "AAPT2: Allow the ';' separator on Windows for split args" into oc-dev am:
b97d51a0d2
am:
48d5b68815
Change-Id: Ic6422832379d008311c7727f99090251d73bba6b
Dianne Hackborn [Fri, 14 Apr 2017 16:48:32 +0000 (16:48 +0000)]
Merge "Add new extra for identifying an intent coming from storage UI." into oc-dev am:
676bd21542
am:
9596d71664
Change-Id: Iacac793eb8b12cd11e39d2018cb3c1d30a29952f
Daniel Nishi [Fri, 14 Apr 2017 16:47:12 +0000 (16:47 +0000)]
Merge "Don't crash in background after app uninstall." into oc-dev am:
74037d1287
am:
f110127aef
Change-Id: Id0c46b2669af8386792dccd12407d8de6dc66d05
Jeff Tinker [Fri, 14 Apr 2017 16:46:07 +0000 (16:46 +0000)]
Merge "Deprecate MediaDrm's EVENT_KEY_EXPIRED method" into oc-dev am:
92fc8bdd51
am:
a29ecc1a1c
Change-Id: I6cb7def4e72bb154227cba3b50ea09ec7f6b5003
jiabin [Fri, 14 Apr 2017 16:36:01 +0000 (16:36 +0000)]
Merge "Add TvProvider methods to block or unblock package, get blocked packages" into oc-dev am:
2ec7decaa5
am:
4f499a0a17
Change-Id: I0622c0f58c5ba2560b5c17c52a613cadcdb24ecc
Romain Guy [Fri, 14 Apr 2017 16:33:12 +0000 (16:33 +0000)]
Merge "Range check transfer params in float domain" into oc-dev am:
819740cc73
am:
1f1667122a
Change-Id: I5240515f1dd5939227f90b8b2aaf59622af6bea7
Peng Xu [Fri, 14 Apr 2017 16:28:04 +0000 (16:28 +0000)]
Merge "Address review suggestions for sensor direct report related APIs" into oc-dev am:
5ebb159a92
am:
70004dd19c
Change-Id: I68cbdfa94e98abde8fa0b072605051f3e0ed561d
Makoto Onuki [Fri, 14 Apr 2017 16:25:50 +0000 (16:25 +0000)]
Merge "Actually remove the chooser APIs" into oc-dev am:
fbadd6dac9
am:
efda6390c9
Change-Id: I0a43d717f62dddace49e63ff2ab80283dea12357
Evan Rosky [Fri, 14 Apr 2017 16:23:44 +0000 (16:23 +0000)]
Merge "Improve rect-level focus ordering" into oc-dev am:
197052d6cb
am:
d6072f2900
Change-Id: Ide53aafb83aa1ca71adb966472ad5a411197e3f3
Adam Lesinski [Fri, 14 Apr 2017 16:20:55 +0000 (16:20 +0000)]
Merge "AAPT2: Fix order-of-destruction crash" into oc-dev am:
62b713ed73
am:
2fc8adc5fc
Change-Id: Ic723218e00e8eea1305bb47083bc056816c6f1a3
Selim Cinek [Fri, 14 Apr 2017 16:19:57 +0000 (16:19 +0000)]
Merge changes Icc9c36f7,I723474e2 into oc-dev am:
07525d4f25
am:
f1f29ca50b
Change-Id: Iff0c951c0a1e27f6285f994df3a6f40c9a3bd8e3
Lei Yu [Fri, 14 Apr 2017 16:18:02 +0000 (16:18 +0000)]
Merge "Refine BatteryInfo and battery drawable" into oc-dev am:
57af565fb7
am:
24638307c2
Change-Id: Ifae38f01a454fe9dcea1fbde0ea1a57a15087d8a
Jean-Michel Trivi [Fri, 14 Apr 2017 16:16:46 +0000 (16:16 +0000)]
Merge "Fix A11y volume persisting/restore" into oc-dev am:
076a0bd0bf
am:
350b39fbc8
Change-Id: I376101c1e68cdab01cdf3ee0db3bbe64b4bcd631
Dongwon Kang [Fri, 14 Apr 2017 16:12:49 +0000 (16:12 +0000)]
Merge "TIF: add helper methods for making a channel browsable." into oc-dev am:
b2eb818a7d
am:
3d9ecc264d
Change-Id: I321131835e44d67bb5fab085bc7f36a838dd40e3
Bookatz [Fri, 14 Apr 2017 16:11:50 +0000 (16:11 +0000)]
Merge "Collect background stats: syncs" into oc-dev am:
a8fc7bff5a
am:
53b7ff2014
Change-Id: I30744a569a8617369e52c06de9b897128521cbb4
Jeremy Joslin [Fri, 14 Apr 2017 16:10:34 +0000 (16:10 +0000)]
Merge "Add more NetworkRecommendationProvider documentation." into oc-dev am:
5879aa4b03
am:
9bcbf38e79
Change-Id: I6f57d8b0cc62b9ebe690e6d2efc5c725e90c8fe7
Adam Lesinski [Fri, 14 Apr 2017 16:09:37 +0000 (16:09 +0000)]
Merge "Add example to TypedValue.changingConfigurations JavaDoc" into oc-dev am:
4124851b64
am:
b8dc42fcf3
Change-Id: I4874c6683a150b98f8edcd4f1d5e60e69b39e457
Jason Monk [Fri, 14 Apr 2017 16:08:42 +0000 (16:08 +0000)]
Merge "Fix location status bar icon" into oc-dev am:
d2b368a68d
am:
2e55245f98
Change-Id: I2dabf81060d98a2dcbec6487900c7148fc4daa07
Adam Lesinski [Fri, 14 Apr 2017 16:07:45 +0000 (16:07 +0000)]
Merge "Update docs for obtainStyledAttribute" into oc-dev am:
80b7a214ba
am:
f8235c3631
Change-Id: I7235021ff618fd99f5f1470cbf6e7e64420788e2
Bryce Lee [Fri, 14 Apr 2017 16:06:48 +0000 (16:06 +0000)]
Merge "Remove window container from empty task when destroying." into oc-dev am:
61bce9ab13
am:
a27128b8c7
Change-Id: Iadbae988357788bb50bbaebd7e4a580aaefb4308
Adam Lesinski [Fri, 14 Apr 2017 16:04:32 +0000 (16:04 +0000)]
Merge "BatteryStats: Remove reading of cpu power" into oc-dev am:
af85d84050
am:
51d94c82af
Change-Id: I0bef2f7074a06f8336d727dd89c685c76262eca5
Jim Van Verth [Fri, 14 Apr 2017 16:03:13 +0000 (16:03 +0000)]
Merge "Add uncached and perspective shadows to Skia renderer" into oc-dev am:
1be9766a68
am:
c7fd8db8a6
Change-Id: If7f3bfc01496a9fe9b198dc63bd7c064943c9008
Dianne Hackborn [Fri, 14 Apr 2017 16:01:58 +0000 (16:01 +0000)]
Merge "Add new facility to find out when a PendingIntent is canceled." into oc-dev am:
29c70437b3
am:
76c71a01e2
Change-Id: Ieafe036ee6c2662d5897a8052facd3cd0d9fbed7
Jason Monk [Fri, 14 Apr 2017 16:01:02 +0000 (16:01 +0000)]
Merge "Fix leak in nav bar" into oc-dev am:
0b67d53ba9
am:
cea904333e
Change-Id: I51b2753f46f5b18e791af39020aab2c8547981df
Shuo Qian [Fri, 14 Apr 2017 15:59:28 +0000 (15:59 +0000)]
Merge "ECBM SystemProperty cleanup" into oc-dev am:
efb8882b47
am:
21d8d8095e
Change-Id: I2e92b292366138f1e9b0d559ffec407b702d81ba
Geoffrey Pitsch [Fri, 14 Apr 2017 15:58:22 +0000 (15:58 +0000)]
Merge "Ensure removeForegroundService checks both lists under lock" into oc-dev am:
c4ca1b5677
am:
aa8dcf3751
Change-Id: Ic9780a11f1c3d3bbcbd8c5be350176507c62c685
Jack He [Fri, 14 Apr 2017 15:56:10 +0000 (15:56 +0000)]
Merge "Add developer setting and system API for inband ringing support" into oc-dev am:
aadf525e1a
am:
97164fe986
Change-Id: Iddc91ebca96bcb8e660c1b7117ab3fa57be7d4ee
Todd Kennedy [Fri, 14 Apr 2017 15:42:02 +0000 (15:42 +0000)]
Merge "Filter instant app content providers" into oc-dev am:
3891674204
am:
0bb486bcb4
Change-Id: If96297cade9909d744eb57669aecd96841a27a31
Jason Monk [Fri, 14 Apr 2017 15:35:20 +0000 (15:35 +0000)]
Merge "Update mobile data icon" into oc-dev am:
99856429db
am:
4520cb7ad9
Change-Id: I5fc19134a1ec0da5d4ede330a0d430ed428a53fa
Chris Tate [Fri, 14 Apr 2017 15:34:16 +0000 (15:34 +0000)]
Merge "Introduce PACKAGE_FIRST_ADDED broadcast" into oc-dev am:
117ac766a9
am:
636915a2ed
Change-Id: I28d8d31b30c9b500be1796566bb9885741b9aedc
Seigo Nonaka [Fri, 14 Apr 2017 15:31:25 +0000 (15:31 +0000)]
Merge "Introduce setFallbackTypeface" into oc-dev am:
729a515e5e
am:
17452ee553
Change-Id: I66fe816727aae3fdf617c41796b25478090704fe
Yu Liu [Fri, 14 Apr 2017 15:30:05 +0000 (15:30 +0000)]
Merge "Fix some issues came up from the reviews of the newly added APIs Test: Existing unit tests still pass. BUG:
36554361 Change-Id: I6c2dab2e0df7f8578f92c70907f45aa69909892c" into oc-dev am:
e425b366ba
am:
5303f33bdc
Change-Id: I138cf20ba4b804fb3627458acf6796203c37be39
Daniel Sandler [Fri, 14 Apr 2017 15:28:56 +0000 (15:28 +0000)]
Merge "Quick fix to lockscreen text color." into oc-dev am:
f06c2a01a5
am:
dc4fd3c847
Change-Id: Ieb6074d94b85a04ac7c87b5295b52817b2671c8e
Benoit Lamarche [Fri, 14 Apr 2017 13:59:04 +0000 (15:59 +0200)]
resolve merge conflicts of
57fb5872d19c to master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Icc3fa0cd65fd6cd952008bdd068d527e20c81ae8
Roozbeh Pournader [Fri, 14 Apr 2017 13:15:32 +0000 (13:15 +0000)]
Merge "Switch i18n listeners to use IME hint locales" into oc-dev am:
da97b66f41
am:
18fcf3f0d7
Change-Id: I43faa4ab695c52adf3c6d6f6170ffa5b6bc631f2
Chris Wren [Fri, 14 Apr 2017 13:14:37 +0000 (13:14 +0000)]
Merge "don't interpret milliseconds as nanoseconds" into oc-dev am:
de12503268
am:
a881fc2e2c
Change-Id: I6c803ec08b218203f3880cf0b2b269b3a6cb0692
Steve McKay [Fri, 14 Apr 2017 13:12:16 +0000 (13:12 +0000)]
Merge "Remove support for auto-paging of cursors." into oc-dev am:
7f0d8c8076
am:
0b28e794de
Change-Id: I96a8d2c4a0a90fdf70d4eced90306fe9ac75175c
Daichi Hirono [Fri, 14 Apr 2017 13:11:01 +0000 (13:11 +0000)]
Merge "Address API review for ProxyFileDescriptorCallback" into oc-dev am:
73b54bfd6d
am:
8bf30a7826
Change-Id: I48091d9868233f0ef329d0c2db4ffac5bba04eac
Andrew Solovay [Fri, 14 Apr 2017 13:09:59 +0000 (13:09 +0000)]
Merge "doc: Add note to Context.bindService()" into oc-dev am:
2c63aa3be7
am:
7cfe7cf19b
Change-Id: I6cd7cf2e25c0038afcf96a26ea2b8635a8ca7d95
Dave Friedman [Fri, 14 Apr 2017 13:08:57 +0000 (13:08 +0000)]
Merge "Docs: Fixes broken link in Javadoc. am:
df0fd34d50 am:
506a8b39fb am:
4eff74f8cb am:
2d642f9e2d am:
f125662db1" into oc-dev am:
46802905f5
am:
0e6b584116
Change-Id: Iedd3941d4bf4fcabd6ed24d510f54f4c5b71d903
Matt Sarett [Fri, 14 Apr 2017 13:07:31 +0000 (13:07 +0000)]
Merge "Add SkiaCanvas::captureCanvasState()" into oc-dev am:
59fa17a9d4
am:
d6b4c56a91 -s ours
Change-Id: Icabef048a4bba724ee674bdf80685397755c0d0b
Lorenzo Colitti [Fri, 14 Apr 2017 02:37:12 +0000 (11:37 +0900)]
resolve merge conflicts of
4db137b0599a to oc-dev-plus-aosp
Test: builds
Change-Id: I786ece9b82e47691855c8549e174345080964b91
Todd Lee [Thu, 16 Mar 2017 21:00:52 +0000 (14:00 -0700)]
OEM single-build/multi-SKU via dynamic RRO support
The purpose here is to provide support for selectively
enabling Runtime Resource Overlays (RROs) (specifically
those pertaining to a specific SKU, within a OEM's "single
build" covering multiple SKUs) at boot based on the value
of a pre-defined system property.
This mechanism is designed to be compatible with other,
recent changes to Runtime Resource Overlays - specifically:
- has no effect on 'isStatic'. Resource overlays must be
attributed as static in order to qualify for loading into
the system_server. The 'requiredSystemPropertyName/
requiredSystemPropertyValue' mechanism operates
independent of this and can be used on both static and
non static overlays. The effect of specifying a conditional
property on any overlay is that it will ONLY be enabled
in the event that the system reflects both the property
and the specified value (Note that in the ABSENCE of a
conditional property, overlays are assumed to be enabled).
- has no effect on OverlayManagerService (OMS) API. The
OMS provides the system with an interface through which
overlays can be enabled/disabled and even rearranged at
runtime. This provides the basis of support for various
user-level features (e.g. dynamic theme selection).
The 'requiredSystemPropertyName/requiredSystemPropertyValue'
mechanism operates independent of this -
with enablement being completely coupled to the available
system properties on the device and NOT subject to change
at runtime.
Note: as part of this change, original overlay tests have been
updated (fixed) and expanded to include tests to cover the
conditional property implementation.
Issue: http://b/
35100249
Test: frameworks/base/core/tests/overlaytests/testrunner.py
Change-Id: I1990ce21a27a385db1e2f53294b69dd03988351e
TreeHugger Robot [Fri, 14 Apr 2017 02:03:56 +0000 (02:03 +0000)]
Merge "Add EXTRA_WIPE_ESIMS for factory reset of eSIM"
TreeHugger Robot [Fri, 14 Apr 2017 01:44:32 +0000 (01:44 +0000)]
Merge "Implement new splash screen API"
Jorim Jaggi [Fri, 14 Apr 2017 01:14:18 +0000 (01:14 +0000)]
Merge "Don't consider app as top app if alpha = 0" into oc-dev
am:
4a2be133d4
Change-Id: Ibd7f89a49154bbf0bf89a5baa301e7912cf8db89
Jesse Hall [Fri, 14 Apr 2017 01:10:49 +0000 (01:10 +0000)]
Merge "Allow disabling GL preload even if gfxdriver isn't updatable" into oc-dev
am:
8cafe5d9b4
Change-Id: I024b5cf450aa2832bdd2638bd83b6d5048b80a7f
Adam Lesinski [Fri, 14 Apr 2017 01:09:40 +0000 (01:09 +0000)]
Merge "AAPT2: Allow the ';' separator on Windows for split args" into oc-dev
am:
b97d51a0d2
Change-Id: I25ee394a6950ca6cc85d66727847c32041a8a65b
TreeHugger Robot [Fri, 14 Apr 2017 01:08:49 +0000 (01:08 +0000)]
Merge "Connectivity metrics: add transports pretty printing" into oc-dev
Dianne Hackborn [Fri, 14 Apr 2017 01:08:26 +0000 (01:08 +0000)]
Merge "Add new extra for identifying an intent coming from storage UI." into oc-dev
am:
676bd21542
Change-Id: I0e806e12b361b90eb4f349a7624d5f5ce4c91a9b
Daniel Nishi [Fri, 14 Apr 2017 01:07:18 +0000 (01:07 +0000)]
Merge "Don't crash in background after app uninstall." into oc-dev
am:
74037d1287
Change-Id: I261336a0d6b729dfba31a812cfa106ffc01f9931
TreeHugger Robot [Fri, 14 Apr 2017 01:06:47 +0000 (01:06 +0000)]
Merge "Don't consider app as top app if alpha = 0" into oc-dev
TreeHugger Robot [Fri, 14 Apr 2017 01:00:41 +0000 (01:00 +0000)]
Merge "Allow disabling GL preload even if gfxdriver isn't updatable" into oc-dev
TreeHugger Robot [Fri, 14 Apr 2017 00:58:04 +0000 (00:58 +0000)]
Merge "AAPT2: Allow the ';' separator on Windows for split args" into oc-dev
Dianne Hackborn [Fri, 14 Apr 2017 00:56:34 +0000 (00:56 +0000)]
Merge "Add new extra for identifying an intent coming from storage UI." into oc-dev
Daniel Nishi [Fri, 14 Apr 2017 00:56:14 +0000 (00:56 +0000)]
Merge "Don't crash in background after app uninstall." into oc-dev
Jeff Tinker [Fri, 14 Apr 2017 00:18:41 +0000 (00:18 +0000)]
Merge "Deprecate MediaDrm's EVENT_KEY_EXPIRED method" into oc-dev
am:
92fc8bdd51
Change-Id: I14d1dae73008df0244c1435c1ab634d573208d50
TreeHugger Robot [Fri, 14 Apr 2017 00:09:38 +0000 (00:09 +0000)]
Merge "Deprecate MediaDrm's EVENT_KEY_EXPIRED method" into oc-dev
jiabin [Thu, 13 Apr 2017 23:48:18 +0000 (23:48 +0000)]
Merge "Add TvProvider methods to block or unblock package, get blocked packages" into oc-dev
am:
2ec7decaa5
Change-Id: Ic648086244bcc0df6b35cf8b8439d0bc200917d7
Romain Guy [Thu, 13 Apr 2017 23:45:32 +0000 (23:45 +0000)]
Merge "Range check transfer params in float domain" into oc-dev
am:
819740cc73
Change-Id: I51c15e9a81e8af04c2a4061ed0ac3b98272c1c44
Jorim Jaggi [Thu, 23 Feb 2017 14:35:51 +0000 (15:35 +0100)]
Implement new splash screen API
Test: mmm frameworks/base/tests/ActivityTests, launch
CustomSplashscreenActivity
Test: android.server.android.server.cts.SplashscreenTests
Bug:
37252694
Change-Id: I9a5bc19b8f63312e682e536500411e4ff4639f88
TreeHugger Robot [Thu, 13 Apr 2017 23:39:03 +0000 (23:39 +0000)]
Merge "Add TvProvider methods to block or unblock package, get blocked packages" into oc-dev
Romain Guy [Thu, 13 Apr 2017 23:35:22 +0000 (23:35 +0000)]
Merge "Range check transfer params in float domain" into oc-dev
Peng Xu [Thu, 13 Apr 2017 23:33:43 +0000 (23:33 +0000)]
Merge "Address review suggestions for sensor direct report related APIs" into oc-dev
am:
5ebb159a92
Change-Id: I39838189ba70cd74e726d4332e1c2adfb5b269d6
Andreas Huber [Thu, 13 Apr 2017 23:27:27 +0000 (23:27 +0000)]
Merge "Changed the naming scheme for Treble java libraries (both static and dynamic)"
qingxi [Thu, 13 Apr 2017 00:31:18 +0000 (17:31 -0700)]
Add EXTRA_WIPE_ESIMS for factory reset of eSIM
EXTRA_WIPE_ESIMS will be set as true when the user chooses to wip eSIM
information during factory reset. This will be handled by
MasterClearReceiver.
Bug:
37255419
Test: Test on phone
Change-Id: Ic2e4a6af8f9a9f3854f33eb9eeaf9b052e47e1b6
TreeHugger Robot [Thu, 13 Apr 2017 23:24:35 +0000 (23:24 +0000)]
Merge "Address review suggestions for sensor direct report related APIs" into oc-dev
Makoto Onuki [Thu, 13 Apr 2017 23:17:21 +0000 (23:17 +0000)]
Merge "Actually remove the chooser APIs" into oc-dev
am:
fbadd6dac9
Change-Id: Ibb59269e2da0698ebc7140c08de8265059be8033
Evan Rosky [Thu, 13 Apr 2017 23:14:53 +0000 (23:14 +0000)]
Merge "Improve rect-level focus ordering" into oc-dev
am:
197052d6cb
Change-Id: I3e155776f9ccffb6f0a2d19b73ec73f0b8bf829b
TreeHugger Robot [Thu, 13 Apr 2017 23:08:49 +0000 (23:08 +0000)]
Merge "Actually remove the chooser APIs" into oc-dev
Adam Lesinski [Thu, 13 Apr 2017 23:08:34 +0000 (23:08 +0000)]
Merge "AAPT2: Fix order-of-destruction crash" into oc-dev
am:
62b713ed73
Change-Id: I1e32861bec801645e11e36663d57d3e36bf3f133
Adam Lesinski [Thu, 13 Apr 2017 19:48:56 +0000 (12:48 -0700)]
AAPT2: Allow the ';' separator on Windows for split args
Bug:
36870463
Test: manual (wine)
Change-Id: I8a38545a3cac9354b41858e1840b197b60925c03
Evan Rosky [Thu, 13 Apr 2017 23:06:09 +0000 (23:06 +0000)]
Merge "Improve rect-level focus ordering" into oc-dev
Selim Cinek [Thu, 13 Apr 2017 23:02:41 +0000 (23:02 +0000)]
Merge changes Icc9c36f7,I723474e2 into oc-dev
am:
07525d4f25
Change-Id: I84d476d21e920fdd28e8e1f7c18d54d3eaf1e23b
Adam Lesinski [Thu, 13 Apr 2017 22:53:56 +0000 (22:53 +0000)]
Merge "AAPT2: Fix order-of-destruction crash" into oc-dev
Jesse Hall [Thu, 13 Apr 2017 22:44:24 +0000 (15:44 -0700)]
Allow disabling GL preload even if gfxdriver isn't updatable
Bug:
34611670
Test: set ro.zygote.disable_gl_preload=1, shell start,
confirm GL driver isn't loaded in zygote process
by checking /proc/<pid>/maps
Change-Id: Ieb739bd7eba365917684cf830d78c15fea06f8cf
Selim Cinek [Thu, 13 Apr 2017 22:52:10 +0000 (22:52 +0000)]
Merge changes Icc9c36f7,I723474e2 into oc-dev
* changes:
Fixed a crash when expanding
Fixed the visual appearance on heads-up notifications
Anthony Chen [Thu, 13 Apr 2017 22:31:47 +0000 (22:31 +0000)]
Merge "Allow the "clear all" button to be toggled."
Hugo Benichi [Wed, 22 Mar 2017 09:29:58 +0000 (18:29 +0900)]
Connectivity metrics: add transports pretty printing
This patch also
- partially reverts commit
f927f0c52e7df5b057e7d28888c3cfed164d241a
that exposed a getTransports method on NetworkCapabilities.
- moves enumerateBits to BitUtils (as unpackBits), and adds the
reverse packBit method.
Bug:
34901696
Test: manually looked at $ adb shell dumpsys connmetrics list
Change-Id: I1650daf8fc9c1b6e0d986d2285f81e888be8847f
Merged-In: Id04f9080e7f75608deeb49306aec34941e71794c
(cherry picked from commit
df456e13a1127e3c8594b1d22ea4a9b3dca67a4b)
Lei Yu [Thu, 13 Apr 2017 21:52:40 +0000 (21:52 +0000)]
Merge "Refine BatteryInfo and battery drawable" into oc-dev
am:
57af565fb7
Change-Id: Ie9fce326b23293e9f66d71f4be4b166aae310eb0
Lei Yu [Thu, 13 Apr 2017 21:43:32 +0000 (21:43 +0000)]
Merge "Refine BatteryInfo and battery drawable" into oc-dev
Jean-Michel Trivi [Thu, 13 Apr 2017 21:40:36 +0000 (21:40 +0000)]
Merge "Fix A11y volume persisting/restore" into oc-dev
am:
076a0bd0bf
Change-Id: Ida09a7781114812adbb4536fac53a3773cd69dc4
Dongwon Kang [Thu, 13 Apr 2017 21:32:15 +0000 (21:32 +0000)]
Merge "TIF: add helper methods for making a channel browsable." into oc-dev
am:
b2eb818a7d
Change-Id: I54b92c8b773706de49ffd2e78df59568e19d3b49
Jean-Michel Trivi [Thu, 13 Apr 2017 21:32:03 +0000 (21:32 +0000)]
Merge "Fix A11y volume persisting/restore" into oc-dev
Bookatz [Thu, 13 Apr 2017 21:31:05 +0000 (21:31 +0000)]
Merge "Collect background stats: syncs" into oc-dev
am:
a8fc7bff5a
Change-Id: Id3f2d7b2a77c74657416e492519f2205bc46218a
Andreas Huber [Thu, 13 Apr 2017 17:45:47 +0000 (10:45 -0700)]
Changed the naming scheme for Treble java libraries (both static and dynamic)
android.hardware.foo@1.0-java => android.hardware.foo-V1.0-java
Bug:
37207894
Test: make
Change-Id: I2d8912dc752f904188457c3e6dac10da1afd287a
TreeHugger Robot [Thu, 13 Apr 2017 21:23:45 +0000 (21:23 +0000)]
Merge "TIF: add helper methods for making a channel browsable." into oc-dev
TreeHugger Robot [Thu, 13 Apr 2017 21:20:10 +0000 (21:20 +0000)]
Merge "Collect background stats: syncs" into oc-dev
Peng Xu [Fri, 7 Apr 2017 01:37:56 +0000 (18:37 -0700)]
Address review suggestions for sensor direct report related APIs
Changes inline with bug number
Some improvements about SensorDirectChannel class.
* Complete the doc about creation of SensorDirectChannel object.
* Make SensorDirectChannel implements java.nio.channels.Channel.
* Change isValid() to isOpen().
* Make close() thread safe.
Bug:
36550285
* Throw exception on failure of SensorManager.createDirectChannel.
* Change to use NullPointerException when unexpected null pointer
is passed in.
Bug:
36555061
* Move SensorManager.configureDirectChannel() to
SensorDirectChannel.configure().
* Format SensorDirectChannel.configure() function doc with
<pre></pre> to maintain the table structure.
* Reworded Sensor.isDirectChannelTypeSupported java doc.
Bug:
36555604
Test: pass updated cts SensorDirectReportTest
Change-Id: I447121eaf414cbc94292a109a9d93d2e3c89f8f4
Mike Tsao [Thu, 13 Apr 2017 21:16:27 +0000 (21:16 +0000)]
Merge "Add tests for ag/
2086796"
Jeremy Joslin [Thu, 13 Apr 2017 21:04:53 +0000 (21:04 +0000)]
Merge "Add more NetworkRecommendationProvider documentation." into oc-dev
am:
5879aa4b03
Change-Id: I4e41346ea4dd9a731f8747c3e447deb0a991fc3d
Adam Lesinski [Thu, 13 Apr 2017 21:03:53 +0000 (21:03 +0000)]
Merge "Add example to TypedValue.changingConfigurations JavaDoc" into oc-dev
am:
4124851b64
Change-Id: I2bdfbdbe4e08e4b10b0fe7a2d0ed813f29d72fe7
TreeHugger Robot [Thu, 13 Apr 2017 20:55:49 +0000 (20:55 +0000)]
Merge "Add more NetworkRecommendationProvider documentation." into oc-dev
TreeHugger Robot [Thu, 13 Apr 2017 20:54:24 +0000 (20:54 +0000)]
Merge "Add example to TypedValue.changingConfigurations JavaDoc" into oc-dev
Jason Monk [Thu, 13 Apr 2017 20:35:37 +0000 (20:35 +0000)]
Merge "Fix location status bar icon" into oc-dev
am:
d2b368a68d
Change-Id: Ibe7699d1ad05a5c261620838a270faf99ba66697
Adam Lesinski [Thu, 13 Apr 2017 20:34:34 +0000 (20:34 +0000)]
Merge "Update docs for obtainStyledAttribute" into oc-dev
am:
80b7a214ba
Change-Id: I66c85d892d708176f2cef6a6ef2b698976d649c9
Bryce Lee [Thu, 13 Apr 2017 20:33:19 +0000 (20:33 +0000)]
Merge "Remove window container from empty task when destroying." into oc-dev
am:
61bce9ab13
Change-Id: If4544085864f9fe40de4d2dd44ad4a880f79c43a
OSDN Git Service
