OSDN Git Service
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
Chris Craik [Wed, 29 Jun 2016 23:22:27 +0000 (16:22 -0700)]
Handle post-record-time clipPath scaling
bug:
29547149
Change-Id: I268210b240d2d8e08638114715f9622840fc02f7
Michael Kwan [Wed, 29 Jun 2016 23:17:32 +0000 (23:17 +0000)]
Merge \"Updated colour theme for watch devices.\" into nyc-mr1-dev
am:
a7d4adaac7
Change-Id: I684caf5e6e007582b2b0e73e246d582399417042
Erik Wolsheimer [Wed, 29 Jun 2016 23:14:23 +0000 (23:14 +0000)]
Merge \"Handle invalid empty args to createAutoBrightnessSpline\" into nyc-mr1-dev
am:
136e649760
Change-Id: Ieb31555a395857b991a2131769bee3488ad2d1db
Chong Zhang [Wed, 29 Jun 2016 23:13:22 +0000 (16:13 -0700)]
Apply animation in relayout invisible the old way
We skipped the applyAnimationLocked to work around a problem with
cached animation loading, however app could be animating without
window animator (only app animator) in which case we shouldn't do
the relayout for potential focus change.
Revert to the old behavior and let applyAnimationLocked decide if
we want to relayout for focus change.
bug:
29874980
Change-Id: I6fdfbe41cbafd7017477c0eda9b4fd26e66c517f
Michael Kwan [Wed, 29 Jun 2016 23:11:28 +0000 (23:11 +0000)]
Merge "Updated colour theme for watch devices." into nyc-mr1-dev
Erik Wolsheimer [Wed, 29 Jun 2016 23:07:36 +0000 (23:07 +0000)]
Merge "Handle invalid empty args to createAutoBrightnessSpline" into nyc-mr1-dev
Hemant Gupta [Tue, 7 Jun 2016 07:23:59 +0000 (12:53 +0530)]
PBAP: Allow wearable handsfree device for PBAP Access
Allow wearable handsfree device for PBAP Access
Usecase:
1) Pair and connect with Jabra Stealth Headset.
2) Go out of range so that connection gets disconnected
3) Come back in range, so that reconnection happens.
Observation:
Headset fails to reconnect with DUT in some scenarios.
Root Cause:
Headset does not send page request to DUT in some scenarios
leading to reconnection issues. This propabaly happens because
Headset fails to connect PBAP in previous iteration so it goes
in bad state, and does not page after Link Supervision Timeout.
Current Settings code only allows Audio_video_Handsfree Class of
devices to have PBAP Access permission, and set Rejected Permission
for other Audio Device Class. This headset being Wearable Class (0x0404)
is set as PBAP Rejected, and all PBAP connection to DUT from this remote
device are rejected leading to issue of bad state in headset.
Fix:
Allow wearable class audio devices to also have PBAP access permission.
Bug:
29219133
Change-Id: I18d8412cbeb86c18610091898d1c79f26d3d808d
Makoto Onuki [Wed, 29 Jun 2016 20:37:43 +0000 (13:37 -0700)]
Address API council feedback (continued)
Got a second set of comments.
Bug
29757958
Change-Id: Ib3a3ffd28bc3e35eb0218b0819870eb5c6ebadb5
Bert McMeen [Wed, 29 Jun 2016 22:18:57 +0000 (22:18 +0000)]
Docs: Links added to pages for permissions and configuration activity am:
cdfe5e4f55 am:
7a6494aeaf am:
ae5a14bc99
am:
83485046a5
Change-Id: I6dbd936e8f49ea9eec378148c814f37f92a3165a
Jeff Sharkey [Wed, 29 Jun 2016 22:00:55 +0000 (16:00 -0600)]
Move getRecentTasks() to ParceledListSlice.
In extreme cases the list of recent tasks can grow beyond the size
of a single Binder transaction. This change moves over to
ParceledListSlice which handles chunking any large results.
Bug:
29635557
Change-Id: Iaf1227234f5f8c9451f73a6a5c1dc89f2067f05f
Android Build Merger (Role) [Wed, 29 Jun 2016 22:13:13 +0000 (22:13 +0000)]
Merge "Merge \"Added a virtual interface for Video Telephony call usage counting\" into nyc-mr1-dev am:
83e96c1957" into nyc-mr1-dev-plus-aosp
Bert McMeen [Wed, 29 Jun 2016 22:12:42 +0000 (22:12 +0000)]
Docs: Links added to pages for permissions and configuration activity am:
cdfe5e4f55 am:
7a6494aeaf am:
ae5a14bc99
am:
7379e4a37b
Change-Id: I2ce8bbe060db184c26cc2a44478985c26d31e4dc
Jack Yu [Wed, 29 Jun 2016 22:12:26 +0000 (22:12 +0000)]
Merge \"Added a virtual interface for Video Telephony call usage counting\" into nyc-mr1-dev
am:
83e96c1957
Change-Id: Ia70a43a4df982cf09bb89b00650ce25aff7a43f4
Bert McMeen [Wed, 29 Jun 2016 22:08:37 +0000 (22:08 +0000)]
Docs: Links added to pages for permissions and configuration activity am:
cdfe5e4f55 am:
7a6494aeaf
am:
ae5a14bc99
Change-Id: I9b4cbe91c44194d764550b63ddd94b6e2e19f808
Bert McMeen [Wed, 29 Jun 2016 22:08:20 +0000 (22:08 +0000)]
Docs: Links added to pages for permissions and configuration activity am:
cdfe5e4f55 am:
7a6494aeaf
am:
ae5a14bc99
Change-Id: Iad34d5eb26322b13e01f0480191ab1ae6b2b3425
Bert McMeen [Wed, 29 Jun 2016 21:59:31 +0000 (21:59 +0000)]
Docs: Links added to pages for permissions and configuration activity am:
cdfe5e4f55
am:
7a6494aeaf
Change-Id: I907cf418d0a53827a7448135b0d712f41d0024e8
Jack Yu [Wed, 29 Jun 2016 21:57:35 +0000 (21:57 +0000)]
Merge "Added a virtual interface for Video Telephony call usage counting" into nyc-mr1-dev
Bert McMeen [Wed, 29 Jun 2016 21:54:42 +0000 (21:54 +0000)]
Docs: Links added to pages for permissions and configuration activity
am:
cdfe5e4f55
Change-Id: I3e9cde3cb24c5c779059c4708b144a2376c9616c
Daniel Nishi [Wed, 29 Jun 2016 21:47:05 +0000 (21:47 +0000)]
Merge \"Use the Deletion Helper when system storage is low.\" into nyc-mr1-dev
am:
6401217532
Change-Id: I9d8645a32185a8749edeeee654ee81bdd00f240f
Daniel Nishi [Wed, 29 Jun 2016 21:37:05 +0000 (21:37 +0000)]
Merge "Use the Deletion Helper when system storage is low." into nyc-mr1-dev
Erik Wolsheimer [Tue, 28 Jun 2016 21:51:07 +0000 (14:51 -0700)]
Handle invalid empty args to createAutoBrightnessSpline
BUG:
18572096
Change-Id: I9dfc2215994a4f7a70ef6bdd04b620917e4ec034
Bill Yi [Wed, 29 Jun 2016 21:20:30 +0000 (14:20 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0766139e2f58cfcb8ffc6fb24b1400deaaf313c6
Auto-generated-cl: translation import
Bill Yi [Wed, 29 Jun 2016 21:01:12 +0000 (14:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia7b82097692eb156683716b945de49f2fa2bd784
Auto-generated-cl: translation import
Dianne Hackborn [Wed, 29 Jun 2016 20:56:03 +0000 (20:56 +0000)]
Merge \\"Fix issue #
29871385: Need JobScheduler.scheduleAsPackage to be system API\\" into nyc-dev am:
205bc262ce
am:
50beee8af9
Change-Id: I126423bf5640393213e81bd5e8b891bf374dfc78
Daniel 2 Olofsson [Thu, 17 Jan 2013 11:05:34 +0000 (12:05 +0100)]
Fix NativeDaemonConnectorException issue accessing null object
When function getCode is called on
NativeDaemonConnectorException object it may throw exception
due to mEvent object not being set for certain constructors.
Fix is to return a default error code as expected if mEvent
object has not been set rather than trying to call
mEvent.getCode().
Change-Id: Ia8aa23deb8871bb4df73096cc489b685a1765f16
Dianne Hackborn [Wed, 29 Jun 2016 20:51:33 +0000 (20:51 +0000)]
Merge \\"Fix issue #
29871385: Need JobScheduler.scheduleAsPackage to be system API\\" into nyc-dev am:
205bc262ce
am:
381f4eb9be
Change-Id: I5cc4b41990cdf389e6e55f6891a87a9030a6d218
Dianne Hackborn [Wed, 29 Jun 2016 20:50:52 +0000 (20:50 +0000)]
Merge \"Fix issue #
29871385: Need JobScheduler.scheduleAsPackage to be system API\" into nyc-dev
am:
205bc262ce
Change-Id: I3d7186834028be519b512fbcb2240d2ff692f564
Dianne Hackborn [Wed, 29 Jun 2016 20:45:36 +0000 (20:45 +0000)]
Merge \"Fix issue #
29871385: Need JobScheduler.scheduleAsPackage to be system API\" into nyc-dev
am:
205bc262ce
Change-Id: I910f4db4503ad20ecce46032691001d1f971bdbf
Bill Yi [Wed, 29 Jun 2016 20:45:21 +0000 (13:45 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idf8c50b91f8f1f39e6dd41a310f529aaeb5ae36c
Auto-generated-cl: translation import
Alan Viverette [Wed, 29 Jun 2016 20:43:32 +0000 (20:43 +0000)]
Merge \"Remove framework dependencies on Support* demos\" into nyc-mr1-dev
am:
471af954c3
Change-Id: I33d7193643b189c9b51e240ad1a834bae3e0fc31
Dianne Hackborn [Wed, 29 Jun 2016 20:38:17 +0000 (20:38 +0000)]
Merge "Fix issue #
29871385: Need JobScheduler.scheduleAsPackage to be system API" into nyc-dev
Eric Schmidt [Wed, 29 Jun 2016 20:38:04 +0000 (20:38 +0000)]
Merge \"docs: Edits to Instant Apps FAQs, index page.\" into nyc-dev
am:
7a4d857c45
Change-Id: Id3978a63dc42beb9a92ecde46e1b09e4c32c74c0
Android Build Merger (Role) [Wed, 29 Jun 2016 20:37:34 +0000 (20:37 +0000)]
Merge "Merge \"Remove framework dependencies on Support* demos\" into nyc-mr1-dev am:
c295a4b23d" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 29 Jun 2016 20:37:26 +0000 (20:37 +0000)]
Merge "Merge \\"docs: Edits to Instant Apps FAQs, index page.\\" into nyc-dev am:
7a4d857c45 am:
8c8a5e9296" into nyc-mr1-dev-plus-aosp
David Friedman [Wed, 29 Jun 2016 20:37:07 +0000 (20:37 +0000)]
Merge \\"docs: Edits to Instant Apps FAQs, index page.\\" into nyc-dev am:
7a4d857c45
am:
8c8a5e9296
Change-Id: I0cdfbab264070fd168abb34c9e6cbaeb72d026a9
Alan Viverette [Wed, 29 Jun 2016 20:34:47 +0000 (20:34 +0000)]
Merge \"Remove framework dependencies on Support* demos\" into nyc-mr1-dev
am:
c295a4b23d
Change-Id: Icd4eac0fafdae01d95910dc084787350168a8688
mukesh agrawal [Wed, 29 Jun 2016 20:34:44 +0000 (20:34 +0000)]
Merge \"wifi: allow config of default+verbose ring buffers\" into nyc-mr1-dev
am:
88442c1fe1
Change-Id: Ibd81afe406de02e46664e4cf846e0e2e50968603
Alex Light [Wed, 29 Jun 2016 20:34:39 +0000 (20:34 +0000)]
Merge \"cp preopted files from B partition during PM init.\" into nyc-mr1-dev
am:
7281cf276a
Change-Id: I29c2aaa637f5c0f948dae0f6ea065d2136b57e74
Eric Schmidt [Wed, 29 Jun 2016 20:31:57 +0000 (20:31 +0000)]
Merge \"docs: Edits to Instant Apps FAQs, index page.\" into nyc-dev
am:
7a4d857c45
Change-Id: I8bf1098f3fcd7db37d1ceb74776f1c0a6e98c288
TreeHugger Robot [Wed, 29 Jun 2016 20:31:02 +0000 (20:31 +0000)]
Merge "Remove framework dependencies on Support* demos" into nyc-mr1-dev
Mukesh Agrawal [Wed, 29 Jun 2016 20:28:40 +0000 (20:28 +0000)]
Merge "wifi: allow config of default+verbose ring buffers" into nyc-mr1-dev
David Friedman [Wed, 29 Jun 2016 20:26:41 +0000 (20:26 +0000)]
Merge "docs: Edits to Instant Apps FAQs, index page." into nyc-dev
Alex Light [Wed, 29 Jun 2016 20:26:04 +0000 (20:26 +0000)]
Merge "cp preopted files from B partition during PM init." into nyc-mr1-dev
Rebecca Silberstein [Wed, 29 Jun 2016 20:23:09 +0000 (20:23 +0000)]
Merge changes from topic \'cherrypickWifiWatchdogResetOnTrigger\' into nyc-mr1-dev
am:
b2f17f1bbb
Change-Id: Ic723498b7b486edd8f63822cb86127486a5c4657
Android Build Merger (Role) [Wed, 29 Jun 2016 20:20:24 +0000 (20:20 +0000)]
Merge "Merge \\"Recents: Make sure blacklist checks the package name as well as activity name\\" into nyc-dev am:
10b2fee05f am:
8a17a77e4b" into nyc-mr1-dev-plus-aosp
Sid Soundararajan [Wed, 29 Jun 2016 20:19:59 +0000 (20:19 +0000)]
Merge \\"Recents: Make sure blacklist checks the package name as well as activity name\\" into nyc-dev am:
10b2fee05f
am:
8a17a77e4b
Change-Id: I23f27052f72dc043af67924f8babe256e3c8f127
Sid Soundararajan [Wed, 29 Jun 2016 20:18:25 +0000 (20:18 +0000)]
Merge \\"Recents: Make sure blacklist checks the package name as well as activity name\\" into nyc-dev am:
10b2fee05f
am:
aea3d63f85
Change-Id: Icf38b12e0caa437f7032f404dadd6f988c981c93
Rebecca Silberstein [Wed, 29 Jun 2016 20:15:59 +0000 (20:15 +0000)]
Merge changes from topic 'cherrypickWifiWatchdogResetOnTrigger' into nyc-mr1-dev
* changes:
DO NOT MERGE StateMachine: remove final from SendMessage
DO NOT MERGE WifiManager: add WIFI_MODE_NO_LOCKS_HELD
Makoto Onuki [Wed, 29 Jun 2016 20:10:09 +0000 (13:10 -0700)]
Fix updateShortcuts() with icons
But
29822569
Change-Id: I72a0903ccc8acffc42f40d9df7b99ed6de26b66d
Sid Soundararajan [Wed, 29 Jun 2016 20:13:54 +0000 (20:13 +0000)]
Merge \"Recents: Make sure blacklist checks the package name as well as activity name\" into nyc-dev
am:
10b2fee05f
Change-Id: If4ddf850d2be037d50a7aa3ddbce040c7ad4b7cd
Sid Soundararajan [Wed, 29 Jun 2016 20:13:48 +0000 (20:13 +0000)]
Merge \"Recents: Make sure blacklist checks the package name as well as activity name\" into nyc-dev
am:
10b2fee05f
Change-Id: I8b7783bbe4924437494f0ed5857ee81f574fe8b1
Sid Soundararajan [Wed, 29 Jun 2016 20:02:51 +0000 (20:02 +0000)]
Merge "Recents: Make sure blacklist checks the package name as well as activity name" into nyc-dev
Sid Soundararajan [Wed, 29 Jun 2016 18:57:21 +0000 (11:57 -0700)]
Recents: Make sure blacklist checks the package name as well as activity name
BUG:
28719274
BUG:
28764678
Change-Id: Ib17d3feda8997ce5b29060bff47d51f503c868dc
Wale Ogunwale [Wed, 29 Jun 2016 19:36:09 +0000 (19:36 +0000)]
Merge \"Have wallpaper target itself when dismissing keyguard with wallpaper\" into nyc-mr1-dev
am:
5329715a74
Change-Id: I73abfacc9104437b73659991d21af3ef620e2211
TreeHugger Robot [Wed, 29 Jun 2016 19:29:45 +0000 (19:29 +0000)]
Merge "Have wallpaper target itself when dismissing keyguard with wallpaper" into nyc-mr1-dev
Jack Yu [Wed, 22 Jun 2016 18:35:10 +0000 (11:35 -0700)]
Added a virtual interface for Video Telephony call usage counting
1. Added a virtual VT interface.
2. Qeury VT usage from telephony service.
bug:
20888836
Change-Id: I3df0c22922f8394554230b53f8ae091e17c95595
Dianne Hackborn [Wed, 29 Jun 2016 18:48:14 +0000 (11:48 -0700)]
Fix issue #
29871385: Need JobScheduler.scheduleAsPackage to be system API
Change-Id: I0034b1681158b9a010d01fb0fcbe7990d9038c1f
Tyler Gunn [Wed, 29 Jun 2016 18:23:25 +0000 (11:23 -0700)]
API cleanups per API review.
1. removing deprecation for setExtras on Connection/Conference as these
have legitimate use-cases going forward.
2. Expanded documentation on Call.Callback class to clarify how it is
expected to be used.
3. Updated Callback#onConnectionEvent callback docs to clarify its usage.
4. Expanded Call#sendCallEvent docs to clarify expected namespacing of
call event keys and extras keys, as well as clarification about backwards
compatibility and expectations of ConnectionServices.
5. Standardized the "invoked" vs "notifies" language in the Conference
docs.
6. Clarified how Connection callbacks from Telecom should be implemented.
7. Added Bundle parameter expectations for pre-defined connection events.
8. Documented capabilities and properties toString methods.
9. Documented expectations for onCallEvent method.
10. Expanded documentation for sendConnectionEvent method to clarify
namespacing, use cases, etc.
Bug:
29759275
Bug:
29759954
Bug:
29759773
Change-Id: Ib8c983af4dbbfee68edb60937b268e2c1a9b5e64
OSDN Git Service
