OSDN Git Service
Svet Ganov [Fri, 14 Apr 2017 04:36:40 +0000 (04:36 +0000)]
Merge "Allow custom buttons in autofill UI" into oc-dev
am:
249c4d709a
Change-Id: I25d94fe03626642ee8f456a78cfb502e1ca53b55
Android Build Merger (Role) [Fri, 14 Apr 2017 04:34:21 +0000 (04:34 +0000)]
Merge "Merge "Add ACTION_ACCOUNT_REMOVED to Account Manager." into oc-dev am:
2a30085e5c" into oc-dev-plus-aosp
Dmitry Dementyev [Fri, 14 Apr 2017 04:33:27 +0000 (04:33 +0000)]
Merge "Add ACTION_ACCOUNT_REMOVED to Account Manager." into oc-dev
am:
2a30085e5c
Change-Id: I2f583203d8b97f0a56c8b911d20098a3ed1772eb
Android Build Merger (Role) [Fri, 14 Apr 2017 04:33:02 +0000 (04:33 +0000)]
Merge "Merge changes Id0d536ff,I4fcd0ad7 into oc-dev am:
0e8090b10e" into oc-dev-plus-aosp
Hugo Benichi [Fri, 14 Apr 2017 04:32:17 +0000 (04:32 +0000)]
Merge changes Id0d536ff,I4fcd0ad7 into oc-dev
am:
0e8090b10e
Change-Id: I0b432e9d7aa5654a0aeac1d3d0a09e624bcbc9bc
Android Build Merger (Role) [Fri, 14 Apr 2017 04:31:44 +0000 (04:31 +0000)]
Merge "Merge "Relax enforcement of GET_USAGE_STATS permission." into oc-dev am:
f5d5e5e4bf" into oc-dev-plus-aosp
Jeff Sharkey [Fri, 14 Apr 2017 04:30:50 +0000 (04:30 +0000)]
Merge "Relax enforcement of GET_USAGE_STATS permission." into oc-dev
am:
f5d5e5e4bf
Change-Id: I2af664620bdaf6fa4551aade80e56decf0995838
Android Build Merger (Role) [Fri, 14 Apr 2017 04:30:25 +0000 (04:30 +0000)]
Merge "Merge "Add more doc to ColorSpace.getName()" into oc-dev am:
4cae059bb9" into oc-dev-plus-aosp
Romain Guy [Fri, 14 Apr 2017 04:29:39 +0000 (04:29 +0000)]
Merge "Add more doc to ColorSpace.getName()" into oc-dev
am:
4cae059bb9
Change-Id: If6674f4884a8d0e4c36072125cbcc7895a49abe5
Android Build Merger (Role) [Fri, 14 Apr 2017 04:29:17 +0000 (04:29 +0000)]
Merge "Merge "Turn down dynamic toggle for background restriction policy" into oc-dev am:
59047acea7" into oc-dev-plus-aosp
Christopher Tate [Fri, 14 Apr 2017 04:28:31 +0000 (04:28 +0000)]
Merge "Turn down dynamic toggle for background restriction policy" into oc-dev
am:
59047acea7
Change-Id: Ibd345b735d1743f2c253bc0d0937a44573343dd0
Android Build Merger (Role) [Fri, 14 Apr 2017 04:28:07 +0000 (04:28 +0000)]
Merge "Merge "Visual changes to PIP drag to dismiss UI" into oc-dev am:
59c124b755" into oc-dev-plus-aosp
Mady Mellor [Fri, 14 Apr 2017 04:27:08 +0000 (04:27 +0000)]
Merge "Visual changes to PIP drag to dismiss UI" into oc-dev
am:
59c124b755
Change-Id: I38781516da59f84f829699e2ef9c1db27e7578b6
Android Build Merger (Role) [Fri, 14 Apr 2017 04:26:44 +0000 (04:26 +0000)]
Merge "Check for non-null parent before delegating to it am:
3a74243ae4" into oc-dev-plus-aosp
Svet Ganov [Fri, 14 Apr 2017 04:26:02 +0000 (04:26 +0000)]
Check for non-null parent before delegating to it
am:
3a74243ae4
Change-Id: I294345cde604bf61175297ceb5ab11d23dbf6eb7
Rebecca Silberstein [Fri, 14 Apr 2017 04:25:57 +0000 (04:25 +0000)]
Merge "Add a default SSID prefix for local only hotspot" am:
e98a2942a4 am:
6fc5051613
am:
2f7a169618
Change-Id: Id0a6bc3452b909ac22704ab76b2811259f94147f
TreeHugger Robot [Fri, 14 Apr 2017 04:22:06 +0000 (04:22 +0000)]
Merge "Allow custom buttons in autofill UI" into oc-dev
Rebecca Silberstein [Fri, 14 Apr 2017 04:19:02 +0000 (04:19 +0000)]
Merge "Add a default SSID prefix for local only hotspot" am:
e98a2942a4
am:
6fc5051613
Change-Id: If99dc4527f2d85d803d7ef8eabfbb8601be11071
Andreas Huber [Fri, 14 Apr 2017 04:17:37 +0000 (04:17 +0000)]
Merge "Changed the naming scheme for Treble java libraries (both static and dynamic)" into oc-dev
am:
9b2ed2b7c4
Change-Id: Ibc670da31571add92a312b7673be376be67f9072
Roozbeh Pournader [Fri, 14 Apr 2017 04:14:25 +0000 (04:14 +0000)]
Merge "Add Adlam font to fonts.xml" into oc-dev
am:
1ad7ff32b1
Change-Id: Ic5244c47a1d31e75df484decc65195fd381bf8b5
Yifan Hong [Fri, 14 Apr 2017 04:13:04 +0000 (04:13 +0000)]
Merge "Add Java API for libvintf." into oc-dev
am:
c223d70e64
Change-Id: I4401faccfb5c6be29635983ec07dedb32b7f8c74
Rebecca Silberstein [Fri, 14 Apr 2017 04:12:34 +0000 (04:12 +0000)]
Merge "Add a default SSID prefix for local only hotspot"
am:
e98a2942a4
Change-Id: I3981dbbaa2eee7e54e8c8fd2d9825a3c0866bdb2
Ta-wei Yen [Fri, 14 Apr 2017 04:11:29 +0000 (04:11 +0000)]
Merge "Deprecate setVisualVoicemailEnabled isVisualVoicemailEnabled" into oc-dev
am:
ad989b1711
Change-Id: I7a9f56a2585584fdce87025cd07c5c526c9bc176
Rebecca Silberstein [Fri, 14 Apr 2017 04:03:48 +0000 (04:03 +0000)]
Merge "Add a default SSID prefix for local only hotspot"
TreeHugger Robot [Fri, 14 Apr 2017 03:53:48 +0000 (03:53 +0000)]
Merge "Add ACTION_ACCOUNT_REMOVED to Account Manager." into oc-dev
TreeHugger Robot [Fri, 14 Apr 2017 03:42:56 +0000 (03:42 +0000)]
Merge changes Id0d536ff,I4fcd0ad7 into oc-dev
* changes:
Connectivity metrics: add transports to connect stats
Connectivity metrics: log DnsEvents in-band
TreeHugger Robot [Fri, 14 Apr 2017 03:37:33 +0000 (03:37 +0000)]
Merge "Relax enforcement of GET_USAGE_STATS permission." into oc-dev
TreeHugger Robot [Fri, 14 Apr 2017 03:10:12 +0000 (03:10 +0000)]
Merge "Add more doc to ColorSpace.getName()" into oc-dev
TreeHugger Robot [Fri, 14 Apr 2017 03:00:19 +0000 (03:00 +0000)]
Merge "Turn down dynamic toggle for background restriction policy" into oc-dev
TreeHugger Robot [Fri, 14 Apr 2017 02:39:56 +0000 (02:39 +0000)]
Merge "Visual changes to PIP drag to dismiss UI" into oc-dev
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
Svet Ganov [Thu, 13 Apr 2017 23:03:34 +0000 (16:03 -0700)]
Check for non-null parent before delegating to it
Test: manual
bug:
37289681
Change-Id: If3055747471d4b7771256d8adaaa08b73641c09d
TreeHugger Robot [Fri, 14 Apr 2017 02:13:21 +0000 (02:13 +0000)]
Merge "Changed the naming scheme for Treble java libraries (both static and dynamic)" into oc-dev
TreeHugger Robot [Fri, 14 Apr 2017 02:04:31 +0000 (02:04 +0000)]
Merge "Add Adlam font to fonts.xml" into oc-dev
TreeHugger Robot [Fri, 14 Apr 2017 02:02:01 +0000 (02:02 +0000)]
Merge "Add Java API for libvintf." into oc-dev
Jeff Sharkey [Fri, 14 Apr 2017 01:43:34 +0000 (19:43 -0600)]
Relax enforcement of GET_USAGE_STATS permission.
This matches the logic used in all other places where we check for
this app-op.
Test: builds, boots
Bug:
37315351
Change-Id: I1fef7d30709d24c3f8978d33271a15b37b2ccc26
Hugo Benichi [Thu, 23 Mar 2017 09:38:22 +0000 (18:38 +0900)]
Connectivity metrics: add transports to connect stats
This patch groups connect() events per netId. It adds netid and
transport information to serialized ConnectStatistics events.
Test: updated NetdEventListenerServiceTest
updated IpConnectivityMetricsTest
$ runtest frameworks-net passes
Bug:
34901696
Change-Id: Id0d536ff723ded5c26eafe0bb138ba75ba2856c5
Merged-In: I4769496383943e714a1d350c298e093c2ed57477
(cherry picked from commit
dfc2cc5857199345e08f07977b79b20292f964a2)
TreeHugger Robot [Fri, 14 Apr 2017 01:44:01 +0000 (01:44 +0000)]
Merge "Deprecate setVisualVoicemailEnabled isVisualVoicemailEnabled" into oc-dev
Hugo Benichi [Wed, 22 Mar 2017 13:21:44 +0000 (22:21 +0900)]
Connectivity metrics: log DnsEvents in-band
This patch changes how DnsEvents are logged in IpConnectivityMetrics.
The following changes are made:
- DnsEventBatch are not logged after 100 queries on the same network
- this allows to merge DnsEvent and DnsEventBatch into one class
- DnsEventBatch are not logged after a network disconnect
- this allows to remove the NetworkCallback
- DnsEvent are now logged similarly to ConnectStats when statistics are
flushed, in a direct call from IpConnectivityMetrics into
NetdEventListenerService, in a direct call from IpConnectivityMetrics
into NetdEventListenerService.
- this allows to remove the Parcelable implementation of DnsEvent
- transports information is added to DnsEvent.
Test: - simplified NetdEventListenerServiceTest covering dns logging
- updated IpConnectivityEventBuilderTest
- updated IpConnectivityMetricsTest
- $ runtest frameworks-net passes
- manually verified $ adb shell dumpsys connmetrics list proto
Bug:
34901696
Change-Id: I4fcd0ad7a7b85d587647f471a90c1e53a18fc95a
Merged-In: Ia4b33fd4212741152662a2adbb0533bd1b4902ee
(cherry picked from commit
0699cf98042a64e41ee076c464eb115a6579be08)
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
Yifan Hong [Wed, 5 Apr 2017 21:42:05 +0000 (14:42 -0700)]
Add Java API for libvintf.
android.os.VintfObject has two methods:
- report: return device info that can be reported to OTA server
- verify: verify that metadata for a given OTA package is
compatible.
Test: pass
Test: adb shell am instrument -w -e class android.os.VintfObjectTest \
com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Bug:
36814503
Change-Id: Iff8fae289eec8ae9cfc327d0d0d36a1cdd5e6800
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
Christopher Tate [Fri, 14 Apr 2017 00:34:15 +0000 (17:34 -0700)]
Turn down dynamic toggle for background restriction policy
Bug
35248677
Test: manual
Change-Id: Ib2a85df27a0de7f205783506bd3d2afe2da92baf
Mady Mellor [Fri, 14 Apr 2017 00:20:15 +0000 (17:20 -0700)]
Visual changes to PIP drag to dismiss UI
Updated gradient asset, spacing, and added shadow to text
Test: Manual: have a PIP, move it around, observe drag to dismiss UI
Bug:
35358628
Change-Id: I8614468edfc14d0337d69184a7bbab5419f22ec3
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
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
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
Roozbeh Pournader [Thu, 13 Apr 2017 23:04:47 +0000 (16:04 -0700)]
Add Adlam font to fonts.xml
Change-Id: If6b4b9138b9b761360cfdd3c1ba9659739af6402
Fixes:
37156487
Test: not needed
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
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: Ica91a6813956f4ea99001c5f427be94865e48fde
Merged-In: I2d8912dc752f904188457c3e6dac10da1afd287a
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
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
Dmitry Dementyev [Wed, 12 Apr 2017 18:00:48 +0000 (11:00 -0700)]
Add ACTION_ACCOUNT_REMOVED to Account Manager.
AccountManagerService sends an intent with the action when account of any type is removed or renamed.
Test: manual, APCT.
Bug:
37280078
Change-Id: I53b1bb9d6cde1edba5c37ecf3e4e13d748b19005
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
TreeHugger Robot [Thu, 13 Apr 2017 20:26:12 +0000 (20:26 +0000)]
Merge "Fix location status bar icon" into oc-dev
Adam Lesinski [Thu, 13 Apr 2017 20:22:19 +0000 (20:22 +0000)]
Merge "BatteryStats: Remove reading of cpu power" into oc-dev
am:
af85d84050
Change-Id: I671a51d53c035d40cb1af1428f7c0f4093445aed
Jim Van Verth [Thu, 13 Apr 2017 20:16:17 +0000 (20:16 +0000)]
Merge "Add uncached and perspective shadows to Skia renderer" into oc-dev
am:
1be9766a68
Change-Id: I8034dff9695425939a00b3f38d06615ffcc0f2b4
TreeHugger Robot [Thu, 13 Apr 2017 20:15:47 +0000 (20:15 +0000)]
Merge "Update docs for obtainStyledAttribute" into oc-dev
Dianne Hackborn [Thu, 13 Apr 2017 20:15:05 +0000 (20:15 +0000)]
Merge "Add new facility to find out when a PendingIntent is canceled." into oc-dev
am:
29c70437b3
Change-Id: I5078d76e3eb861850ef7af769badf81dbdee418a
Jason Monk [Thu, 13 Apr 2017 20:13:55 +0000 (20:13 +0000)]
Merge "Fix leak in nav bar" into oc-dev
am:
0b67d53ba9
Change-Id: I46aa7def6eb54f967ab568fc459786d0401055d3
Shuo Qian [Thu, 13 Apr 2017 20:11:41 +0000 (20:11 +0000)]
Merge "ECBM SystemProperty cleanup" into oc-dev
am:
efb8882b47
Change-Id: I69e063bbb4c93f94d50c58a1c8af1643f5e024ca
Bryce Lee [Thu, 13 Apr 2017 20:10:39 +0000 (20:10 +0000)]
Merge "Remove window container from empty task when destroying." into oc-dev
Geoffrey Pitsch [Thu, 13 Apr 2017 20:10:13 +0000 (20:10 +0000)]
Merge "Ensure removeForegroundService checks both lists under lock" into oc-dev
am:
c4ca1b5677
Change-Id: I81a50649ba59d28fdfc9a7b8381bcaf346555a3a
OSDN Git Service
