OSDN Git Service
Jason Monk [Thu, 30 Jun 2016 20:47:03 +0000 (20:47 +0000)]
Merge \"SysUI: Mantain non-weak reference to listener\" into nyc-mr1-dev
am:
d4ec5df707
Change-Id: If20be5074d299830e5bd7373fadb1445dd7e5673
TreeHugger Robot [Thu, 30 Jun 2016 20:41:51 +0000 (20:41 +0000)]
Merge "SysUI: Mantain non-weak reference to listener" into nyc-mr1-dev
Andrew Sapperstein [Thu, 30 Jun 2016 20:34:58 +0000 (20:34 +0000)]
Merge \"Update the volume panel to use a system color.\" into nyc-mr1-dev
am:
ac44c9ef45
Change-Id: I12a2462487a054dd39c9621b6af8d40d7807fd23
Andrew Sapperstein [Thu, 30 Jun 2016 20:26:34 +0000 (20:26 +0000)]
Merge "Update the volume panel to use a system color." into nyc-mr1-dev
Jason Monk [Thu, 30 Jun 2016 20:24:59 +0000 (20:24 +0000)]
Merge \"Status bar blacklist: fix items resetting\" into nyc-mr1-dev
am:
fc27d96bcd
Change-Id: I934f88b5b97a9fb24f1e991af9c11f5fdcf4bd91
TreeHugger Robot [Thu, 30 Jun 2016 20:16:53 +0000 (20:16 +0000)]
Merge "Status bar blacklist: fix items resetting" into nyc-mr1-dev
Yohei Yukawa [Thu, 30 Jun 2016 19:37:35 +0000 (19:37 +0000)]
Merge \"Revert \"Remove InputContentInfo#requestPermission()\"\" into nyc-mr1-dev
am:
8acb1a7570
Change-Id: If7fab0527a3d4f671985a663fc6aaf808d527ace
Yohei Yukawa [Thu, 30 Jun 2016 19:30:19 +0000 (19:30 +0000)]
Merge "Revert "Remove InputContentInfo#requestPermission()"" into nyc-mr1-dev
Yohei Yukawa [Thu, 30 Jun 2016 19:24:04 +0000 (19:24 +0000)]
Revert "Remove InputContentInfo#requestPermission()"
This reverts commit
c4b8f36de5523366e354fc01b6cba81ad72f6423.
Having InputContentInfo#requestPermission() should not hurt developers,
but we can polish the behavior in a subsequent CL without changing
the API.
Bug:
29450031
Bug:
29892936
Change-Id: I1b43c19417b643d0c269af860db2d309b73a90d5
Jason Monk [Thu, 30 Jun 2016 19:04:11 +0000 (15:04 -0400)]
SysUI: Mantain non-weak reference to listener
Change-Id: Ie11dfac0af90d65baed40f593eb4ffe7ab0cc0e3
Fixes:
29778623
Jason Monk [Thu, 30 Jun 2016 18:43:50 +0000 (18:43 +0000)]
Merge \"QS: Layout and animation refinement\" into nyc-mr1-dev
am:
536a1a2ae7
Change-Id: Ia67c579dddabdf07c890edb157e81cafae3f5ded
Jason Monk [Thu, 30 Jun 2016 18:37:10 +0000 (14:37 -0400)]
Status bar blacklist: fix items resetting
Change-Id: Id3f287ce3b0fed4e3a7d0abff5fce025f16d9a1e
Fixes:
27600379
Jason Monk [Thu, 30 Jun 2016 18:36:01 +0000 (18:36 +0000)]
Merge "QS: Layout and animation refinement" into nyc-mr1-dev
Geoffrey Pitsch [Thu, 30 Jun 2016 18:35:43 +0000 (18:35 +0000)]
Merge \"Support trimmed images in BootAnimation\" into nyc-mr1-dev
am:
656b9db5fb
Change-Id: Ida34d52d7761c1d08028121cffba12723caf8c00
Yohei Yukawa [Thu, 30 Jun 2016 18:35:39 +0000 (18:35 +0000)]
Merge \"Remove InputContentInfo#requestPermission()\" into nyc-mr1-dev
am:
c80c64a97b
Change-Id: Iaaf2b610852510e604c482568c0ef1dc6495e179
Jason Monk [Thu, 30 Jun 2016 18:22:42 +0000 (14:22 -0400)]
QS: Layout and animation refinement
Bug:
29315917
Fixes:
29879993
Change-Id: I0153e81ff9cd81022958a1baf3531ac5ca6b4144
Geoffrey Pitsch [Thu, 30 Jun 2016 18:24:15 +0000 (18:24 +0000)]
Merge "Support trimmed images in BootAnimation" into nyc-mr1-dev
Yohei Yukawa [Thu, 30 Jun 2016 18:21:46 +0000 (18:21 +0000)]
Merge "Remove InputContentInfo#requestPermission()" into nyc-mr1-dev
Srinath Sridharan [Thu, 30 Jun 2016 18:19:47 +0000 (18:19 +0000)]
Merge \"Add a new API to improve VR thread scheduling.\" into nyc-mr1-dev
am:
5e261441d3
Change-Id: Ie7c734ca22abad05a4f0800a1dba9553eb7cbfef
Tim Murray [Thu, 30 Jun 2016 18:05:56 +0000 (18:05 +0000)]
Merge "Add a new API to improve VR thread scheduling." into nyc-mr1-dev
Android Build Merger (Role) [Thu, 30 Jun 2016 17:44:31 +0000 (17:44 +0000)]
Merge "Merge \\"Only clip PopupWindow in the vertical direction\\" into nyc-dev am:
4b736ea56d am:
bf91103763" into nyc-mr1-dev-plus-aosp
Alan Viverette [Thu, 30 Jun 2016 17:43:46 +0000 (17:43 +0000)]
Merge \\"Only clip PopupWindow in the vertical direction\\" into nyc-dev am:
4b736ea56d
am:
a2beb44834
Change-Id: I554dcbd9eb011d84a61d49b0d48818d1e9905c00
Alan Viverette [Thu, 30 Jun 2016 17:43:44 +0000 (17:43 +0000)]
Merge \\"Only clip PopupWindow in the vertical direction\\" into nyc-dev am:
4b736ea56d
am:
bf91103763
Change-Id: I0fd29b6db29f87ebfd6f900b94b59eb9e21ac942
Alan Viverette [Thu, 30 Jun 2016 17:36:00 +0000 (17:36 +0000)]
Merge \"Only clip PopupWindow in the vertical direction\" into nyc-dev
am:
4b736ea56d
Change-Id: Ic10c4641d90f06b52d34285e42c35ae744f823eb
Alan Viverette [Thu, 30 Jun 2016 17:35:52 +0000 (17:35 +0000)]
Merge \"Only clip PopupWindow in the vertical direction\" into nyc-dev
am:
4b736ea56d
Change-Id: Idf5aedfb2f19595b8317c7dca1640ff0caf31696
Android Build Merger (Role) [Thu, 30 Jun 2016 17:31:49 +0000 (17:31 +0000)]
Merge "Merge \\"Exclude children from excess space distribution when using largest child\\" into nyc-dev am:
7705d5fd6e am:
176f9cb656" into nyc-mr1-dev-plus-aosp
Alan Viverette [Thu, 30 Jun 2016 17:31:20 +0000 (17:31 +0000)]
Merge \\"Exclude children from excess space distribution when using largest child\\" into nyc-dev am:
7705d5fd6e
am:
176f9cb656
Change-Id: I1ea31c0defb8b00a9b15545a826210680de6fbeb
Alan Viverette [Thu, 30 Jun 2016 17:31:11 +0000 (17:31 +0000)]
Merge \\"Exclude children from excess space distribution when using largest child\\" into nyc-dev am:
7705d5fd6e
am:
650cc68f10
Change-Id: I490421dd7f13deda634b669ca7b7bd7a51d2bfdf
Alan Viverette [Thu, 30 Jun 2016 17:24:21 +0000 (17:24 +0000)]
Merge "Only clip PopupWindow in the vertical direction" into nyc-dev
Alan Viverette [Thu, 30 Jun 2016 17:19:43 +0000 (17:19 +0000)]
Merge \"Exclude children from excess space distribution when using largest child\" into nyc-dev
am:
7705d5fd6e
Change-Id: I9a478a5dd666c8c938206e888065dbec976a9e82
Alan Viverette [Thu, 30 Jun 2016 17:19:41 +0000 (17:19 +0000)]
Merge \"Exclude children from excess space distribution when using largest child\" into nyc-dev
am:
7705d5fd6e
Change-Id: I747b4dab5bfc31b2461b445d1d983ac95a05693d
Alan Viverette [Thu, 30 Jun 2016 17:17:26 +0000 (13:17 -0400)]
Only clip PopupWindow in the vertical direction
Bug:
29865091
Change-Id: Ic4e3b50571034f341aff2c2fbf2c349342622448
Andrew Sapperstein [Thu, 30 Jun 2016 17:14:53 +0000 (10:14 -0700)]
Update the volume panel to use a system color.
Removes all hardcoded usages of blue_grey_200 and replaces
them with the use of one color resource that's defined in the
framework.
Change-Id: Ic6450f8ec03c3d9cbf915fa5de6f1184bf64266e
Fixes:
29574243
TreeHugger Robot [Thu, 30 Jun 2016 17:07:06 +0000 (17:07 +0000)]
Merge "Exclude children from excess space distribution when using largest child" into nyc-dev
Srinath Sridharan [Tue, 28 Jun 2016 01:13:47 +0000 (18:13 -0700)]
Add a new API to improve VR thread scheduling.
Adds a new API that enables device-specific scheduler optimizations for
latency-sensitive VR threads.
BUG:
29163534
Change-Id: I58d7be0eb266eca452c804cd07004784fb7daf2b
Yohei Yukawa [Thu, 30 Jun 2016 16:32:54 +0000 (09:32 -0700)]
Remove InputContentInfo#requestPermission()
It turns out that requiring editor authors to call
InputContentInfo#requestPermission() as needed is just confusing and can
cause compatibility issues, because if an editor author forgot to call
that method then there would be no way for IME developers to prevent
permission denial except for relaxing the default permission of the
ContentProvider just because of such an application. This is not what we
want to see.
My conclusion is that the system should automatically call
InputContentInfo#requestPermission() (or do any equivalent operation)
when InputConnection#INPUT_CONTENT_GRANT_READ_URI_PERMISSION is
specified, like we have done in Context#startActivity().
With this CL, the system automatically grants a temporary URI permission
to the target application when the IME calls
InputConnection#commitContent() with
InputConnection#INPUT_CONTENT_GRANT_READ_URI_PERMISSION, and the
temporary permission will be revoked by any of the following events:
- InputContentInfo#releasePermission() is explicitly called by the
target application.
- The target application returned false in
InputConnection#commitContent().
- All the InputContentInfo instances copied from the original one are
GC-ed.
Bug:
29450031
Bug:
29892936
Change-Id: I37fb744e4d3d1c59177fb0a9be4ef5c325c9a39f
Alan Viverette [Thu, 30 Jun 2016 15:15:36 +0000 (11:15 -0400)]
Exclude children from excess space distribution when using largest child
Preserves API 23 behavior.
Bug:
29872769
Change-Id: I514cde81dcca4d78238f407251805cced4c0bea1
Lorenzo Colitti [Thu, 30 Jun 2016 14:33:25 +0000 (14:33 +0000)]
Merge changes I65784f35,Ib6937335 into nyc-mr1-dev
am:
74f7f2ec0d
Change-Id: Iba950e7837d91f83a9c2bcd7fc8e7b1193038400
TreeHugger Robot [Thu, 30 Jun 2016 14:28:37 +0000 (14:28 +0000)]
Merge changes I65784f35,Ib6937335 into nyc-mr1-dev
* changes:
Add detailed test coverage for lingering.
Add more test coverage for requests and callbacks.
Hugo Benichi [Thu, 30 Jun 2016 14:12:13 +0000 (14:12 +0000)]
Merge changes Ia28652e0,Id2eaafdc,I9c4c8286 into nyc-mr1-dev
am:
f5e3481951
Change-Id: Ic853ff8e8e1745821627e796d22daea227bafca2
TreeHugger Robot [Thu, 30 Jun 2016 14:03:20 +0000 (14:03 +0000)]
Merge changes Ia28652e0,Id2eaafdc,I9c4c8286 into nyc-mr1-dev
* changes:
Record events for RA option lifetimes
Log RA listening statistics
Log events at APF program generation
Tobias Thierer [Thu, 30 Jun 2016 13:04:52 +0000 (13:04 +0000)]
Merge \\\"Changes for upgrade to OkHttp 2.7.5\\\" am:
a31247bd8d am:
f6bcab7f97
am:
6b473f7b67
Change-Id: I3a0dc1da2ee96d71c38cab727141efcb686627e1
Tobias Thierer [Thu, 30 Jun 2016 12:59:22 +0000 (12:59 +0000)]
Merge \\"Changes for upgrade to OkHttp 2.7.5\\" am:
a31247bd8d
am:
f6bcab7f97
Change-Id: I7a1c9838a22cb7e8228e77bde68283fda57c83d6
Tobias Thierer [Thu, 30 Jun 2016 12:49:47 +0000 (12:49 +0000)]
Merge \"Changes for upgrade to OkHttp 2.7.5\"
am:
a31247bd8d
Change-Id: Id79249756929a61dca374f9f1d43d0ea9e6b1280
Lorenzo Colitti [Tue, 28 Jun 2016 12:28:28 +0000 (21:28 +0900)]
Add detailed test coverage for lingering.
Bug:
23113288
Change-Id: I65784f3589378d97f3c824e600f21f361be8741e
Tobias Thierer [Thu, 30 Jun 2016 12:35:03 +0000 (12:35 +0000)]
Merge "Changes for upgrade to OkHttp 2.7.5"
Hugo Benichi [Thu, 23 Jun 2016 01:41:30 +0000 (10:41 +0900)]
Record events for RA option lifetimes
This patch defines a new android.net.metrics.RaEvent class carrying
lifetime values contained in RA packets. RaEvent are recorded when
ApfFilter processes a new RA for which there is no match.
Example:
ConnectivityMetricsEvent(15:39:39.808, 0, 0): RaEvent(lifetimes: router=3600s, prefix_valid=2592000s, prefix_preferred=604800s, route_info=-1s, dnssl=-1s, rdnss=3600s)
Change-Id: Ia28652e03ed442d5f2a686ef5b3fafbcb77c503a
Hugo Benichi [Tue, 7 Jun 2016 06:35:16 +0000 (15:35 +0900)]
Log RA listening statistics
This patch adds a new ApfStats event class that counts RA packet
reception statistics on the RA listener thread of ApfFilter and reports
the maximum program size advertised by hardware.
Statistics are gathered for the lifetime of a network with APF
capabilities and uploaded at network teardown when the listener thread
exits.
Example event:
ConnectivityMetricsEvent(15:44:23.741, 0, 0): ApfStats(284945ms 2048B RA: 2 received, 0 matching, 0 ignored, 0 expired, 0 parse errors, 2 program updates)
Bug:
28204408
Change-Id: Id2eaafdca97f61152a4b66d06061c971bc0aba4c
Hugo Benichi [Thu, 2 Jun 2016 02:20:27 +0000 (11:20 +0900)]
Log events at APF program generation
Example:
ConnectivityMetricsEvent(15:24:52.018, 0, 0): ApfProgramEvent(0/0 RAs 121B forever FLAG_MULTICAST_FILTER_ON)
ConnectivityMetricsEvent(15:24:53.036, 0, 0): ApfProgramEvent(1/1 RAs 334B 600s)
ConnectivityMetricsEvent(15:24:53.590, 0, 0): ApfProgramEvent(1/1 RAs 360B 600s FLAG_MULTICAST_FILTER_ON, FLAG_HAS_IPV4_ADDRESS)
ConnectivityMetricsEvent(15:24:58.157, 0, 0): ApfProgramEvent(1/1 RAs 294B 599s FLAG_HAS_IPV4_ADDRESS)
Bug:
28204408
Change-Id: I9c4c82861cf42eb2c7e7bf5471f05e8ff2fc560c
Tyler Gunn [Thu, 30 Jun 2016 06:28:37 +0000 (06:28 +0000)]
Merge \"Add missing setPulling() method in Connection.\" into nyc-mr1-dev
am:
089e99ee4d
Change-Id: I91b9b6d6eaf0df8a13245157bfaeeffd0ee84900
Tyler Gunn [Thu, 30 Jun 2016 06:20:41 +0000 (06:20 +0000)]
Merge "Add missing setPulling() method in Connection." into nyc-mr1-dev
Erik Kline [Thu, 30 Jun 2016 05:49:28 +0000 (05:49 +0000)]
Merge \"Make provisioning timeout apply to both IPv4 and IPv6\" into nyc-mr1-dev
am:
ce7ff88bc2
Change-Id: I4f2f7cf0d51cee4a657a750cfcd58e5638b3fce5
TreeHugger Robot [Thu, 30 Jun 2016 05:41:51 +0000 (05:41 +0000)]
Merge "Make provisioning timeout apply to both IPv4 and IPv6" into nyc-mr1-dev
Tyler Gunn [Thu, 30 Jun 2016 05:35:45 +0000 (22:35 -0700)]
Add missing setPulling() method in Connection.
Change-Id: I89c720b2fa3d3e1304766ba3779410b233a04c6a
Jaewan Kim [Thu, 30 Jun 2016 05:27:55 +0000 (05:27 +0000)]
Merge \"MediaResourceMonitor: Send broadcast to current users\" into nyc-mr1-dev
am:
7f4f52cb4c
Change-Id: I9a35cebe9e4d645733e71b82b52a2c7d5e6c0e84
Jaewan Kim [Thu, 30 Jun 2016 05:21:26 +0000 (05:21 +0000)]
Merge "MediaResourceMonitor: Send broadcast to current users" into nyc-mr1-dev
Lorenzo Colitti [Mon, 27 Jun 2016 07:44:07 +0000 (16:44 +0900)]
Add more test coverage for requests and callbacks.
1. Support multiple callbacks in TestNetworkCallback. This is
necessary to test situations where multiple callbacks are
generated by the same event (e.g., CALLBACK_LOSING on cell
with CALLBACK_AVAILABLE on wifi when wifi connects), which is
necessary to test callback order. So far this has not been
covered because all callback testing was using per-network
callbacks.
2. Add a benchmark test for registering NetworkRequests and for
sending onAvailable and onLosing callbacks.
Bug:
23113288
Change-Id: Ib69373358ad766ab1bd989e864a5a51ef762c73c
Erik Kline [Tue, 28 Jun 2016 02:40:07 +0000 (11:40 +0900)]
Make provisioning timeout apply to both IPv4 and IPv6
Bug:
29449295
Change-Id: I743533ca61914c11163ba5c5767a365def3a5461
Android Build Merger (Role) [Thu, 30 Jun 2016 03:30:08 +0000 (03:30 +0000)]
Merge "Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
bb07b0b372 -s ours am:
847dcc9f4e -s ours" into nyc-mr1-dev-plus-aosp
Bill Yi [Thu, 30 Jun 2016 03:29:45 +0000 (03:29 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
bb07b0b372 -s ours
am:
847dcc9f4e -s ours
Change-Id: I940c75e30425862896c1727b4717388f7bdacbd8
Bill Yi [Thu, 30 Jun 2016 03:28:59 +0000 (03:28 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am:
bb07b0b372 -s ours
am:
791de14f4c -s ours
Change-Id: I1a04ddb396b18178af5d05b38b7174b0fe5394cc
Bill Yi [Thu, 30 Jun 2016 03:24:30 +0000 (03:24 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
c4376b5fae -s ours
Change-Id: Ic39f504b2dd5931efdc00025c79dc79bda3acd00
Bill Yi [Thu, 30 Jun 2016 03:24:25 +0000 (03:24 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
285c920428 -s ours
Change-Id: Ifeb849460ba1e1223233911170c5c8ed9334c007
Bill Yi [Thu, 30 Jun 2016 03:23:54 +0000 (03:23 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
bb07b0b372 -s ours
Change-Id: Ibc2fb6d61c5e391b9804411bd6e0d1f646766910
Bill Yi [Thu, 30 Jun 2016 03:23:51 +0000 (03:23 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
bb07b0b372 -s ours
Change-Id: I3b4ad7bc8c424e58daddb1d5f16d338f35636eb6
Bill Yi [Thu, 30 Jun 2016 03:18:22 +0000 (03:18 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
8c9d0dbeda -s ours
Change-Id: Ib329b5874cd43a8079f7c0cda2777f5636a89b8b
TreeHugger Robot [Thu, 30 Jun 2016 03:17:17 +0000 (03:17 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 30 Jun 2016 03:16:58 +0000 (03:16 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 30 Jun 2016 03:14:05 +0000 (03:14 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Thu, 30 Jun 2016 03:10:08 +0000 (03:10 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Tyler Gunn [Thu, 30 Jun 2016 02:46:13 +0000 (02:46 +0000)]
Merge \"Add conference call label.\" into nyc-mr1-dev
am:
9e0450a4e3
Change-Id: I360791bda03611f55cdd31aa899465644e9901ef
Tyler Gunn [Thu, 30 Jun 2016 02:36:07 +0000 (02:36 +0000)]
Merge "Add conference call label." into nyc-mr1-dev
Android Build Merger (Role) [Thu, 30 Jun 2016 02:15:08 +0000 (02:15 +0000)]
Merge "Merge \\"Fix Windows NDK labeling.\\" into nyc-dev am:
d1364cf0f1 am:
0ca5ae5208" into nyc-mr1-dev-plus-aosp
Dan Albert [Thu, 30 Jun 2016 02:14:41 +0000 (02:14 +0000)]
Merge \\"Fix Windows NDK labeling.\\" into nyc-dev am:
d1364cf0f1
am:
0ca5ae5208
Change-Id: I9e968b59c50a28c8bd0f812d5e1051afb10e798b
Dan Albert [Thu, 30 Jun 2016 02:14:35 +0000 (02:14 +0000)]
Merge \\"Fix Windows NDK labeling.\\" into nyc-dev am:
d1364cf0f1
am:
35b18e4571
Change-Id: Ifa154db994f9110b1370d920daca9513396b0b92
Dan Albert [Thu, 30 Jun 2016 02:08:07 +0000 (02:08 +0000)]
Merge \"Fix Windows NDK labeling.\" into nyc-dev
am:
d1364cf0f1
Change-Id: Ie289f8cad00443ced27f452ef4d5ed122f7ca85f
Dan Albert [Thu, 30 Jun 2016 02:08:07 +0000 (02:08 +0000)]
Merge \"Fix Windows NDK labeling.\" into nyc-dev
am:
d1364cf0f1
Change-Id: I7d3b6ec3ee5580a06a04928218512d030e033d26
TreeHugger Robot [Thu, 30 Jun 2016 01:59:33 +0000 (01:59 +0000)]
Merge "Fix Windows NDK labeling." into nyc-dev
Bill Yi [Thu, 30 Jun 2016 01:29:55 +0000 (18:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic2eaafc229acdeea507de300797046cd1b5d6bae
Auto-generated-cl: translation import
Chris Craik [Thu, 30 Jun 2016 01:21:30 +0000 (01:21 +0000)]
Merge \"Handle post-record-time clipPath scaling\" into nyc-mr1-dev
am:
a6b011e9b0
Change-Id: Icdf0cb748953c9ad1db57b748719f4c93429e78a
Chris Craik [Thu, 30 Jun 2016 01:14:34 +0000 (01:14 +0000)]
Merge "Handle post-record-time clipPath scaling" into nyc-mr1-dev
Daniel 2 Olofsson [Thu, 30 Jun 2016 00:26:36 +0000 (00:26 +0000)]
Merge \"Fix NativeDaemonConnectorException issue accessing null object\" into nyc-mr1-dev
am:
7519df9eaf
Change-Id: Ic094b459a22a31a045ad61660694b616d7236893
TreeHugger Robot [Thu, 30 Jun 2016 00:20:50 +0000 (00:20 +0000)]
Merge "Fix NativeDaemonConnectorException issue accessing null object" into nyc-mr1-dev
Hemant Gupta [Thu, 30 Jun 2016 00:04:29 +0000 (00:04 +0000)]
Merge \"PBAP: Allow wearable handsfree device for PBAP Access\" into nyc-mr1-dev
am:
7f44cdd34e
Change-Id: I59c9d97c69c7652e9292beeec20f265bf7a6a41e
Makoto Onuki [Thu, 30 Jun 2016 00:04:25 +0000 (00:04 +0000)]
Merge \"Fix updateShortcuts() with icons\" into nyc-mr1-dev
am:
bc8e0052fd
Change-Id: I009387abcbb24e3051611eee708fedd86f1b9dcd
Android Build Merger (Role) [Thu, 30 Jun 2016 00:01:21 +0000 (00:01 +0000)]
Merge "Merge \"Move getRecentTasks() to ParceledListSlice. am:
479212cf50\" into nyc-mr1-dev am:
9f22e79625" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 30 Jun 2016 00:01:09 +0000 (00:01 +0000)]
Merge "Merge \"Address API council feedback (continued)\" into nyc-mr1-dev am:
01e51e59dd" into nyc-mr1-dev-plus-aosp
Jeff Sharkey [Wed, 29 Jun 2016 23:59:24 +0000 (23:59 +0000)]
Merge \"Move getRecentTasks() to ParceledListSlice. am:
479212cf50\" into nyc-mr1-dev
am:
9f22e79625
Change-Id: I3a52234e4571c433b9e363f68c926b9298b32c92
Makoto Onuki [Wed, 29 Jun 2016 23:59:20 +0000 (23:59 +0000)]
Merge \"Address API council feedback (continued)\" into nyc-mr1-dev
am:
01e51e59dd
Change-Id: Ia3a6d4eb224667956eebd6b935628a2ba40dfb18
TreeHugger Robot [Wed, 29 Jun 2016 23:59:08 +0000 (23:59 +0000)]
Merge "PBAP: Allow wearable handsfree device for PBAP Access" into nyc-mr1-dev
Jeff Sharkey [Wed, 29 Jun 2016 23:59:09 +0000 (23:59 +0000)]
Move getRecentTasks() to ParceledListSlice. am:
479212cf50
am:
ce3c8ac0f4
Change-Id: Ie0c3873c46832d1a10b016bafb26e860eba4ec07
Makoto Onuki [Wed, 29 Jun 2016 23:55:01 +0000 (23:55 +0000)]
Merge "Fix updateShortcuts() with icons" into nyc-mr1-dev
Android Build Merger (Role) [Wed, 29 Jun 2016 23:54:26 +0000 (23:54 +0000)]
Merge "Move getRecentTasks() to ParceledListSlice. am:
479212cf50" into nyc-mr1-dev
Jeff Sharkey [Wed, 29 Jun 2016 23:53:58 +0000 (23:53 +0000)]
Move getRecentTasks() to ParceledListSlice.
am:
479212cf50
Change-Id: Ic76f624396117d922aac60eac9c2caae4f1d7e27
Jeff Sharkey [Wed, 29 Jun 2016 23:53:57 +0000 (23:53 +0000)]
Move getRecentTasks() to ParceledListSlice.
am:
479212cf50
Change-Id: Ifb3a5deacda0ff8b73469234d36f9cf711e616c2
Makoto Onuki [Wed, 29 Jun 2016 23:53:49 +0000 (23:53 +0000)]
Merge "Address API council feedback (continued)" into nyc-mr1-dev
Tyler Gunn [Wed, 29 Jun 2016 23:49:07 +0000 (23:49 +0000)]
Merge \"API cleanups per API review.\" into nyc-mr1-dev
am:
138a3f3ad4
Change-Id: Iad4f2bdc3f903a6497f97ccd2fbdc1943ebded94
Tyler Gunn [Wed, 29 Jun 2016 23:42:08 +0000 (23:42 +0000)]
Merge "API cleanups per API review." into nyc-mr1-dev
Chong Zhang [Wed, 29 Jun 2016 23:30:39 +0000 (23:30 +0000)]
Merge \"Apply animation in relayout invisible the old way\" into nyc-mr1-dev
am:
8f54d32b99
Change-Id: I89086685e4a128f67f4e7f0e3f1d0c5aa1b6a1ba
Chong Zhang [Wed, 29 Jun 2016 23:25:13 +0000 (23:25 +0000)]
Merge "Apply animation in relayout invisible the old way" into nyc-mr1-dev
OSDN Git Service
