OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge \"Fix code tags that contain html encoded characters, and fix at links.\" into...
Elliot Waite [Mon, 25 Jul 2016 22:37:56 +0000 (22:37 +0000)]
Merge \"Fix code tags that contain html encoded characters, and fix at links.\" into nyc-dev
am: fc0bc7bf96

Change-Id: Ib71dafd15bb5b6fb16cb44fd0fa659b2f100118e

8 years agoresolve merge conflicts of c4ae782 to nyc-dev-plus-aosp
Dirk Dougherty [Mon, 25 Jul 2016 20:47:53 +0000 (13:47 -0700)]
resolve merge conflicts of c4ae782 to nyc-dev-plus-aosp

Change-Id: Ib81e71e0b9a17a4231d93f02f41c7722fad84ec3

8 years agoMerge "Fix code tags that contain html encoded characters, and fix at links." into...
Dirk Dougherty [Mon, 25 Jul 2016 17:00:18 +0000 (17:00 +0000)]
Merge "Fix code tags that contain html encoded characters, and fix at links." into nyc-dev

8 years agoMerge \"Merge \\\"docs: Fixed option for \\\"launchMode\\\" within Android manifest...
Kevin Hufnagle [Mon, 25 Jul 2016 15:53:57 +0000 (15:53 +0000)]
Merge \"Merge \\\"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc.\\\" into mnc-io-docs am: c46ee88f9a am: 260e77f68a\" into nyc-dev
am: 30588da701

Change-Id: I1b3bbeab2964c0712d59abab76f43d0d13ddb7d6

8 years agoMerge \\\"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc....
Kevin Hufnagle [Mon, 25 Jul 2016 15:53:45 +0000 (15:53 +0000)]
Merge \\\"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc.\\\" into mnc-io-docs am: c46ee88f9a am: 260e77f68a
am: 616ba9d22b

Change-Id: I43d14c18de0fd9f5168e5a1350713e36515dedcc

8 years agoMerge \"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc. am...
Kevin Hufnagle [Mon, 25 Jul 2016 15:53:25 +0000 (15:53 +0000)]
Merge \"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc. am: 7ce51cf350 am: e059c15480\" into nyc-dev
am: aa57295104

Change-Id: I844fe4bdfd6fef705ce0450ae71a8a9fa1c76ee0

8 years agodocs: Fixed option for \\\"launchMode\\\" within Android manifest doc. am: 7ce51cf350...
Kevin Hufnagle [Mon, 25 Jul 2016 15:53:17 +0000 (15:53 +0000)]
docs: Fixed option for \\\"launchMode\\\" within Android manifest doc. am: 7ce51cf350 am: e059c15480
am: 15865b5c67

Change-Id: I7a4149cae91c3564c6c6fa88c2cfa1d7bad2fe30

8 years agoMerge \\\"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc....
Kevin Hufnagle [Mon, 25 Jul 2016 15:53:10 +0000 (15:53 +0000)]
Merge \\\"docs: Fixed option for \\\"launchMode\\\" within Android manifest doc.\\\" into mnc-io-docs am: c46ee88f9a am: c59557649c
am: 29df77dd86

Change-Id: I219ea7001581bdd0eb1fa3e6cfd7f3a7bda63ed3

8 years agodocs: Fixed option for \\\"launchMode\\\" within Android manifest doc. am: 7ce51cf350...
Kevin Hufnagle [Mon, 25 Jul 2016 15:53:06 +0000 (15:53 +0000)]
docs: Fixed option for \\\"launchMode\\\" within Android manifest doc. am: 7ce51cf350 am: 22be9b1a87
am: b65288fcb5

Change-Id: I34605fa43f1c4ddd26baa7f4d06760cdb602d41e

8 years agoMerge "Merge \\"docs: Fixed option for \\"launchMode\\" within Android manifest doc...
Android Build Merger (Role) [Mon, 25 Jul 2016 15:46:55 +0000 (15:46 +0000)]
Merge "Merge \\"docs: Fixed option for \\"launchMode\\" within Android manifest doc.\\" into mnc-io-docs am: c46ee88f9a am: 260e77f68a" into nyc-dev

8 years agoMerge "docs: Fixed option for \\"launchMode\\" within Android manifest doc. am: 7ce51...
Android Build Merger (Role) [Mon, 25 Jul 2016 15:46:33 +0000 (15:46 +0000)]
Merge "docs: Fixed option for \\"launchMode\\" within Android manifest doc. am: 7ce51cf350 am: e059c15480" into nyc-dev

8 years agoMerge \\"docs: Fixed option for \\"launchMode\\" within Android manifest doc.\\"...
Kevin Hufnagle [Mon, 25 Jul 2016 15:45:56 +0000 (15:45 +0000)]
Merge \\"docs: Fixed option for \\"launchMode\\" within Android manifest doc.\\" into mnc-io-docs am: c46ee88f9a
am: 260e77f68a

Change-Id: Id931a4e007b696368cb7a074e3dcc11d6ac896eb

8 years agodocs: Fixed option for \\"launchMode\\" within Android manifest doc. am: 7ce51cf350
Kevin Hufnagle [Mon, 25 Jul 2016 15:45:51 +0000 (15:45 +0000)]
docs: Fixed option for \\"launchMode\\" within Android manifest doc. am: 7ce51cf350
am: e059c15480

Change-Id: Ic42a2ab9c49b3c40b5743f095d17be90a3414ad9

8 years agoMerge \\"docs: Fixed option for \\"launchMode\\" within Android manifest doc.\\"...
Kevin Hufnagle [Mon, 25 Jul 2016 15:45:47 +0000 (15:45 +0000)]
Merge \\"docs: Fixed option for \\"launchMode\\" within Android manifest doc.\\" into mnc-io-docs am: c46ee88f9a
am: c59557649c

Change-Id: Icfd32ab1899fd098a9afc3532f8c29accf17b56d

8 years agodocs: Fixed option for \\"launchMode\\" within Android manifest doc. am: 7ce51cf350
Kevin Hufnagle [Mon, 25 Jul 2016 15:45:45 +0000 (15:45 +0000)]
docs: Fixed option for \\"launchMode\\" within Android manifest doc. am: 7ce51cf350
am: 22be9b1a87

Change-Id: Ie27aa01933ac6f8854efb626d8bb776af6d1cf7d

8 years agoMerge \"docs: Fixed option for \"launchMode\" within Android manifest doc.\" into...
Kevin Hufnagle [Mon, 25 Jul 2016 15:39:27 +0000 (15:39 +0000)]
Merge \"docs: Fixed option for \"launchMode\" within Android manifest doc.\" into mnc-io-docs
am: c46ee88f9a

Change-Id: I4197d61f056148f06978c2471b2b1ebf25b37881

8 years agodocs: Fixed option for \"launchMode\" within Android manifest doc.
Kevin Hufnagle [Mon, 25 Jul 2016 15:39:22 +0000 (15:39 +0000)]
docs: Fixed option for \"launchMode\" within Android manifest doc.
am: 7ce51cf350

Change-Id: I1c16676d7a605c8a4c5d7b9bb0b2075c2e0c4355

8 years agoMerge \"docs: Fixed option for \"launchMode\" within Android manifest doc.\" into...
Kevin Hufnagle [Mon, 25 Jul 2016 15:39:20 +0000 (15:39 +0000)]
Merge \"docs: Fixed option for \"launchMode\" within Android manifest doc.\" into mnc-io-docs
am: c46ee88f9a

Change-Id: Ibdfcea6f97b7969d1cc1a4c1ad13b3274c69a80a

8 years agodocs: Fixed option for \"launchMode\" within Android manifest doc.
Kevin Hufnagle [Mon, 25 Jul 2016 15:39:18 +0000 (15:39 +0000)]
docs: Fixed option for \"launchMode\" within Android manifest doc.
am: 7ce51cf350

Change-Id: I013c71c0c64ff66ee5deb9810cd97312ed87b2e4

8 years agoMerge "docs: Fixed option for "launchMode" within Android manifest doc." into mnc...
Kevin Hufnagle [Mon, 25 Jul 2016 15:33:02 +0000 (15:33 +0000)]
Merge "docs: Fixed option for "launchMode" within Android manifest doc." into mnc-io-docs

8 years agoMerge \\"bootanimation: Call eglReleaseThread in threadLoop\\" am: 189bbd9f6d
Jesse Hall [Mon, 25 Jul 2016 03:53:11 +0000 (03:53 +0000)]
Merge \\"bootanimation: Call eglReleaseThread in threadLoop\\" am: 189bbd9f6d
am: 9495872add

Change-Id: Iaed82af8a48b84972b3b2336a1dc1299851a2f08

8 years agoMerge \"bootanimation: Call eglReleaseThread in threadLoop\"
Sai Kiran Korwar [Mon, 25 Jul 2016 03:46:44 +0000 (03:46 +0000)]
Merge \"bootanimation: Call eglReleaseThread in threadLoop\"
am: 189bbd9f6d

Change-Id: Iaa5b3e60548ee2cce19cb4c31a6274d0ad877189

8 years agoMerge "bootanimation: Call eglReleaseThread in threadLoop"
Jesse Hall [Mon, 25 Jul 2016 03:36:57 +0000 (03:36 +0000)]
Merge "bootanimation: Call eglReleaseThread in threadLoop"

8 years agoFix code tags that contain html encoded characters, and fix at links.
Elliot Waite [Fri, 24 Jun 2016 20:52:10 +0000 (13:52 -0700)]
Fix code tags that contain html encoded characters, and fix at links.

Change-Id: I1ab2275ac17d75afaa8f3f0039b26633365bcb3a

8 years agodocs: Updated support library revision history for 24.1.1 am: 0b80531b5b
Andrew Solovay [Fri, 22 Jul 2016 20:30:01 +0000 (20:30 +0000)]
docs: Updated support library revision history for 24.1.1 am: 0b80531b5b
am: 6a2782548d

Change-Id: Id4496ca42ca6d3d9989bbbee2a71b01af23086a0

8 years agodocs: Updated support library revision history for 24.1.1
Andrew Solovay [Fri, 22 Jul 2016 20:14:57 +0000 (20:14 +0000)]
docs: Updated support library revision history for 24.1.1
am: 0b80531b5b

Change-Id: I26c19728affe538d49282d9966fa5d87e55ba076

8 years agodocs: Updated support library revision history for 24.1.1
Andrew Solovay [Fri, 22 Jul 2016 18:35:04 +0000 (11:35 -0700)]
docs: Updated support library revision history for 24.1.1

See first comment for doc stage location.

bug: 30302654
Change-Id: Icb9a171963b6bf7feec69b6dd36aa6513055bb05

8 years agoMerge \"Block user from setting safe boot setting via adb\" into nyc-dev
Benjamin Franz [Fri, 22 Jul 2016 08:47:48 +0000 (08:47 +0000)]
Merge \"Block user from setting safe boot setting via adb\" into nyc-dev
am: f97faada5d

Change-Id: Ifba1f49a4411450cbe782fc2a1aded6bb7e4c186

8 years agoBlock user from setting safe boot setting via adb
Benjamin Franz [Fri, 22 Jul 2016 08:47:40 +0000 (08:47 +0000)]
Block user from setting safe boot setting via adb
am: 0ff13fce6f

Change-Id: Ic8da0b5ffbc285f4371f68c189054a0005b90751

8 years agoMerge "Block user from setting safe boot setting via adb" into nyc-dev
Benjamin Franz [Fri, 22 Jul 2016 08:37:30 +0000 (08:37 +0000)]
Merge "Block user from setting safe boot setting via adb" into nyc-dev

8 years agoresolve merge conflicts of 5152fd9 to stage-aosp-master
Chih-hung Hsieh [Fri, 22 Jul 2016 01:53:29 +0000 (01:53 +0000)]
resolve merge conflicts of 5152fd9 to stage-aosp-master
am: 05160d70d1

Change-Id: Id1d734fd162d6063fdc818afc68f09809f764c5f

8 years agoresolve merge conflicts of 5152fd9 to stage-aosp-master
Chih-Hung Hsieh [Fri, 22 Jul 2016 01:13:31 +0000 (18:13 -0700)]
resolve merge conflicts of 5152fd9 to stage-aosp-master

Change-Id: I2066125eb4076dbc9e8996bb1fa87735aa6040d3

8 years agoMerge "Fix google-explicit-constructor warnings in frameworks/base"
Chih-hung Hsieh [Fri, 22 Jul 2016 00:55:18 +0000 (00:55 +0000)]
Merge "Fix google-explicit-constructor warnings in frameworks/base"

8 years agoMerge \\"docs: Replacing curly apostrophes with straight ones\\" into nyc-docs am...
Andrew Solovay [Thu, 21 Jul 2016 23:56:57 +0000 (23:56 +0000)]
Merge \\"docs: Replacing curly apostrophes with straight ones\\" into nyc-docs am: 1d545c4f83
am: adfb20c2f0

Change-Id: I45b64c1ad1359f4ce908db07d968cffeb9406ace

8 years agodocs: Replacing curly apostrophes with straight ones am: abea4b1dcd
Andrew Solovay [Thu, 21 Jul 2016 23:56:50 +0000 (23:56 +0000)]
docs: Replacing curly apostrophes with straight ones am: abea4b1dcd
am: 85d40b4feb

Change-Id: I7bac719771e700f33e1081a34a76d3f656bbe65d

8 years agoMerge \"docs: Replacing curly apostrophes with straight ones\" into nyc-docs
Andrew Solovay [Thu, 21 Jul 2016 23:48:00 +0000 (23:48 +0000)]
Merge \"docs: Replacing curly apostrophes with straight ones\" into nyc-docs
am: 1d545c4f83

Change-Id: Ia21fd5e04dc0565feea5207951372e6ceaf60e38

8 years agodocs: Replacing curly apostrophes with straight ones
Andrew Solovay [Thu, 21 Jul 2016 23:47:58 +0000 (23:47 +0000)]
docs: Replacing curly apostrophes with straight ones
am: abea4b1dcd

Change-Id: I1fd344ed7087b962a66d577b1c3cb5fa0e81fbaa

8 years agoFix google-explicit-constructor warnings in frameworks/base
Chih-Hung Hsieh [Thu, 21 Jul 2016 18:23:06 +0000 (11:23 -0700)]
Fix google-explicit-constructor warnings in frameworks/base

* Add explicit keyword to conversion constructors.
* Add NOLINT to implicit conversion constructors.

Bug: 28341362
Test: build with clang-tidy
Change-Id: Ie4d37072ab57d1662d18db4de1c8577247f43337

8 years agoMerge "docs: Replacing curly apostrophes with straight ones" into nyc-docs
TreeHugger Robot [Thu, 21 Jul 2016 23:07:15 +0000 (23:07 +0000)]
Merge "docs: Replacing curly apostrophes with straight ones" into nyc-docs

8 years agoresolve merge conflicts of 95e42d9 to nyc-dev-plus-aosp
David Gross [Thu, 21 Jul 2016 21:06:20 +0000 (14:06 -0700)]
resolve merge conflicts of 95e42d9 to nyc-dev-plus-aosp

Change-Id: Iaa22f6c36676974223919918657f5d04d94e482e

8 years agodocs: Replacing curly apostrophes with straight ones
Andrew Solovay [Thu, 21 Jul 2016 20:50:23 +0000 (13:50 -0700)]
docs: Replacing curly apostrophes with straight ones

Need to have a CL ready to go in case that's necessary to force
a docs build on the new branch, so I'm setting up this one. Doing
nothing but changing ’ to ' in a few files.

Change-Id: I408f9152d4898e75ab34a92606620afeaf4d3ab9

8 years agoMerge \"Merge \\\"docs: Fixed typo.\\\" into mnc-io-docs am: 71f742920d am: 9b911b873...
Sreevani Sreejith [Thu, 21 Jul 2016 20:43:06 +0000 (20:43 +0000)]
Merge \"Merge \\\"docs: Fixed typo.\\\" into mnc-io-docs am: 71f742920d am: 9b911b8736\" into nyc-dev
am: 7e9ce5ceaa

Change-Id: Ic5f9b2cd6e099cc350b07ba81cdd96700cfd9077

8 years agoMerge \\\"docs: Fixed typo.\\\" into mnc-io-docs am: 71f742920d am: 01f12a9e18
sreevanis [Thu, 21 Jul 2016 20:43:02 +0000 (20:43 +0000)]
Merge \\\"docs: Fixed typo.\\\" into mnc-io-docs am: 71f742920d am: 01f12a9e18
am: daaa7b7e5b

Change-Id: I4d8a02a6e09e967733f1d0ec36a23f4a73ce40f2

8 years agoMerge "Merge \\"docs: Fixed typo.\\" into mnc-io-docs am: 71f742920d am: 9b911b8736...
Android Build Merger (Role) [Thu, 21 Jul 2016 20:39:26 +0000 (20:39 +0000)]
Merge "Merge \\"docs: Fixed typo.\\" into mnc-io-docs am: 71f742920d am: 9b911b8736" into nyc-dev

8 years agoMerge \\"docs: Fixed typo.\\" into mnc-io-docs am: 71f742920d
Sreevani Sreejith [Thu, 21 Jul 2016 20:38:53 +0000 (20:38 +0000)]
Merge \\"docs: Fixed typo.\\" into mnc-io-docs am: 71f742920d
am: 9b911b8736

Change-Id: If294d38647849c51c2ba46b041417346a410c533

8 years agoMerge \\"docs: Fixed typo.\\" into mnc-io-docs am: 71f742920d
Sreevani Sreejith [Thu, 21 Jul 2016 20:38:48 +0000 (20:38 +0000)]
Merge \\"docs: Fixed typo.\\" into mnc-io-docs am: 71f742920d
am: 01f12a9e18

Change-Id: I3c72f75050a4426d4e67fd6a73b7d0f3bc8eff71

8 years agoMerge \"docs: Fixed typo.\" into mnc-io-docs
sreevanis [Thu, 21 Jul 2016 20:32:55 +0000 (20:32 +0000)]
Merge \"docs: Fixed typo.\" into mnc-io-docs
am: 71f742920d

Change-Id: Ia489afb465582c6600d35ffed5826816b4043746

8 years agoMerge \"docs: Fixed typo.\" into mnc-io-docs
sreevanis [Thu, 21 Jul 2016 20:32:51 +0000 (20:32 +0000)]
Merge \"docs: Fixed typo.\" into mnc-io-docs
am: 71f742920d

Change-Id: Ife230ca465a93b9cad9367d302fe402e574f3175

8 years agoMerge "docs: Fixed typo." into mnc-io-docs
Sreevani Sreejith [Thu, 21 Jul 2016 20:24:50 +0000 (20:24 +0000)]
Merge "docs: Fixed typo." into mnc-io-docs

8 years agoresolve merge conflicts of ed6625d to stage-aosp-master
David Gross [Thu, 21 Jul 2016 18:43:15 +0000 (11:43 -0700)]
resolve merge conflicts of ed6625d to stage-aosp-master

Change-Id: Icae5872d5e220ac18a35e338f10b194c286855a8

8 years agoMerge \"Adding projec.yaml files to all top/sub categories.\" into nyc-dev
Amanda Kassay [Thu, 21 Jul 2016 17:09:39 +0000 (17:09 +0000)]
Merge \"Adding projec.yaml files to all top/sub categories.\" into nyc-dev
am: 5a76378471

Change-Id: Ib4e0a75117044599c72de287039c60f0391788c2

8 years agoMerge "Adding projec.yaml files to all top/sub categories." into nyc-dev
Amanda Kassay [Thu, 21 Jul 2016 17:02:12 +0000 (17:02 +0000)]
Merge "Adding projec.yaml files to all top/sub categories." into nyc-dev

8 years agoMerge "Update RenderScript docs: reduction, other API 23/24 changes, cleanup."
David Gross [Thu, 21 Jul 2016 16:15:37 +0000 (16:15 +0000)]
Merge "Update RenderScript docs: reduction, other API 23/24 changes, cleanup."

8 years agoMerge \\\\\"DO NOT MERGE Block the user from entering safe boot mode\\\\\" into mnc...
Benjamin Franz [Thu, 21 Jul 2016 15:39:58 +0000 (15:39 +0000)]
Merge \\\\\"DO NOT MERGE Block the user from entering safe boot mode\\\\\" into mnc-dev am: 3e582390b3 am: 7abd7ba093 am: 87534f4ac9 am: cb805b35f3  -s ours
am: 662e2a7975

Change-Id: I453d98b170f1383ad41f5e73b8f0818240f4778d

8 years agoMerge \"docs: work - Managed configuration bundles am: ef57498142 am: ba633fc919...
Billy Lamberta [Thu, 21 Jul 2016 15:39:55 +0000 (15:39 +0000)]
Merge \"docs: work - Managed configuration bundles am: ef57498142 am: ba633fc919\" into nyc-dev
am: 7dbcfcadd5

Change-Id: Id738efd3e5b66db417b45231defc240a144744b7

8 years agodocs: work - Managed configuration bundles am: ef57498142 am: 9684f2cd2f
Billy Lamberta [Thu, 21 Jul 2016 15:39:52 +0000 (15:39 +0000)]
docs: work - Managed configuration bundles am: ef57498142 am: 9684f2cd2f
am: c7cffa3e6a

Change-Id: Ifa84e7599721abebb5093f5e932166737278ccfc

8 years agoFix for b/30088807 Dashboard page repeating charts three times on mobile. Staged...
Amanda Kassay [Thu, 21 Jul 2016 15:39:48 +0000 (15:39 +0000)]
Fix for b/30088807 Dashboard page repeating charts three times on mobile. Staged: https://android-dot-devsite.googleplex.com/about/dashboards/index.html am: 83fb75ded3
am: e9d58227bb

Change-Id: I29289c7aaaf34fb2889c8438f754b050b2dc2aec

8 years agoMerge \\\\"DO NOT MERGE Block the user from entering safe boot mode\\\\" into mnc...
Benjamin Franz [Thu, 21 Jul 2016 15:27:28 +0000 (15:27 +0000)]
Merge \\\\"DO NOT MERGE Block the user from entering safe boot mode\\\\" into mnc-dev am: 3e582390b3 am: 7abd7ba093 am: 87534f4ac9
am: cb805b35f3  -s ours

Change-Id: Icbc3d0dbcce8e079a895f194c13a5fa35957bc09

8 years agoMerge "docs: work - Managed configuration bundles am: ef57498142 am: ba633fc919"...
Android Build Merger (Role) [Thu, 21 Jul 2016 15:22:31 +0000 (15:22 +0000)]
Merge "docs: work - Managed configuration bundles am: ef57498142 am: ba633fc919" into nyc-dev

8 years agoMerge \"docs: fixed \'@\' signs that were escaped improperly\" into nyc-dev
Mark Lu [Thu, 21 Jul 2016 15:22:14 +0000 (15:22 +0000)]
Merge \"docs: fixed \'@\' signs that were escaped improperly\" into nyc-dev
am: a7ce29962c

Change-Id: I7444f59361841b6e6051c8976869633eb1c0219a

8 years agodocs: work - Managed configuration bundles am: ef57498142
Billy Lamberta [Thu, 21 Jul 2016 15:21:58 +0000 (15:21 +0000)]
docs: work - Managed configuration bundles am: ef57498142
am: ba633fc919

Change-Id: I819bc7a7568f4ea753b053338c7f73f64e80ec0e

8 years agodocs: work - Managed configuration bundles am: ef57498142
Billy Lamberta [Thu, 21 Jul 2016 15:21:52 +0000 (15:21 +0000)]
docs: work - Managed configuration bundles am: ef57498142
am: 9684f2cd2f

Change-Id: Idaeea63ba30ecb86a4f60955bb4937357ba4fd1b

8 years agoFix for b/30088807 Dashboard page repeating charts three times on mobile. Staged...
Amanda Kassay [Thu, 21 Jul 2016 15:21:50 +0000 (15:21 +0000)]
Fix for b/30088807 Dashboard page repeating charts three times on mobile. Staged: https://android-dot-devsite.googleplex.com/about/dashboards/index.html
am: 83fb75ded3

Change-Id: Ib5e4d45692c54beb3b4fafe89ebc0a5c19400359

8 years agoMerge \\\"DO NOT MERGE Block the user from entering safe boot mode\\\" into mnc-dev...
Benjamin Franz [Thu, 21 Jul 2016 10:14:59 +0000 (10:14 +0000)]
Merge \\\"DO NOT MERGE Block the user from entering safe boot mode\\\" into mnc-dev am: 3e582390b3 am: 7abd7ba093
am: 87534f4ac9

Change-Id: I05e37f474e496b41c39b7a160418d9f48a265fa3

8 years agoMerge \\"DO NOT MERGE Block the user from entering safe boot mode\\" into mnc-dev...
Benjamin Franz [Thu, 21 Jul 2016 10:10:03 +0000 (10:10 +0000)]
Merge \\"DO NOT MERGE Block the user from entering safe boot mode\\" into mnc-dev am: 3e582390b3
am: 7abd7ba093

Change-Id: I8dd5c0934f135cd567ae6bf2f4edf759ed757dfe

8 years agoMerge \"DO NOT MERGE Block the user from entering safe boot mode\" into mnc-dev
Benjamin Franz [Thu, 21 Jul 2016 10:05:33 +0000 (10:05 +0000)]
Merge \"DO NOT MERGE Block the user from entering safe boot mode\" into mnc-dev
am: 3e582390b3

Change-Id: Ibb90e151746d405e1cc8a1eb889ffa91aca35bc8

8 years agoMerge "DO NOT MERGE Block the user from entering safe boot mode" into mnc-dev
Benjamin Franz [Thu, 21 Jul 2016 09:59:41 +0000 (09:59 +0000)]
Merge "DO NOT MERGE Block the user from entering safe boot mode" into mnc-dev

8 years agoUpdate RenderScript docs: reduction, other API 23/24 changes, cleanup.
David Gross [Wed, 20 Jul 2016 23:04:35 +0000 (16:04 -0700)]
Update RenderScript docs: reduction, other API 23/24 changes, cleanup.

Substantive changes:
- Add discussion of reduction kernels.
- Use RS_KERNEL in place of __attribute__((kernel)).
- Discuss "context" special argument.
- Special arguments x, y, z may be of type int.
- Discuss multiple inputs for mapping kernels.
- Mention that script-side global writes are not visible in Java.
- Rewrite part of discussion regarding when to use support library.
- Change minimum device version for support library from Android 2.2 (API level 8)
  to Android 2.3 (API level 9).

Stylistic changes (better conformance with style guide):
- Proper use of <i> (italic) versus <em> (emphasis).
- Proper case for headings.
- Proper pattern for Android version numbers.
- Do not use e.g. or i.e.
- Prefer active rather than passive voice.
- Prefer present rather than future tense.

Miscellaneous minor editorial changes.

Bug: 27299393
Bug: 30000147

Change-Id: Ie0a26152714cf8f619d4914218f7262d675bb25f

8 years agodocs: work - Managed configuration bundles
Billy Lamberta [Wed, 20 Jul 2016 22:15:57 +0000 (22:15 +0000)]
docs: work - Managed configuration bundles
am: ef57498142

Change-Id: I6186c90e5d7125d678db5c876dc47697e14e60d7

8 years agodocs: work - Managed configuration bundles
Billy Lamberta [Wed, 20 Jul 2016 22:15:39 +0000 (22:15 +0000)]
docs: work - Managed configuration bundles
am: ef57498142

Change-Id: I8a874ca63bf3cbfa7c4abc3061f3cb8e19cd7486

8 years agodocs: work - Managed configuration bundles
Billy Lamberta [Mon, 11 Jul 2016 20:13:56 +0000 (13:13 -0700)]
docs: work - Managed configuration bundles

Update 'Set up Managed Configurations' guide to include
examples for restriction bundles and bundle_arrays.
Include table for restriction entry types and usage.
Link to EMM doc for building DPC. Formatting.

bug: 26151150
bug: 29966701
Change-Id: I89f732709fadd511b968515ab16f07dd46195f0e

8 years agoMerge \\"Remove dependency on android_alarm.h.\\" am: c95e7a3014
Christopher Ferris [Wed, 20 Jul 2016 18:18:17 +0000 (18:18 +0000)]
Merge \\"Remove dependency on android_alarm.h.\\" am: c95e7a3014
am: 8f7223e420

Change-Id: I7fd6c49a94b557772f3f2d9d2f751ef2fd42eee8

8 years agoFix for b/30088807 Dashboard page repeating charts three times on mobile.
Amanda Kassay [Wed, 20 Jul 2016 18:11:24 +0000 (14:11 -0400)]
Fix for b/30088807 Dashboard page repeating charts three times on mobile.
Staged: https://android-dot-devsite.googleplex.com/about/dashboards/index.html

Change-Id: Iff6820353ff6fb3ec678ddfe209b2200ab872812

8 years agoMerge \"Remove dependency on android_alarm.h.\"
Christopher Ferris [Wed, 20 Jul 2016 18:10:47 +0000 (18:10 +0000)]
Merge \"Remove dependency on android_alarm.h.\"
am: c95e7a3014

Change-Id: I19908fa29772c89b8112e371702da6197b20465d

8 years agoMerge "Remove dependency on android_alarm.h."
Christopher Ferris [Wed, 20 Jul 2016 18:03:47 +0000 (18:03 +0000)]
Merge "Remove dependency on android_alarm.h."

8 years agoMerge "docs: fixed '@' signs that were escaped improperly" into nyc-dev
Mark Lu [Wed, 20 Jul 2016 16:48:24 +0000 (16:48 +0000)]
Merge "docs: fixed '@' signs that were escaped improperly" into nyc-dev

8 years agoMerge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am:...
Paul Stewart [Wed, 20 Jul 2016 03:23:13 +0000 (03:23 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am: 58555ee891 am: 2e85e2ef26 am: c92e93c47b am: bb7439d8a1 am: 0f9a968c0e am: 1e9889d5ac am: a09b6ee165 am: 2331eefef7 am: a20314a28e
am: a71fe00594

Change-Id: I93d600fe926037601f367697dd6f30f3ddca5e69

8 years agoFix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f0...
Paul Stewart [Wed, 20 Jul 2016 03:23:10 +0000 (03:23 +0000)]
Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f010a5b am: 700c72d01d am: 5d60d2f772 am: 6245774994 am: f8d4c187a3 am: b3ff6b4437 am: 537535c14a am: 6b05e285cc
am: 47e801972c

Change-Id: Ib1ffaf10f47884fe64660ad5266d0057affe920c

8 years agoWifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646...
Paul Stewart [Wed, 20 Jul 2016 03:23:05 +0000 (03:23 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 am: df93deccf9 am: 141477b103 am: e2a03026c4 am: e41e0064ee am: 701a6c1ed6 am: d78a14531e am: c77f18b2a3 am: eef477c8b9 am: cf3595400b  -s ours
am: d77404a0e5

Change-Id: Ic7d1e557c9b1c0eb2d3cd18c1c7b8055638d1c3e

8 years agoMerge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am:...
Paul Stewart [Wed, 20 Jul 2016 03:17:07 +0000 (03:17 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am: 58555ee891 am: 2e85e2ef26 am: c92e93c47b am: bb7439d8a1 am: 0f9a968c0e am: 1e9889d5ac am: a09b6ee165 am: 2331eefef7
am: a20314a28e

Change-Id: I54f5b652c5c5bc148a8058cea665aab5327c61ab

8 years agoFix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f0...
Paul Stewart [Wed, 20 Jul 2016 03:17:01 +0000 (03:17 +0000)]
Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f010a5b am: 700c72d01d am: 5d60d2f772 am: 6245774994 am: f8d4c187a3 am: b3ff6b4437 am: 537535c14a
am: 6b05e285cc

Change-Id: I85e36294bd68be5da928d96dd7d9742f7fba53d3

8 years agoWifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646...
Paul Stewart [Wed, 20 Jul 2016 03:16:50 +0000 (03:16 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 am: df93deccf9 am: 141477b103 am: e2a03026c4 am: e41e0064ee am: 701a6c1ed6 am: d78a14531e am: c77f18b2a3 am: eef477c8b9
am: cf3595400b  -s ours

Change-Id: I983c0d096671d522f3eed3eb3deacff300b50bb9

8 years agoMerge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am:...
Paul Stewart [Wed, 20 Jul 2016 01:35:14 +0000 (01:35 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am: 58555ee891 am: 2e85e2ef26 am: c92e93c47b am: bb7439d8a1 am: 0f9a968c0e am: 1e9889d5ac am: a09b6ee165
am: 2331eefef7

Change-Id: Ia0cccdca5f4e44ad4caf75240240eec73757e22b

8 years agoFix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f0...
Paul Stewart [Wed, 20 Jul 2016 01:35:10 +0000 (01:35 +0000)]
Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f010a5b am: 700c72d01d am: 5d60d2f772 am: 6245774994 am: f8d4c187a3 am: b3ff6b4437
am: 537535c14a

Change-Id: I0f9c27f32518f9c7bb1d3735741843178fc1dc02

8 years agoMerge \\\\\"docs: Updated descriptions of device orientation angles.\\\\\" into mnc...
Kevin Hufnagle [Wed, 20 Jul 2016 01:29:00 +0000 (01:29 +0000)]
Merge \\\\\"docs: Updated descriptions of device orientation angles.\\\\\" into mnc-docs am: d312201b74 am: 6b4d2a2e6d am: a812012c52 am: b9487874fe
am: 55b52a2b3f

Change-Id: Ib14b352efe5f10043b092e234a2b92f2c2aa2bc2

8 years agoMerge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am:...
Paul Stewart [Wed, 20 Jul 2016 01:28:54 +0000 (01:28 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am: 58555ee891 am: 2e85e2ef26 am: c92e93c47b am: bb7439d8a1 am: 0f9a968c0e am: 1e9889d5ac
am: a09b6ee165

Change-Id: I63a60f729f95f273bf1918689626ac83771c73ac

8 years agoFix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f0...
Paul Stewart [Wed, 20 Jul 2016 01:28:52 +0000 (01:28 +0000)]
Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f010a5b am: 700c72d01d am: 5d60d2f772 am: 6245774994 am: f8d4c187a3
am: b3ff6b4437

Change-Id: I51e07e2ab6b3bee89dada0b6bf1ce1bf52f78d2f

8 years agoWifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646...
Paul Stewart [Wed, 20 Jul 2016 01:28:32 +0000 (01:28 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 am: df93deccf9 am: 141477b103 am: e2a03026c4 am: e41e0064ee am: 701a6c1ed6 am: d78a14531e am: c77f18b2a3
am: eef477c8b9

Change-Id: I38649e47184a6b34a923037922fb6743f14fb6e1

8 years agoMerge \\\\"docs: Updated descriptions of device orientation angles.\\\\" into mnc...
Kevin Hufnagle [Wed, 20 Jul 2016 01:20:20 +0000 (01:20 +0000)]
Merge \\\\"docs: Updated descriptions of device orientation angles.\\\\" into mnc-docs am: d312201b74 am: 6b4d2a2e6d am: a812012c52
am: b9487874fe

Change-Id: I034ce5c4a115fa4b694569c66a7e764543191cf7

8 years agoWifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646...
Paul Stewart [Wed, 20 Jul 2016 01:20:08 +0000 (01:20 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 am: df93deccf9 am: 141477b103 am: e2a03026c4 am: e41e0064ee am: 701a6c1ed6 am: d78a14531e
am: c77f18b2a3

Change-Id: Id93c8ac53a78931c8fdba21b7c168e38a7ad7fe4

8 years agoMerge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am:...
Paul Stewart [Wed, 20 Jul 2016 01:19:50 +0000 (01:19 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am: 58555ee891 am: 2e85e2ef26 am: c92e93c47b am: bb7439d8a1 am: 0f9a968c0e
am: 1e9889d5ac

Change-Id: Ie0bfc4653bfe90335952110b38be2eeee418f98f

8 years agoFix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f0...
Paul Stewart [Wed, 20 Jul 2016 01:19:46 +0000 (01:19 +0000)]
Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f010a5b am: 700c72d01d am: 5d60d2f772 am: 6245774994
am: f8d4c187a3

Change-Id: If6d30364da0246233415bc15a1dda7c297f7bf6b

8 years agoMerge \\\"docs: Updated descriptions of device orientation angles.\\\" into mnc-docs...
Kevin Hufnagle [Wed, 20 Jul 2016 01:12:40 +0000 (01:12 +0000)]
Merge \\\"docs: Updated descriptions of device orientation angles.\\\" into mnc-docs am: d312201b74 am: 6b4d2a2e6d
am: a812012c52

Change-Id: Ifff8f0ca783a601dab3b4968a0e9708e34aa83f4

8 years agoMerge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am:...
Paul Stewart [Wed, 20 Jul 2016 01:12:15 +0000 (01:12 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am: 58555ee891 am: 2e85e2ef26 am: c92e93c47b am: bb7439d8a1
am: 0f9a968c0e

Change-Id: I5ef9b70287cd8b0beaa169f194e7011b8c354454

8 years agoFix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f0...
Paul Stewart [Wed, 20 Jul 2016 01:12:11 +0000 (01:12 +0000)]
Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f010a5b am: 700c72d01d am: 5d60d2f772
am: 6245774994

Change-Id: Ib82209c5c6b71f3c47feaa17c346f853288b0131

8 years agoWifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646...
Paul Stewart [Wed, 20 Jul 2016 01:11:49 +0000 (01:11 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 am: df93deccf9 am: 141477b103 am: e2a03026c4 am: e41e0064ee am: 701a6c1ed6
am: d78a14531e

Change-Id: Id37927594f47a5a32b05b15c8e09df0fa4ea9569

8 years agoMerge \\"docs: Updated descriptions of device orientation angles.\\" into mnc-docs...
Kevin Hufnagle [Wed, 20 Jul 2016 01:02:28 +0000 (01:02 +0000)]
Merge \\"docs: Updated descriptions of device orientation angles.\\" into mnc-docs am: d312201b74
am: 6b4d2a2e6d

Change-Id: Idffebefeb70955553bf7539e1e225935cf57e82c

8 years agoWifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646...
Paul Stewart [Wed, 20 Jul 2016 01:01:15 +0000 (01:01 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 am: df93deccf9 am: 141477b103 am: e2a03026c4 am: e41e0064ee
am: 701a6c1ed6

Change-Id: I34acfe2e2ab1da2615f5a7107a9879e7491b0857

8 years agoMerge \"docs: Updated descriptions of device orientation angles.\" into mnc-docs
Kevin Hufnagle [Wed, 20 Jul 2016 00:56:28 +0000 (00:56 +0000)]
Merge \"docs: Updated descriptions of device orientation angles.\" into mnc-docs
am: d312201b74

Change-Id: Idfe0c0ec38bd33d64f5b8be602d24aec778fac09

8 years agoMerge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am:...
Paul Stewart [Wed, 20 Jul 2016 00:54:33 +0000 (00:54 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am: 58555ee891 am: 2e85e2ef26 am: c92e93c47b
am: bb7439d8a1

Change-Id: I0aa11cbba826189e7e5e4e9196654c4f43157de0