OSDN Git Service
Jeff Sharkey [Thu, 30 Jun 2016 00:14:26 +0000 (00:14 +0000)]
Merge \"Merge \\"Move getRecentTasks() to ParceledListSlice. am:
479212cf50\\" into nyc-mr1-dev am:
9f22e79625\" into nyc-mr1-dev-plus-aosp
am:
4bed53a081
Change-Id: I6c65b6afdbbf9261a38b2b190b62952259e4a97f
Makoto Onuki [Thu, 30 Jun 2016 00:14:24 +0000 (00:14 +0000)]
Merge \"Merge \\"Address API council feedback (continued)\\" into nyc-mr1-dev am:
01e51e59dd\" into nyc-mr1-dev-plus-aosp
am:
bd7d03ab6a
Change-Id: I4a2dd860bdf4ebdcc6ab420d162579307734fa6f
Jeff Sharkey [Thu, 30 Jun 2016 00:03:54 +0000 (00:03 +0000)]
Move getRecentTasks() to ParceledListSlice. am:
479212cf50 am:
ce3c8ac0f4
am:
38b322d171
Change-Id: Id28e985eff80210d5f25d8632db1e98fd111b896
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
Jeff Sharkey [Wed, 29 Jun 2016 23:59:09 +0000 (23:59 +0000)]
Move getRecentTasks() to ParceledListSlice. am:
479212cf50
am:
ce3c8ac0f4
Change-Id: Ie0c3873c46832d1a10b016bafb26e860eba4ec07
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
Tyler Gunn [Wed, 29 Jun 2016 23:54:03 +0000 (23:54 +0000)]
Merge \\"API cleanups per API review.\\" into nyc-mr1-dev am:
138a3f3ad4
am:
ba5f1622da
Change-Id: I0199d6e1a365812c8f7ba3e36390e789234da29f
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:34:21 +0000 (23:34 +0000)]
Merge \\"Apply animation in relayout invisible the old way\\" into nyc-mr1-dev am:
8f54d32b99
am:
8ca3333d90
Change-Id: Iaa6f622142eab1454d5bd769a532f010d4509078
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
Michael Kwan [Wed, 29 Jun 2016 23:25:59 +0000 (23:25 +0000)]
Merge \\"Updated colour theme for watch devices.\\" into nyc-mr1-dev am:
a7d4adaac7
am:
ff5aa3bbfd
Change-Id: I4320b6719fc12cd650e44f033598f7245c49c7bb
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
Erik Wolsheimer [Wed, 29 Jun 2016 23:17:36 +0000 (23:17 +0000)]
Merge \\"Handle invalid empty args to createAutoBrightnessSpline\\" into nyc-mr1-dev am:
136e649760
am:
27ee075c68
Change-Id: Iab0ca0f3a1f45fee5cac6b353467616a54801c09
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
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:22:51 +0000 (22:22 +0000)]
Docs: Links added to pages for permissions and configuration activity am:
cdfe5e4f55 am:
7a6494aeaf am:
ae5a14bc99 am:
83485046a5
am:
71e601db14
Change-Id: I2be8e109e0880b38f83cc53b4df6e28fe3dfe501
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
Jack Yu [Wed, 29 Jun 2016 22:17:39 +0000 (22:17 +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
am:
3249cf25bd
Change-Id: I57546ac79c77543384fc5e0b327deda019ecc2b8
Bert McMeen [Wed, 29 Jun 2016 22:17:30 +0000 (22:17 +0000)]
Docs: Links added to pages for permissions and configuration activity am:
cdfe5e4f55 am:
7a6494aeaf am:
ae5a14bc99 am:
7379e4a37b
am:
1ada3fb178
Change-Id: I7a49128611fc61aff0a142fc9cb5f5a866678217
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
Roozbeh Pournader [Wed, 29 Jun 2016 22:03:28 +0000 (22:03 +0000)]
Merge "Get failing WordIterator unit tests to pass again"
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:54:10 +0000 (21:54 +0000)]
Merge \\"Use the Deletion Helper when system storage is low.\\" into nyc-mr1-dev am:
6401217532
am:
b8a7ddad7e
Change-Id: I3d51bb6934e4a42ec8e9d7f37d460b780a5941fe
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
Dianne Hackborn [Wed, 29 Jun 2016 21:36:35 +0000 (21:36 +0000)]
Merge \\\"Fix issue #
29871385: Need JobScheduler.scheduleAsPackage to be system API\\\" into nyc-dev am:
205bc262ce am:
50beee8af9
am:
449a6bbae3
Change-Id: I00d8577fabd183c7e5ed4ce3fff16ab1b2b63d87
Dianne Hackborn [Wed, 29 Jun 2016 21:34:02 +0000 (21:34 +0000)]
Merge \\\"Fix issue #
29871385: Need JobScheduler.scheduleAsPackage to be system API\\\" into nyc-dev am:
205bc262ce am:
381f4eb9be
am:
d229fdb1c7
Change-Id: Idc70c2c5893ac586cc192ea75fe04fdab421e851
Eric Schmidt [Wed, 29 Jun 2016 21:33:45 +0000 (21:33 +0000)]
Merge \\"Remove framework dependencies on Support* demos\\" into nyc-mr1-dev am:
471af954c3
am:
8138f18d31
Change-Id: I29deb7e76048313a30c5a462a4851df095ce94b3
Alan Viverette [Wed, 29 Jun 2016 21:33:43 +0000 (21:33 +0000)]
Merge \"Merge \\"Remove framework dependencies on Support* demos\\" into nyc-mr1-dev am:
c295a4b23d\" into nyc-mr1-dev-plus-aosp
am:
821bfcbde8
Change-Id: I7392f929a6799a173d7ca36609a1d67ed2e1e547
David Friedman [Wed, 29 Jun 2016 21:33:40 +0000 (21:33 +0000)]
Merge \"Merge \\\"docs: Edits to Instant Apps FAQs, index page.\\\" into nyc-dev am:
7a4d857c45 am:
8c8a5e9296\" into nyc-mr1-dev-plus-aosp
am:
dec361d2e9
Change-Id: Ib234c05ac5f6134bd2375cbbf560ce3b4e8a9da1
Mukesh Agrawal [Wed, 29 Jun 2016 21:33:35 +0000 (21:33 +0000)]
Merge \\"wifi: allow config of default+verbose ring buffers\\" into nyc-mr1-dev am:
88442c1fe1
am:
d526329639
Change-Id: Iad63f61751702ff4723d88ce19eeaef3dcb3a317
Erik Wolsheimer [Tue, 28 Jun 2016 21:51:07 +0000 (14:51 -0700)]
Handle invalid empty args to createAutoBrightnessSpline
BUG:
18572096
Change-Id: I9dfc2215994a4f7a70ef6bdd04b620917e4ec034
Alex Light [Wed, 29 Jun 2016 21:27:44 +0000 (21:27 +0000)]
Merge \\"cp preopted files from B partition during PM init.\\" into nyc-mr1-dev am:
7281cf276a
am:
53f5e870c6
Change-Id: I3bc16096bb5703c3cadc05f1488e9b52fb1b5c82
Sanket Agarwal [Wed, 29 Jun 2016 21:10:04 +0000 (21:10 +0000)]
Merge "Use UUIDs for call management in Headset Client (HF)"
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
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
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
Rebecca Silberstein [Wed, 29 Jun 2016 20:37:12 +0000 (20:37 +0000)]
Merge changes from topic \\'cherrypickWifiWatchdogResetOnTrigger\\' into nyc-mr1-dev am:
b2f17f1bbb
am:
62cb9dbf47
Change-Id: I2f0dcbebe214cc923ea48c86aa82f8e9989c6434
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
Sid Soundararajan [Wed, 29 Jun 2016 20:32:01 +0000 (20:32 +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
am:
ec73d5506d
Change-Id: I3e5455ee8f5a3b1f19d361196f606893d6b758ef
Sid Soundararajan [Wed, 29 Jun 2016 20:31:58 +0000 (20:31 +0000)]
Merge \\\"Recents: Make sure blacklist checks the package name as well as activity name\\\" into nyc-dev am:
10b2fee05f am:
aea3d63f85
am:
df66e8e283
Change-Id: Ibbaa3f7d7e6bc6c513bc162d9270d1bbf498a474
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
Roozbeh Pournader [Wed, 29 Jun 2016 20:07:55 +0000 (13:07 -0700)]
Get failing WordIterator unit tests to pass again
WordIterator is now following the pattern in java.text.BreakIterator,
throwing an IllegalArgumentException when receiving an invalid argument.
Previously, it failed inconsistently.
Also add @SmallTest annotations to the WordIterator tests.
Bug:
29868991
Change-Id: I8158f2f419c8c4467205031655c0e62cc9ef5c1c
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:40:31 +0000 (19:40 +0000)]
Merge \\"Have wallpaper target itself when dismissing keyguard with wallpaper\\" into nyc-mr1-dev am:
5329715a74
am:
8ffdd0101a
Change-Id: I93ca9adfd3960d8d063514c7092d65e87d9a80ff
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:34:57 +0000 (19:34 +0000)]
Merge "Removed bogus foo() method."
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
Sanket Agarwal [Tue, 28 Jun 2016 03:13:54 +0000 (20:13 -0700)]
Use UUIDs for call management in Headset Client (HF)
Using UUIDs that are managed by the service gives more control and error
handling in the service since it has control over assigning them.
Bug: b/
29788044
Change-Id: I8483f8e61a33302ba95d544828947d7fb4a21be9
(cherry picked from commit
dbeab2c6e12693fe9b06b6a680677da5325c9230)
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
Derek Sollenberger [Wed, 29 Jun 2016 17:15:13 +0000 (17:15 +0000)]
Merge "Remove isAvailable() from DisplayListCanvas."
Android Build Merger (Role) [Wed, 29 Jun 2016 17:11:31 +0000 (17:11 +0000)]
Merge "Merge \"Merge \\\"Disable constant state sharing for VectorDrawable\\\" into nyc-dev am:
f66bdf9b57 am:
a75526bd11\" into nyc-mr1-dev-plus-aosp am:
c569cc7d93"
Android Build Merger (Role) [Wed, 29 Jun 2016 17:11:18 +0000 (17:11 +0000)]
Merge "Merge \\\"Disable constant state sharing for VectorDrawable\\\" into nyc-dev am:
f66bdf9b57 am:
25242a7bbc am:
edb98d238f"
Alan Viverette [Wed, 29 Jun 2016 17:10:53 +0000 (17:10 +0000)]
Merge \"Merge \\\"Disable constant state sharing for VectorDrawable\\\" into nyc-dev am:
f66bdf9b57 am:
a75526bd11\" into nyc-mr1-dev-plus-aosp
am:
c569cc7d93
Change-Id: I4b92ae13f931bcd5c4afcf557792cd9a0ff948fd
Alan Viverette [Wed, 29 Jun 2016 17:10:50 +0000 (17:10 +0000)]
Merge \\\"Disable constant state sharing for VectorDrawable\\\" into nyc-dev am:
f66bdf9b57 am:
25242a7bbc
am:
edb98d238f
Change-Id: Iad1b27849bfa501064cb3452caed3571fcdf8430
Derek Sollenberger [Wed, 29 Jun 2016 17:10:04 +0000 (17:10 +0000)]
Merge "Remove unused method from RenderProxy and CanvasContext."
Android Build Merger (Role) [Wed, 29 Jun 2016 17:07:31 +0000 (17:07 +0000)]
Merge "Merge \\"Disable constant state sharing for VectorDrawable\\" into nyc-dev am:
f66bdf9b57 am:
a75526bd11" into nyc-mr1-dev-plus-aosp
Alan Viverette [Wed, 29 Jun 2016 17:07:06 +0000 (17:07 +0000)]
Merge \\"Disable constant state sharing for VectorDrawable\\" into nyc-dev am:
f66bdf9b57
am:
a75526bd11
Change-Id: I57c5e8728ba22daa08734b59b2808c21dba14e4d
Alan Viverette [Wed, 29 Jun 2016 17:05:36 +0000 (17:05 +0000)]
Merge \\"Disable constant state sharing for VectorDrawable\\" into nyc-dev am:
f66bdf9b57
am:
25242a7bbc
Change-Id: I20e41c6ebbac82fd70ae3d724e484eac78d2b308
OSDN Git Service
