OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge \"Add PROPERTY_IS_DOWNGRADED_CONFERENCE\" into nyc-mr1-dev
Hall Liu [Mon, 18 Jul 2016 17:54:48 +0000 (17:54 +0000)]
Merge \"Add PROPERTY_IS_DOWNGRADED_CONFERENCE\" into nyc-mr1-dev
am: 810ae1ec7b

Change-Id: Ic4633dcf16425445f67c9810e2b80a446b4adee4

8 years agoMerge "Merge \"Merge \\"docs: Added support library 24.1.0\\" into nyc-dev am: 872ecf...
Android Build Merger (Role) [Mon, 18 Jul 2016 17:44:49 +0000 (17:44 +0000)]
Merge "Merge \"Merge \\"docs: Added support library 24.1.0\\" into nyc-dev am: 872ecfb0bf\" into nyc-mr1-dev am: c024e480ab" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge \\"docs: Added support library 24.1.0\\" into nyc-dev am: 872ecfb0bf...
Android Build Merger (Role) [Mon, 18 Jul 2016 17:44:43 +0000 (17:44 +0000)]
Merge "Merge \\"docs: Added support library 24.1.0\\" into nyc-dev am: 872ecfb0bf am: 965c66b41b" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Add PROPERTY_IS_DOWNGRADED_CONFERENCE" into nyc-mr1-dev
Hall Liu [Mon, 18 Jul 2016 17:44:38 +0000 (17:44 +0000)]
Merge "Add PROPERTY_IS_DOWNGRADED_CONFERENCE" into nyc-mr1-dev

8 years agoMerge \\"docs: Added support library 24.1.0\\" into nyc-dev am: 872ecfb0bf
Andrew Solovay [Mon, 18 Jul 2016 17:44:21 +0000 (17:44 +0000)]
Merge \\"docs: Added support library 24.1.0\\" into nyc-dev am: 872ecfb0bf
am: 965c66b41b

Change-Id: I510d983c9f84e2679f1237566396cdf93e85890a

8 years agoMerge \"Merge \\"docs: Added support library 24.1.0\\" into nyc-dev am: 872ecfb0bf...
Andrew Solovay [Mon, 18 Jul 2016 17:44:12 +0000 (17:44 +0000)]
Merge \"Merge \\"docs: Added support library 24.1.0\\" into nyc-dev am: 872ecfb0bf\" into nyc-mr1-dev
am: c024e480ab

Change-Id: I3d46dd6d160fb23702db36b5ce9090d8a6b32b6e

8 years agoMerge \"Document that WallpaperManager.getDrawable() can return null\" into nyc-mr1-dev
Christopher Tate [Mon, 18 Jul 2016 17:44:04 +0000 (17:44 +0000)]
Merge \"Document that WallpaperManager.getDrawable() can return null\" into nyc-mr1-dev
am: 3cec9d44b3

Change-Id: I72443aa4360cb4c22c9b4faf0cf98b395097757f

8 years agoMerge \"docs: Added support library 24.1.0\" into nyc-dev
Andrew Solovay [Mon, 18 Jul 2016 17:37:22 +0000 (17:37 +0000)]
Merge \"docs: Added support library 24.1.0\" into nyc-dev
am: 872ecfb0bf

Change-Id: Ibfcaf05e0bcc73c5c8b1d096553d2a9e042d7300

8 years agoMerge "Merge \"docs: Added support library 24.1.0\" into nyc-dev am: 872ecfb0bf"...
Android Build Merger (Role) [Mon, 18 Jul 2016 17:29:41 +0000 (17:29 +0000)]
Merge "Merge \"docs: Added support library 24.1.0\" into nyc-dev am: 872ecfb0bf" into nyc-mr1-dev

8 years agoMerge "Document that WallpaperManager.getDrawable() can return null" into nyc-mr1-dev
Chris Tate [Mon, 18 Jul 2016 17:29:37 +0000 (17:29 +0000)]
Merge "Document that WallpaperManager.getDrawable() can return null" into nyc-mr1-dev

8 years agoMerge \"docs: Added support library 24.1.0\" into nyc-dev
Andrew Solovay [Mon, 18 Jul 2016 17:29:02 +0000 (17:29 +0000)]
Merge \"docs: Added support library 24.1.0\" into nyc-dev
am: 872ecfb0bf

Change-Id: I6ba46b8efcc8567d6192ac274e08ed1489cb0c2e

8 years agoMerge "docs: Added support library 24.1.0" into nyc-dev
Andrew Solovay [Mon, 18 Jul 2016 17:16:59 +0000 (17:16 +0000)]
Merge "docs: Added support library 24.1.0" into nyc-dev

8 years agoMerge "Doc change: updated issues in DP5 release notes. am: 73b700404c am: 142c4f7a9f...
Android Build Merger (Role) [Mon, 18 Jul 2016 15:28:33 +0000 (15:28 +0000)]
Merge "Doc change: updated issues in DP5 release notes. am: 73b700404c am: 142c4f7a9f" into nyc-mr1-dev-plus-aosp

8 years agoDoc change: updated issues in DP5 release notes. am: 73b700404c
Dirk Dougherty [Mon, 18 Jul 2016 15:28:03 +0000 (15:28 +0000)]
Doc change: updated issues in DP5 release notes. am: 73b700404c
am: 142c4f7a9f

Change-Id: I13a07cd7b525f5bb1fa1f599f0f3ec0ebaa57296

8 years agoDoc change: updated issues in DP5 release notes. am: 73b700404c
Dirk Dougherty [Mon, 18 Jul 2016 15:26:50 +0000 (15:26 +0000)]
Doc change: updated issues in DP5 release notes. am: 73b700404c
am: 3061ceaf82

Change-Id: Ib4be8ed685e72f4eef343958e543e1419ba8ced6

8 years agoDoc change: updated issues in DP5 release notes.
Dirk Dougherty [Mon, 18 Jul 2016 15:21:38 +0000 (15:21 +0000)]
Doc change: updated issues in DP5 release notes.
am: 73b700404c

Change-Id: Ia4cf47f5fc268d50cc30d7cfc6c990fb1f5eefec

8 years agoDoc change: updated issues in DP5 release notes.
Dirk Dougherty [Mon, 18 Jul 2016 15:21:11 +0000 (15:21 +0000)]
Doc change: updated issues in DP5 release notes.
am: 73b700404c

Change-Id: Id7bb33217a91f0e37497c83c6e4efbce8743df8b

8 years agoMerge "Merge \\"update the version number used in docs and update the offline docs...
Android Build Merger (Role) [Mon, 18 Jul 2016 15:16:21 +0000 (15:16 +0000)]
Merge "Merge \\"update the version number used in docs and update the offline docs landing page\\" into nyc-dev am: 6623f4177c am: e8c3590a77" into nyc-mr1-dev-plus-aosp

8 years agoMerge \\"update the version number used in docs and update the offline docs landing...
Scott Main [Mon, 18 Jul 2016 15:15:50 +0000 (15:15 +0000)]
Merge \\"update the version number used in docs and update the offline docs landing page\\" into nyc-dev am: 6623f4177c
am: e8c3590a77

Change-Id: I69c3100afecb4a545f71bb9a3c28f9580b18ca89

8 years agoMerge \\"update the version number used in docs and update the offline docs landing...
Scott Main [Mon, 18 Jul 2016 15:15:14 +0000 (15:15 +0000)]
Merge \\"update the version number used in docs and update the offline docs landing page\\" into nyc-dev am: 6623f4177c
am: 38b71c5741

Change-Id: Ice045bb360e2de70af6cc3cc721d6ec5f55e8f58

8 years agoMerge "Merge \"Merge \\"Doc change: updates for DP5 release notes.\\" into nyc-dev...
Android Build Merger (Role) [Mon, 18 Jul 2016 15:09:44 +0000 (15:09 +0000)]
Merge "Merge \"Merge \\"Doc change: updates for DP5 release notes.\\" into nyc-dev am: e92ebf666e\" into nyc-mr1-dev am: 838542a660" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge \"Add an isListen method to NetworkRequests.\" into nyc-mr1-dev am:...
Android Build Merger (Role) [Mon, 18 Jul 2016 15:09:29 +0000 (15:09 +0000)]
Merge "Merge \"Add an isListen method to NetworkRequests.\" into nyc-mr1-dev am: b5239329b1" into nyc-mr1-dev-plus-aosp

8 years agoDoc change: updated issues in DP5 release notes.
Dirk Dougherty [Mon, 18 Jul 2016 15:09:24 +0000 (08:09 -0700)]
Doc change: updated issues in DP5 release notes.

Change-Id: I8c5af9a9523be71451a23bbac9b34da5079dbc27

8 years agoMerge \"Merge \\"Doc change: updates for DP5 release notes.\\" into nyc-dev am: e92eb...
Dirk Dougherty [Mon, 18 Jul 2016 15:09:05 +0000 (15:09 +0000)]
Merge \"Merge \\"Doc change: updates for DP5 release notes.\\" into nyc-dev am: e92ebf666e\" into nyc-mr1-dev
am: 838542a660

Change-Id: Ic79c889b404ea1c576b8f50431e2774dc8b2de12

8 years agoMerge \"Add an isListen method to NetworkRequests.\" into nyc-mr1-dev
Lorenzo Colitti [Mon, 18 Jul 2016 15:08:54 +0000 (15:08 +0000)]
Merge \"Add an isListen method to NetworkRequests.\" into nyc-mr1-dev
am: b5239329b1

Change-Id: Ib712c3c7b44d3a623d5f5facf0c7f6844c3ebb82

8 years agoMerge \\"Doc change: updates for DP5 release notes.\\" into nyc-dev am: e92ebf666e
Dirk Dougherty [Mon, 18 Jul 2016 15:08:30 +0000 (15:08 +0000)]
Merge \\"Doc change: updates for DP5 release notes.\\" into nyc-dev am: e92ebf666e
am: edf16d6d4b

Change-Id: I46312fed717840506111bde4be9d6ae1dc239caa

8 years agoMerge \"update the version number used in docs and update the offline docs landing...
smain@google.com [Mon, 18 Jul 2016 15:08:13 +0000 (15:08 +0000)]
Merge \"update the version number used in docs and update the offline docs landing page\" into nyc-dev
am: 6623f4177c

Change-Id: Iedcaed7bc842c353bbf2dc3f66dfa5054613d1e8

8 years agoMerge \"update the version number used in docs and update the offline docs landing...
smain@google.com [Mon, 18 Jul 2016 15:07:55 +0000 (15:07 +0000)]
Merge \"update the version number used in docs and update the offline docs landing page\" into nyc-dev
am: 6623f4177c

Change-Id: I60626863804f787bf5e1435003d730427f1254df

8 years agoMerge "Merge \"Doc change: updates for DP5 release notes.\" into nyc-dev am: e92ebf66...
Android Build Merger (Role) [Mon, 18 Jul 2016 15:03:02 +0000 (15:03 +0000)]
Merge "Merge \"Doc change: updates for DP5 release notes.\" into nyc-dev am: e92ebf666e" into nyc-mr1-dev

8 years agoMerge \"Doc change: updates for DP5 release notes.\" into nyc-dev
Dirk Dougherty [Mon, 18 Jul 2016 15:02:29 +0000 (15:02 +0000)]
Merge \"Doc change: updates for DP5 release notes.\" into nyc-dev
am: e92ebf666e

Change-Id: I7df3eb17a67a1ddc2019644d1efadacb149dcf48

8 years agoMerge \"Doc change: updates for DP5 release notes.\" into nyc-dev
Dirk Dougherty [Mon, 18 Jul 2016 15:02:28 +0000 (15:02 +0000)]
Merge \"Doc change: updates for DP5 release notes.\" into nyc-dev
am: e92ebf666e

Change-Id: I1396a1e544c31308bbe33ca525bace7640edbd3f

8 years agoMerge \"Use \"real\" display size for computing available densities\" into nyc-mr1-dev
Alan Viverette [Mon, 18 Jul 2016 15:02:13 +0000 (15:02 +0000)]
Merge \"Use \"real\" display size for computing available densities\" into nyc-mr1-dev
am: ad126d3b8b

Change-Id: Ib4641e6577dbae1bbe5a4215dd2b1d947399a1c9

8 years agoMerge "Add an isListen method to NetworkRequests." into nyc-mr1-dev
TreeHugger Robot [Mon, 18 Jul 2016 15:00:20 +0000 (15:00 +0000)]
Merge "Add an isListen method to NetworkRequests." into nyc-mr1-dev

8 years agoMerge "update the version number used in docs and update the offline docs landing...
Scott Main [Mon, 18 Jul 2016 14:57:37 +0000 (14:57 +0000)]
Merge "update the version number used in docs and update the offline docs landing page" into nyc-dev

8 years agoMerge "Use "real" display size for computing available densities" into nyc-mr1-dev
TreeHugger Robot [Mon, 18 Jul 2016 14:53:55 +0000 (14:53 +0000)]
Merge "Use "real" display size for computing available densities" into nyc-mr1-dev

8 years agoMerge "Doc change: updates for DP5 release notes." into nyc-dev
Dirk Dougherty [Mon, 18 Jul 2016 14:52:44 +0000 (14:52 +0000)]
Merge "Doc change: updates for DP5 release notes." into nyc-dev

8 years agoMerge \"Do not allow to disable package \"android\"\" into nyc-mr1-dev
Ricky Wai [Mon, 18 Jul 2016 14:29:51 +0000 (14:29 +0000)]
Merge \"Do not allow to disable package \"android\"\" into nyc-mr1-dev
am: a5111bfda4

Change-Id: Ia983198d1c41848d78ef18ed189d6f68cbc39350

8 years agoMerge "Do not allow to disable package "android"" into nyc-mr1-dev
Ricky Wai [Mon, 18 Jul 2016 14:22:26 +0000 (14:22 +0000)]
Merge "Do not allow to disable package "android"" into nyc-mr1-dev

8 years agoMerge "Merge \\"Check uid for notification policy access.\\" into nyc-dev am: 8f17d2a...
Android Build Merger (Role) [Mon, 18 Jul 2016 13:33:35 +0000 (13:33 +0000)]
Merge "Merge \\"Check uid for notification policy access.\\" into nyc-dev am: 8f17d2a48b am: 5710e91931" into nyc-mr1-dev-plus-aosp

8 years agoMerge \\"Check uid for notification policy access.\\" into nyc-dev am: 8f17d2a48b
Julia Reynolds [Mon, 18 Jul 2016 13:33:04 +0000 (13:33 +0000)]
Merge \\"Check uid for notification policy access.\\" into nyc-dev am: 8f17d2a48b
am: 5710e91931

Change-Id: I1a4957ded3e3526df8b2bb36093b70cee3f8c065

8 years agoMerge \\"Check uid for notification policy access.\\" into nyc-dev am: 8f17d2a48b
Julia Reynolds [Mon, 18 Jul 2016 13:32:57 +0000 (13:32 +0000)]
Merge \\"Check uid for notification policy access.\\" into nyc-dev am: 8f17d2a48b
am: 5921f81724

Change-Id: I48923935bf394c39441335423a24dd0b88b8b51e

8 years agoDo not allow to disable package "android"
Ricky Wai [Fri, 15 Jul 2016 14:44:07 +0000 (15:44 +0100)]
Do not allow to disable package "android"

Bug: 25337001
Change-Id: I837d70898f00d3c97c8ae1f5eadd0791ba045df6

8 years agoMerge \"Check uid for notification policy access.\" into nyc-dev
Julia Reynolds [Mon, 18 Jul 2016 13:25:54 +0000 (13:25 +0000)]
Merge \"Check uid for notification policy access.\" into nyc-dev
am: 8f17d2a48b

Change-Id: Iade2316b64a8d6dc43636fb292c08dbf82c9dc59

8 years agoMerge \"Check uid for notification policy access.\" into nyc-dev
Julia Reynolds [Mon, 18 Jul 2016 13:25:51 +0000 (13:25 +0000)]
Merge \"Check uid for notification policy access.\" into nyc-dev
am: 8f17d2a48b

Change-Id: Ibe8b12cb0bb57a31e0e1ca077863b2cf63daba1a

8 years agoMerge "Check uid for notification policy access." into nyc-dev
Julia Reynolds [Mon, 18 Jul 2016 13:16:15 +0000 (13:16 +0000)]
Merge "Check uid for notification policy access." into nyc-dev

8 years agoAdd an isListen method to NetworkRequests.
Lorenzo Colitti [Mon, 18 Jul 2016 09:17:08 +0000 (18:17 +0900)]
Add an isListen method to NetworkRequests.

This allows simplification of the ConnectivityService code.

Bug: 23113288
Change-Id: I124544b99c5a920124e9a3d31cda8c6d2abc21fd

8 years agoDoc change: updates for DP5 release notes.
Dirk Dougherty [Mon, 18 Jul 2016 03:59:36 +0000 (20:59 -0700)]
Doc change: updates for DP5 release notes.

Change-Id: I39cca9088d6fc5952a359f42e43a324aad4427f0

8 years agoMerge \"FloatingActionMode: Fix screen coordinates.\" into nyc-mr1-dev
Abodunrinwa Toki [Sun, 17 Jul 2016 18:20:11 +0000 (18:20 +0000)]
Merge \"FloatingActionMode: Fix screen coordinates.\" into nyc-mr1-dev
am: 3b8e0fdf92

Change-Id: If193932cfe4b79535ba8d2ce44f144899e81ee4e

8 years agoMerge "FloatingActionMode: Fix screen coordinates." into nyc-mr1-dev
Abodunrinwa Toki [Sun, 17 Jul 2016 18:07:08 +0000 (18:07 +0000)]
Merge "FloatingActionMode: Fix screen coordinates." into nyc-mr1-dev

8 years agoMerge \"Make sure StrictMode allows disk reads when calling isThreadInProcess.\"...
Tim Murray [Sat, 16 Jul 2016 19:25:37 +0000 (19:25 +0000)]
Merge \"Make sure StrictMode allows disk reads when calling isThreadInProcess.\" into nyc-mr1-dev
am: afa67f3d34

Change-Id: I2b3afb4acb9038a2d33ecf42bbbcc8c5d754ab5f

8 years agoMerge "Make sure StrictMode allows disk reads when calling isThreadInProcess." into...
Tim Murray [Sat, 16 Jul 2016 19:14:29 +0000 (19:14 +0000)]
Merge "Make sure StrictMode allows disk reads when calling isThreadInProcess." into nyc-mr1-dev

8 years agoMake sure StrictMode allows disk reads when calling isThreadInProcess.
Tim Murray [Sat, 16 Jul 2016 18:28:40 +0000 (11:28 -0700)]
Make sure StrictMode allows disk reads when calling isThreadInProcess.

If an application thread disables disk reads on the main thread,
isThreadInProcess will trigger a strict mode violation. This is bad if
the RenderThread is created after disk reads have been disallowed.

bug 30170339

Change-Id: I6918605d11f0c586c156f3168051376c3209b3f1

8 years agoMerge \"Deprecate Resources constructor and updateConfiguration() method\" into nyc...
Adam Lesinski [Sat, 16 Jul 2016 02:38:24 +0000 (02:38 +0000)]
Merge \"Deprecate Resources constructor and updateConfiguration() method\" into nyc-mr1-dev
am: c3829f528e

Change-Id: I59c4daf39179409cc3195cda9c89ae604ec36af6

8 years agoFrameworks/base: Fix braino missing line
Andreas Gampe [Sat, 16 Jul 2016 02:38:18 +0000 (02:38 +0000)]
Frameworks/base: Fix braino missing line
am: 06eb24d95e

Change-Id: I34b1b3084da32be43fda62d23c0b955e3cc6f335

8 years agoMerge "Deprecate Resources constructor and updateConfiguration() method" into nyc...
TreeHugger Robot [Sat, 16 Jul 2016 02:33:54 +0000 (02:33 +0000)]
Merge "Deprecate Resources constructor and updateConfiguration() method" into nyc-mr1-dev

8 years agoFrameworks/base: Fix braino missing line
Andreas Gampe [Sat, 16 Jul 2016 01:12:02 +0000 (18:12 -0700)]
Frameworks/base: Fix braino missing line

This got accidentally deleted in cleanup.

Bug: 29223204
Change-Id: I018b44d517f226eca30f141a3397c82a4be19afb

8 years agoDeprecate Resources constructor and updateConfiguration() method
Adam Lesinski [Sat, 16 Jul 2016 00:49:49 +0000 (17:49 -0700)]
Deprecate Resources constructor and updateConfiguration() method

These methods were never meant to be public. Instead, developers
can use Context#createConfigurationContext().

Bug:30088019
Bug:29999297
Change-Id: I2b864136163deda0af99fa3bfe9ef4ee1077341a

8 years agoMerge "Merge \\"docs: Updating N Preview \\"behavior changes\\" doc for DP5\\" into...
Android Build Merger (Role) [Sat, 16 Jul 2016 00:41:56 +0000 (00:41 +0000)]
Merge "Merge \\"docs: Updating N Preview \\"behavior changes\\" doc for DP5\\" into nyc-dev am: 9d3bc86207 am: 72022a691a" into nyc-mr1-dev-plus-aosp

8 years agoMerge \\"docs: Updating N Preview \\"behavior changes\\" doc for DP5\\" into nyc...
Andrew Solovay [Sat, 16 Jul 2016 00:41:33 +0000 (00:41 +0000)]
Merge \\"docs: Updating N Preview \\"behavior changes\\" doc for DP5\\" into nyc-dev am: 9d3bc86207
am: 72022a691a

Change-Id: I4c85652bbc4d67507c419b5362341e993f932866

8 years agoMerge \\"docs: Updating N Preview \\"behavior changes\\" doc for DP5\\" into nyc...
Andrew Solovay [Sat, 16 Jul 2016 00:41:16 +0000 (00:41 +0000)]
Merge \\"docs: Updating N Preview \\"behavior changes\\" doc for DP5\\" into nyc-dev am: 9d3bc86207
am: 8af870a778

Change-Id: I257e7b0774f7892373963883a362b44ba5ec4759

8 years agoMerge \"docs: Updating N Preview \"behavior changes\" doc for DP5\" into nyc-dev
Andrew Solovay [Sat, 16 Jul 2016 00:35:41 +0000 (00:35 +0000)]
Merge \"docs: Updating N Preview \"behavior changes\" doc for DP5\" into nyc-dev
am: 9d3bc86207

Change-Id: Iede90cc135476ea34b82f49c464a14eba9d60a31

8 years agoMerge \"docs: Updating N Preview \"behavior changes\" doc for DP5\" into nyc-dev
Andrew Solovay [Sat, 16 Jul 2016 00:35:31 +0000 (00:35 +0000)]
Merge \"docs: Updating N Preview \"behavior changes\" doc for DP5\" into nyc-dev
am: 9d3bc86207

Change-Id: I21af2f098ffd3034b3f88548bfa9210996f7b397

8 years agoMerge "Merge \\"docs: Updating N Preview \\"API Overview\\" doc for DP5\\" into nyc...
Android Build Merger (Role) [Sat, 16 Jul 2016 00:30:13 +0000 (00:30 +0000)]
Merge "Merge \\"docs: Updating N Preview \\"API Overview\\" doc for DP5\\" into nyc-dev am: 833722e049 am: f5f50cfc7a" into nyc-mr1-dev-plus-aosp

8 years agoMerge \\"docs: Updating N Preview \\"API Overview\\" doc for DP5\\" into nyc-dev...
Andrew Solovay [Sat, 16 Jul 2016 00:29:49 +0000 (00:29 +0000)]
Merge \\"docs: Updating N Preview \\"API Overview\\" doc for DP5\\" into nyc-dev am: 833722e049
am: f5f50cfc7a

Change-Id: Icc3d60d6ad55805be520975033e2a0f157721c50

8 years agoMerge \\"docs: Updating N Preview \\"API Overview\\" doc for DP5\\" into nyc-dev...
Andrew Solovay [Sat, 16 Jul 2016 00:28:26 +0000 (00:28 +0000)]
Merge \\"docs: Updating N Preview \\"API Overview\\" doc for DP5\\" into nyc-dev am: 833722e049
am: 843979a3b3

Change-Id: I9a86bd40709f5a9006f669cbdbd94d10bfd8d555

8 years agoMerge "docs: Updating N Preview "behavior changes" doc for DP5" into nyc-dev
TreeHugger Robot [Sat, 16 Jul 2016 00:24:48 +0000 (00:24 +0000)]
Merge "docs: Updating N Preview "behavior changes" doc for DP5" into nyc-dev

8 years agoMerge \"docs: Updating N Preview \"API Overview\" doc for DP5\" into nyc-dev
Andrew Solovay [Sat, 16 Jul 2016 00:23:00 +0000 (00:23 +0000)]
Merge \"docs: Updating N Preview \"API Overview\" doc for DP5\" into nyc-dev
am: 833722e049

Change-Id: Id869d494381ff6e53066eab1dcbb4a3ee447384d

8 years agoMerge \"docs: Updating N Preview \"API Overview\" doc for DP5\" into nyc-dev
Andrew Solovay [Sat, 16 Jul 2016 00:22:59 +0000 (00:22 +0000)]
Merge \"docs: Updating N Preview \"API Overview\" doc for DP5\" into nyc-dev
am: 833722e049

Change-Id: I8b594c2f28db69dd6e645dc2d79405f6da764806

8 years agoMerge "docs: Updating N Preview "API Overview" doc for DP5" into nyc-dev
TreeHugger Robot [Sat, 16 Jul 2016 00:13:16 +0000 (00:13 +0000)]
Merge "docs: Updating N Preview "API Overview" doc for DP5" into nyc-dev

8 years agoMerge \"Block camera gesture during secondary user SUW\" into nyc-mr1-dev
Amith Yamasani [Sat, 16 Jul 2016 00:12:03 +0000 (00:12 +0000)]
Merge \"Block camera gesture during secondary user SUW\" into nyc-mr1-dev
am: e1a3a449a4

Change-Id: I92755956d3047902086945ce7479fc16bfa70b84

8 years agoMerge \"Include an app icon.\" into nyc-mr1-dev
Steve McKay [Sat, 16 Jul 2016 00:06:10 +0000 (00:06 +0000)]
Merge \"Include an app icon.\" into nyc-mr1-dev
am: 3d8c9981b5

Change-Id: I14f2d90fc7c0f21ab0fe6b993c1ef6d8ed665831

8 years agoMerge "Block camera gesture during secondary user SUW" into nyc-mr1-dev
TreeHugger Robot [Sat, 16 Jul 2016 00:03:51 +0000 (00:03 +0000)]
Merge "Block camera gesture during secondary user SUW" into nyc-mr1-dev

8 years agoMerge "Include an app icon." into nyc-mr1-dev
TreeHugger Robot [Fri, 15 Jul 2016 23:59:44 +0000 (23:59 +0000)]
Merge "Include an app icon." into nyc-mr1-dev

8 years agoMerge \"Ensure native allocation/free is correctly registered\" into nyc-mr1-dev
Doris Liu [Fri, 15 Jul 2016 23:56:24 +0000 (23:56 +0000)]
Merge \"Ensure native allocation/free is correctly registered\" into nyc-mr1-dev
am: a7272b4cad

Change-Id: Ib1d07a6420d6800b290d0c47e9fcfe3690c541eb

8 years agoMerge \"Don\'t accept resource references in string fields\" into nyc-mr1-dev
Makoto Onuki [Fri, 15 Jul 2016 23:50:51 +0000 (23:50 +0000)]
Merge \"Don\'t accept resource references in string fields\" into nyc-mr1-dev
am: 6fa0e4d518

Change-Id: I8bc05f17694aca0c24e280daa2fcd8464aa1fd05

8 years agoMerge "Ensure native allocation/free is correctly registered" into nyc-mr1-dev
Doris Liu [Fri, 15 Jul 2016 23:46:07 +0000 (23:46 +0000)]
Merge "Ensure native allocation/free is correctly registered" into nyc-mr1-dev

8 years agoMerge "Don't accept resource references in string fields" into nyc-mr1-dev
Makoto Onuki [Fri, 15 Jul 2016 23:41:10 +0000 (23:41 +0000)]
Merge "Don't accept resource references in string fields" into nyc-mr1-dev

8 years agoMerge "Merge \"Build both filename views before deleting.\" into nyc-mr1-dev am:...
Android Build Merger (Role) [Fri, 15 Jul 2016 23:16:56 +0000 (23:16 +0000)]
Merge "Merge \"Build both filename views before deleting.\" into nyc-mr1-dev am: fff6a11438" into nyc-mr1-dev-plus-aosp

8 years agoMerge \"Build both filename views before deleting.\" into nyc-mr1-dev
Jeff Sharkey [Fri, 15 Jul 2016 23:16:35 +0000 (23:16 +0000)]
Merge \"Build both filename views before deleting.\" into nyc-mr1-dev
am: fff6a11438

Change-Id: Ie97bade1f8396c3c08f622f2533d42d115568e08

8 years agoMerge \\"docs: Updating N Preview release notes for DP5\\" into nyc-dev am: b91693fedd
Andrew Solovay [Fri, 15 Jul 2016 23:15:57 +0000 (23:15 +0000)]
Merge \\"docs: Updating N Preview release notes for DP5\\" into nyc-dev am: b91693fedd
am: 5de36f1ba0

Change-Id: Ib60985ae93a52c826a75c96df6b8d2d50d448ad4

8 years agoMerge \\"docs: Updating N Preview release notes for DP5\\" into nyc-dev am: b91693fedd
Andrew Solovay [Fri, 15 Jul 2016 23:10:58 +0000 (23:10 +0000)]
Merge \\"docs: Updating N Preview release notes for DP5\\" into nyc-dev am: b91693fedd
am: e4846ae107

Change-Id: I81bb81225087441a2906b36a67ad68b247b36fb0

8 years agoMerge "Build both filename views before deleting." into nyc-mr1-dev
TreeHugger Robot [Fri, 15 Jul 2016 23:05:14 +0000 (23:05 +0000)]
Merge "Build both filename views before deleting." into nyc-mr1-dev

8 years agodocs: Updating N Preview "behavior changes" doc for DP5
Andrew Solovay [Fri, 15 Jul 2016 02:08:11 +0000 (19:08 -0700)]
docs: Updating N Preview "behavior changes" doc for DP5

See first comment for doc stage location.

Change-Id: I11720bdabca78fdbaca82c7e3467f47b51e60f15

8 years agoDocument that WallpaperManager.getDrawable() can return null
Christopher Tate [Fri, 15 Jul 2016 22:59:23 +0000 (15:59 -0700)]
Document that WallpaperManager.getDrawable() can return null

Bug 30164766

Change-Id: Idc03a41ea3fab3772de4f24551765dff78eb6d7f

8 years agoMerge \"docs: Updating N Preview release notes for DP5\" into nyc-dev
Andrew Solovay [Fri, 15 Jul 2016 22:55:38 +0000 (22:55 +0000)]
Merge \"docs: Updating N Preview release notes for DP5\" into nyc-dev
am: b91693fedd

Change-Id: I2e697679697d56695bd6e26eeb4ff2dba58632d1

8 years agoMerge \"docs: Updating N Preview release notes for DP5\" into nyc-dev
Andrew Solovay [Fri, 15 Jul 2016 22:55:37 +0000 (22:55 +0000)]
Merge \"docs: Updating N Preview release notes for DP5\" into nyc-dev
am: b91693fedd

Change-Id: I9e9a0982a141d09da5e7d68fb01df48adcb619a3

8 years agoMerge "Merge \\"docs: Describe how to update N Preview test devices on N release...
Android Build Merger (Role) [Fri, 15 Jul 2016 22:52:01 +0000 (22:52 +0000)]
Merge "Merge \\"docs: Describe how to update N Preview test devices on N release\\" into nyc-dev am: 085b4e8f7b am: 64e25cf4d3" into nyc-mr1-dev-plus-aosp

8 years agoMerge \\"docs: Describe how to update N Preview test devices on N release\\" into...
Andrew Solovay [Fri, 15 Jul 2016 22:51:27 +0000 (22:51 +0000)]
Merge \\"docs: Describe how to update N Preview test devices on N release\\" into nyc-dev am: 085b4e8f7b
am: 64e25cf4d3

Change-Id: Ia118a84d08bfd049036e8a8dba107213f4732ca7

8 years agoMerge \\"docs: Describe how to update N Preview test devices on N release\\" into...
Andrew Solovay [Fri, 15 Jul 2016 22:51:20 +0000 (22:51 +0000)]
Merge \\"docs: Describe how to update N Preview test devices on N release\\" into nyc-dev am: 085b4e8f7b
am: 9ef754c105

Change-Id: Ia924b34cae241e95ba4354ebb795fd2003ba392a

8 years agoMerge "docs: Updating N Preview release notes for DP5" into nyc-dev
Andrew Solovay [Fri, 15 Jul 2016 22:46:49 +0000 (22:46 +0000)]
Merge "docs: Updating N Preview release notes for DP5" into nyc-dev

8 years agoMerge \"docs: Describe how to update N Preview test devices on N release\" into nyc-dev
Andrew Solovay [Fri, 15 Jul 2016 22:46:14 +0000 (22:46 +0000)]
Merge \"docs: Describe how to update N Preview test devices on N release\" into nyc-dev
am: 085b4e8f7b

Change-Id: I9a005cea1e0e3b61d20003ebb975d4b04ebdba5c

8 years agoMerge \"docs: Describe how to update N Preview test devices on N release\" into nyc-dev
Andrew Solovay [Fri, 15 Jul 2016 22:45:57 +0000 (22:45 +0000)]
Merge \"docs: Describe how to update N Preview test devices on N release\" into nyc-dev
am: 085b4e8f7b

Change-Id: Id0ad00358c59e0a4187bd1f67bfc329e328c17bd

8 years agoMerge "docs: Describe how to update N Preview test devices on N release" into nyc-dev
TreeHugger Robot [Fri, 15 Jul 2016 22:42:27 +0000 (22:42 +0000)]
Merge "docs: Describe how to update N Preview test devices on N release" into nyc-dev

8 years agodocs: Updating N Preview "API Overview" doc for DP5
Andrew Solovay [Fri, 15 Jul 2016 20:04:04 +0000 (13:04 -0700)]
docs: Updating N Preview "API Overview" doc for DP5

Added new "WebView" section, and minor tweak to the "Always On VPN"
section.

See first comment for doc stage location.

Change-Id: I1f57c2a73d1c8adaf4de0bf928711ba75f732436

8 years agoInclude an app icon.
Steve McKay [Fri, 15 Jul 2016 21:46:56 +0000 (14:46 -0700)]
Include an app icon.

Bug: 29880363
Change-Id: Ia8d9414ce536fb35acec1357d0f69d3ee158d853

8 years agoBlock camera gesture during secondary user SUW
Amith Yamasani [Fri, 15 Jul 2016 22:33:03 +0000 (15:33 -0700)]
Block camera gesture during secondary user SUW

Check for the current user's setup_complete state
before acting on the double-tap on power camera
launcher.

Bug: 30155500
Change-Id: I2ee8601411d270e288410e9d22ae07b97fa0de70

8 years agoMerge \"Cache the default launcher.\" into nyc-mr1-dev
Makoto Onuki [Fri, 15 Jul 2016 22:26:15 +0000 (22:26 +0000)]
Merge \"Cache the default launcher.\" into nyc-mr1-dev
am: cf99263662

Change-Id: If8d15587702dad81d9a9025e13dec9820456287b

8 years agoMerge \"Frameworks/base: Add compiler stats to Package Manager\" into nyc-mr1-dev
Andreas Gampe [Fri, 15 Jul 2016 22:26:09 +0000 (22:26 +0000)]
Merge \"Frameworks/base: Add compiler stats to Package Manager\" into nyc-mr1-dev
am: f52ce76d1f

Change-Id: Ifeb2471b276ef29e58c511f89bd27b1d9bb8591f

8 years agoMerge "Cache the default launcher." into nyc-mr1-dev
Makoto Onuki [Fri, 15 Jul 2016 22:22:33 +0000 (22:22 +0000)]
Merge "Cache the default launcher." into nyc-mr1-dev

8 years agoMerge \"Loading NanoApps now works.\" into nyc-mr1-dev
Ashutosh Joshi [Fri, 15 Jul 2016 22:21:01 +0000 (22:21 +0000)]
Merge \"Loading NanoApps now works.\" into nyc-mr1-dev
am: 095979b463

Change-Id: I8035e04cc0ca040357a8799136c9b31702a151c0