OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Tue, 12 Jul 2016 16:11:11 +0000 (16:11 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "docs: July 2016 Dashboard update" into nyc-dev
Joe Fernandez [Tue, 12 Jul 2016 16:09:53 +0000 (16:09 +0000)]
Merge "docs: July 2016 Dashboard update" into nyc-dev

8 years agodocs: July 2016 Dashboard update
Joe Fernandez [Tue, 12 Jul 2016 16:06:29 +0000 (09:06 -0700)]
docs: July 2016 Dashboard update

Change-Id: Ia2c6488340e7d17696ffe67ba120cb30bea94717

8 years agoMerge "App launch - Test app changes" into nyc-dev
Gopinath Elanchezhian [Tue, 12 Jul 2016 16:02:42 +0000 (16:02 +0000)]
Merge "App launch - Test app changes" into nyc-dev

8 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 12 Jul 2016 06:21:45 +0000 (23:21 -0700)]
Import translations. DO NOT MERGE

Change-Id: I336a5cd0babcb768a62375cb8d63afa7a7d9532c
Auto-generated-cl: translation import

8 years agoMerge \\"Docs: Release Notes for Dev Preview 2\\" into mnc-io-docs am: b039c753f3
Bert McMeen [Tue, 12 Jul 2016 00:50:19 +0000 (00:50 +0000)]
Merge \\"Docs: Release Notes for Dev Preview 2\\" into mnc-io-docs am: b039c753f3
am: 40df51ce20

Change-Id: I2d698e096a81093a8471dcd3dcf1994986c29a97

8 years agoMerge \"Docs: Release Notes for Dev Preview 2\" into mnc-io-docs
Bert McMeen [Tue, 12 Jul 2016 00:45:11 +0000 (00:45 +0000)]
Merge \"Docs: Release Notes for Dev Preview 2\" into mnc-io-docs
am: b039c753f3

Change-Id: I39f6735f53186f6cb03036a3c7731ca06449acf1

8 years agoMerge "Docs: Release Notes for Dev Preview 2" into mnc-io-docs
Bert McMeen [Tue, 12 Jul 2016 00:35:07 +0000 (00:35 +0000)]
Merge "Docs: Release Notes for Dev Preview 2" into mnc-io-docs

8 years agoMerge \\"Docs: Information on OTA updates\\" into mnc-io-docs am: 2f297621a1
Bert McMeen [Tue, 12 Jul 2016 00:24:17 +0000 (00:24 +0000)]
Merge \\"Docs: Information on OTA updates\\" into mnc-io-docs am: 2f297621a1
am: 1dee5f4dbe

Change-Id: Ie1685c1393e740fb7d44ef8dbb714ed408eb4319

8 years agoDocs: Release Notes for Dev Preview 2
Bert McMeen [Fri, 24 Jun 2016 21:55:12 +0000 (14:55 -0700)]
Docs: Release Notes for Dev Preview 2

Bug: 29419006
Change-Id: I24f9aa03db1150ab303fa222009f888e0e4cb01d

8 years agoMerge \"Docs: Information on OTA updates\" into mnc-io-docs
Bert McMeen [Tue, 12 Jul 2016 00:18:48 +0000 (00:18 +0000)]
Merge \"Docs: Information on OTA updates\" into mnc-io-docs
am: 2f297621a1

Change-Id: I766877a188e5878001da9ffe91d2f09f49e8f3ee

8 years agoMerge "Docs: Information on OTA updates" into mnc-io-docs
Bert McMeen [Tue, 12 Jul 2016 00:14:47 +0000 (00:14 +0000)]
Merge "Docs: Information on OTA updates" into mnc-io-docs

8 years agoDocs: Information on OTA updates
Bert McMeen [Wed, 22 Jun 2016 00:01:31 +0000 (17:01 -0700)]
Docs: Information on OTA updates

Bug: 29545156
Change-Id: I557205fe9c1990d0dbfc020e20f610dae80bbcc5

8 years agoMerge \\"Docs: Changed Blank Activity to Basic Activity\\" into mnc-io-docs am: 93dd9...
Hemal Patel [Mon, 11 Jul 2016 23:32:21 +0000 (23:32 +0000)]
Merge \\"Docs: Changed Blank Activity to Basic Activity\\" into mnc-io-docs am: 93dd99c6aa
am: 92c664b13d

Change-Id: I52034f812994545893e6e4e8a9de9de79f593bb2

8 years agoMerge \\"Docs: Replaced fill_parent with match_parent\\" into mnc-io-docs am: 1b72b7955d
Hemal Patel [Mon, 11 Jul 2016 23:26:09 +0000 (23:26 +0000)]
Merge \\"Docs: Replaced fill_parent with match_parent\\" into mnc-io-docs am: 1b72b7955d
am: 202bfb4fc7

Change-Id: Ie5faab93a9c417f6191bb0855dd3ad9326f0c955

8 years agoMerge \"Docs: Changed Blank Activity to Basic Activity\" into mnc-io-docs
Hemal Patel [Mon, 11 Jul 2016 23:25:59 +0000 (23:25 +0000)]
Merge \"Docs: Changed Blank Activity to Basic Activity\" into mnc-io-docs
am: 93dd99c6aa

Change-Id: I28de4c355c23d96ab52a945bfd26567063f25212

8 years agoMerge "Docs: Changed Blank Activity to Basic Activity" into mnc-io-docs
Hemal Patel [Mon, 11 Jul 2016 23:22:47 +0000 (23:22 +0000)]
Merge "Docs: Changed Blank Activity to Basic Activity" into mnc-io-docs

8 years agoMerge \"Docs: Replaced fill_parent with match_parent\" into mnc-io-docs
Hemal Patel [Mon, 11 Jul 2016 23:21:01 +0000 (23:21 +0000)]
Merge \"Docs: Replaced fill_parent with match_parent\" into mnc-io-docs
am: 1b72b7955d

Change-Id: I8fec574e1501e84f69d9e53b02b0a7537bd3dc16

8 years agoMerge "Fix docs for DragEvent" into nyc-dev
TreeHugger Robot [Mon, 11 Jul 2016 23:17:40 +0000 (23:17 +0000)]
Merge "Fix docs for DragEvent" into nyc-dev

8 years agoMerge "Docs: Replaced fill_parent with match_parent" into mnc-io-docs
Hemal Patel [Mon, 11 Jul 2016 23:16:51 +0000 (23:16 +0000)]
Merge "Docs: Replaced fill_parent with match_parent" into mnc-io-docs

8 years agoDocs: Replaced fill_parent with match_parent
Hemal Patel [Fri, 24 Jun 2016 00:11:15 +0000 (17:11 -0700)]
Docs: Replaced fill_parent with match_parent

The value fill_parent is deprecated in API Level 8 and replaced
with match_parent.

Bug: 19432266
Change-Id: Ie91b4de25f1b12ec93c52531785303d683b18d24

8 years agoDocs: Changed Blank Activity to Basic Activity
Hemal Patel [Fri, 1 Jul 2016 20:33:14 +0000 (13:33 -0700)]
Docs: Changed Blank Activity to Basic Activity

As per Android Studio's latest version, Blank Activity is renamed to
Basic Activity. Hence, fixed step 6 to reflect the change.

Bug: 28177899
Change-Id: I824d60f936975645cd9116e8443771b68e132af9

8 years agoMerge \\"docs: Fixing badly formatted {@code} strings\\" into mnc-io-docs am: 78125ff7cb
Andrew Solovay [Mon, 11 Jul 2016 21:58:47 +0000 (21:58 +0000)]
Merge \\"docs: Fixing badly formatted {@code} strings\\" into mnc-io-docs am: 78125ff7cb
am: 28528e3c62

Change-Id: Ie9a21623f1491983aab4cfc624818bb3b8720185

8 years agoMerge \"docs: Fixing badly formatted {@code} strings\" into mnc-io-docs
Andrew Solovay [Mon, 11 Jul 2016 21:48:06 +0000 (21:48 +0000)]
Merge \"docs: Fixing badly formatted {@code} strings\" into mnc-io-docs
am: 78125ff7cb

Change-Id: Id68f9e49225f59e8cb94bcd7ab3905790dc2d223

8 years agoMerge "docs: Fixing badly formatted {@code} strings" into mnc-io-docs
Andrew Solovay [Mon, 11 Jul 2016 21:40:26 +0000 (21:40 +0000)]
Merge "docs: Fixing badly formatted {@code} strings" into mnc-io-docs

8 years agoMerge \\"docs: Adding Android TV App Link docs\\" into mnc-io-docs am: e0b687048f
Dan Yu [Mon, 11 Jul 2016 21:20:57 +0000 (21:20 +0000)]
Merge \\"docs: Adding Android TV App Link docs\\" into mnc-io-docs am: e0b687048f
am: 68ef31fc36

Change-Id: I29f43f45d3412baf252af2b11d3cf4ec18025838

8 years agoMerge \"docs: Adding Android TV App Link docs\" into mnc-io-docs
Daniel Yu [Mon, 11 Jul 2016 21:16:07 +0000 (21:16 +0000)]
Merge \"docs: Adding Android TV App Link docs\" into mnc-io-docs
am: e0b687048f

Change-Id: If4741e27d7e6c37af8382012d8c596a077aae5f5

8 years agoMerge \\"Docs: Gestures docs\\" into mnc-io-docs am: b7b9aa1a51
Bert McMeen [Mon, 11 Jul 2016 21:15:05 +0000 (21:15 +0000)]
Merge \\"Docs: Gestures docs\\" into mnc-io-docs am: b7b9aa1a51
am: 1639959f3b

Change-Id: I2e0bd8898404178d11986795e0d402875d03c5bf

8 years agoMerge \\"docs: Updated Create custom drawer view section with new xml attributes...
Bert McMeen [Mon, 11 Jul 2016 21:15:02 +0000 (21:15 +0000)]
Merge \\"docs: Updated Create custom drawer view section with new xml attributes.\\" into mnc-io-docs am: 9f1952a77b
am: ced99e1199

Change-Id: Ieba52265148d0f453757aded27118cd8a9dd5c34

8 years agoMerge "docs: Adding Android TV App Link docs" into mnc-io-docs
Dan Yu [Mon, 11 Jul 2016 21:11:03 +0000 (21:11 +0000)]
Merge "docs: Adding Android TV App Link docs" into mnc-io-docs

8 years agoMerge \"Docs: Gestures docs\" into mnc-io-docs
Bert McMeen [Mon, 11 Jul 2016 21:07:39 +0000 (21:07 +0000)]
Merge \"Docs: Gestures docs\" into mnc-io-docs
am: b7b9aa1a51

Change-Id: Ic509201ae767b921ed523123ab3cd4ab3aa338ee

8 years agoMerge \"docs: Updated Create custom drawer view section with new xml attributes....
sreevanis [Mon, 11 Jul 2016 21:07:37 +0000 (21:07 +0000)]
Merge \"docs: Updated Create custom drawer view section with new xml attributes.\" into mnc-io-docs
am: 9f1952a77b

Change-Id: Ied1d1112ef47428795113ed86d1ed9b1bf5b30d0

8 years agoMerge "Docs: Gestures docs" into mnc-io-docs
Bert McMeen [Mon, 11 Jul 2016 21:01:42 +0000 (21:01 +0000)]
Merge "Docs: Gestures docs" into mnc-io-docs

8 years agoMerge "docs: Updated Create custom drawer view section with new xml attributes."...
Bert McMeen [Mon, 11 Jul 2016 20:59:03 +0000 (20:59 +0000)]
Merge "docs: Updated Create custom drawer view section with new xml attributes." into mnc-io-docs

8 years agoFix docs for DragEvent
Vladislav Kaznacheev [Mon, 11 Jul 2016 20:52:22 +0000 (13:52 -0700)]
Fix docs for DragEvent

Document that getClipDescription() and getLocaState() do not return valid data
when getAction() == DragEvent.ACTION_DRAG_ENDED.

Bug: 30016099
Change-Id: Id98fe8c5d6f052fc51c8c9e8d55329e162bd96b1

8 years agoMerge "docs: fixed broken link in UsbManager javadocs" into nyc-dev
Mark Lu [Mon, 11 Jul 2016 20:13:46 +0000 (20:13 +0000)]
Merge "docs: fixed broken link in UsbManager javadocs" into nyc-dev

8 years agoMerge "docs: Fixed logic for determining image sample size" into nyc-dev
Mark Lu [Mon, 11 Jul 2016 20:13:34 +0000 (20:13 +0000)]
Merge "docs: Fixed logic for determining image sample size" into nyc-dev

8 years agoMerge "docs: fix syntax error in "Saving Files" document" into nyc-dev
Mark Lu [Mon, 11 Jul 2016 20:13:02 +0000 (20:13 +0000)]
Merge "docs: fix syntax error in "Saving Files" document" into nyc-dev

8 years agoMerge "docs: Updated link to UI Automator reference in "Testing UI" doc" into nyc-dev
Mark Lu [Mon, 11 Jul 2016 20:12:59 +0000 (20:12 +0000)]
Merge "docs: Updated link to UI Automator reference in "Testing UI" doc" into nyc-dev

8 years agoMerge "docs: remove out-of-date performance info" into nyc-dev
Mark Lu [Mon, 11 Jul 2016 20:12:32 +0000 (20:12 +0000)]
Merge "docs: remove out-of-date performance info" into nyc-dev

8 years agodocs: Adding Android TV App Link docs
Daniel Yu [Tue, 28 Jun 2016 16:54:43 +0000 (09:54 -0700)]
docs: Adding Android TV App Link docs

Adding docs for app links for ATV channel apps in
updated Channel Data topic. Adding screenshots and
diagram of app link card.

Bug: 23574268
Change-Id: I00ae953e1ec44352eaedb070c8ffd9bd02b13d7d

8 years agoMerge \\"docs: work - fix app restriction string values\\" into mnc-io-docs am: de37b...
Billy Lamberta [Mon, 11 Jul 2016 19:43:56 +0000 (19:43 +0000)]
Merge \\"docs: work - fix app restriction string values\\" into mnc-io-docs am: de37b1b270
am: 4b353b2a78

Change-Id: I003422f613a5fe459c1ddf8f9453663f3145a8db

8 years agodocs: Fixing badly formatted {@code} strings
Andrew Solovay [Mon, 11 Jul 2016 18:46:18 +0000 (11:46 -0700)]
docs: Fixing badly formatted {@code} strings

{@code} blocks in .jd files automatically escape special characters
(like <>&) in the contents, which is bad if the contents were
*already* escaped--it turns (e.g.) "&lt; foo &gt;"" into
"&amp;lt; foo &amp;gt;". Fixing it where I find it, by replacing
{@code} tags with old-fashioned <code></code>.

See first comment for doc stage location.

bug: 30038013
Change-Id: Ic502096dc69fb7b43f58a34c3f92fd3a41f033f6

8 years agoMerge \"docs: work - fix app restriction string values\" into mnc-io-docs
Billy Lamberta [Mon, 11 Jul 2016 19:12:42 +0000 (19:12 +0000)]
Merge \"docs: work - fix app restriction string values\" into mnc-io-docs
am: de37b1b270

Change-Id: Ib99f87a7e4226462a936f87610e968562e3b0da6

8 years agoAdded new partner logos to Auto index page. am: 94b61a29f5
sreevanis [Mon, 11 Jul 2016 19:06:51 +0000 (19:06 +0000)]
Added new partner logos to Auto index page. am: 94b61a29f5
am: 9c513f47c8

Change-Id: I3b218a0b80fb426ac3d567e7c87a6186529c4986

8 years agoMerge "docs: work - fix app restriction string values" into mnc-io-docs
Billy Lamberta [Mon, 11 Jul 2016 18:21:25 +0000 (18:21 +0000)]
Merge "docs: work - fix app restriction string values" into mnc-io-docs

8 years agoAdded new partner logos to Auto index page.
sreevanis [Mon, 11 Jul 2016 18:18:48 +0000 (18:18 +0000)]
Added new partner logos to Auto index page.
am: 94b61a29f5

Change-Id: Ifc650de7ba4e5871b2fb7d38e9a7f4a0b2cc4e2c

8 years agoAdded new partner logos to Auto index page.
sreevanis [Thu, 26 May 2016 21:34:12 +0000 (14:34 -0700)]
Added new partner logos to Auto index page.

lincoln.png, renault.png, rsm.png, tata.png, mbenz.png, opel.png

Bug:28123362
Change-Id: I87c5a3fd5a614dbce79c889cf4e4e14e25e54dae

8 years agoMerge "Fix simple typo in System Permissions guide" into nyc-dev
Wonil Kim [Mon, 11 Jul 2016 00:20:44 +0000 (00:20 +0000)]
Merge "Fix simple typo in System Permissions guide" into nyc-dev

8 years agoDocs: Gestures docs
Bert McMeen [Fri, 8 Jul 2016 20:12:05 +0000 (13:12 -0700)]
Docs: Gestures docs

Bug: 22008636
Change-Id: I74626e262e9ddebadd4804047a4a2983d099f059

8 years agoMerge "More javadoc for audio recording activity API" into nyc-dev
Jean-Michel Trivi [Fri, 8 Jul 2016 19:36:32 +0000 (19:36 +0000)]
Merge "More javadoc for audio recording activity API" into nyc-dev

8 years agoApp launch - Test app changes
Gopinath [Fri, 27 May 2016 02:16:24 +0000 (19:16 -0700)]
App launch - Test app changes

1) Drop cache between app launches Bug 29564205
2) Trace capture while launching app Bug 26779882
3) Simple Perf while launching app Bug 29249860
4) Launch order which could be cyclic or sequential

Change-Id: I0c883e7feb7e07474b045835fd56a97d8a126552

8 years agoMerge "SoundPool: fix enforced camera shutter sound" into nyc-dev
Eric Laurent [Thu, 7 Jul 2016 20:36:59 +0000 (20:36 +0000)]
Merge "SoundPool: fix enforced camera shutter sound" into nyc-dev

8 years agoadd redirect for URL hard-coded into the default proguard config file,
smain@google.com [Thu, 7 Jul 2016 19:13:36 +0000 (12:13 -0700)]
add redirect for URL hard-coded into the default proguard config file,
and update related redirects for the entire /guide/developing/ path.

Change-Id: Ie23791e3765ff821d9abba220ebdde782d6439ed

8 years agoSoundPool: fix enforced camera shutter sound
Eric Laurent [Thu, 7 Jul 2016 18:35:13 +0000 (11:35 -0700)]
SoundPool: fix enforced camera shutter sound

Make sure that camera shutter sound is played in
total silence DND mode when enforced by country
regulation.

Bug: 29973005
Change-Id: I208f7ae5b07777eac48597f68feae6358999b2c3

8 years agoMerge \\"docs: Edited \\"Promote with Ads\\" page; created \\"Nearby\\" feature page...
Joe Fernandez [Thu, 7 Jul 2016 18:21:05 +0000 (18:21 +0000)]
Merge \\"docs: Edited \\"Promote with Ads\\" page; created \\"Nearby\\" feature page.\\" into mnc-io-docs am: 31302819c1
am: 5301f68827

Change-Id: Ic59d70a5ce5693ed0facdc07e37dd23a7cfae061

8 years agoMerge \\"docs: Updated \\"payments\\" page; created new \\"drive conversions\\" page...
Joe Fernandez [Thu, 7 Jul 2016 18:20:58 +0000 (18:20 +0000)]
Merge \\"docs: Updated \\"payments\\" page; created new \\"drive conversions\\" page.\\" into mnc-io-docs am: a021c2d3e6
am: 11935fbcc9

Change-Id: I44cac66629a2c642ab86331bdda1bb1943df56a0

8 years agoMerge \"docs: Edited \"Promote with Ads\" page; created \"Nearby\" feature page....
Kevin Hufnagle [Thu, 7 Jul 2016 18:14:09 +0000 (18:14 +0000)]
Merge \"docs: Edited \"Promote with Ads\" page; created \"Nearby\" feature page.\" into mnc-io-docs
am: 31302819c1

Change-Id: I971086d0b8bb3268fdd62f41567654857b92dba8

8 years agoMerge \"docs: Updated \"payments\" page; created new \"drive conversions\" page....
Kevin Hufnagle [Thu, 7 Jul 2016 18:14:06 +0000 (18:14 +0000)]
Merge \"docs: Updated \"payments\" page; created new \"drive conversions\" page.\" into mnc-io-docs
am: a021c2d3e6

Change-Id: Idaed3f61c560217b31cc8a0e81d7a7ed761ee977

8 years agoMerge "docs: Edited "Promote with Ads" page; created "Nearby" feature page." into...
Joe Fernandez [Thu, 7 Jul 2016 18:09:40 +0000 (18:09 +0000)]
Merge "docs: Edited "Promote with Ads" page; created "Nearby" feature page." into mnc-io-docs

8 years agoMerge "docs: Updated "payments" page; created new "drive conversions" page." into...
Joe Fernandez [Thu, 7 Jul 2016 18:06:34 +0000 (18:06 +0000)]
Merge "docs: Updated "payments" page; created new "drive conversions" page." into mnc-io-docs

8 years agodocs: work - fix app restriction string values
Billy Lamberta [Thu, 7 Jul 2016 17:54:30 +0000 (10:54 -0700)]
docs: work - fix app restriction string values

Change managed configurations to use strings reference in XML
instead of an explict string.

bug: 24509303
Change-Id: I9d14dfb00ce608e09b3a82a86474ff8cba0b86d2

8 years agoMerge \\"Docs: Fixed wrong return type of a method\\" into mnc-io-docs am: 13ce5dca58
Hemal Patel [Thu, 7 Jul 2016 16:15:48 +0000 (16:15 +0000)]
Merge \\"Docs: Fixed wrong return type of a method\\" into mnc-io-docs am: 13ce5dca58
am: e02e644b92

Change-Id: I9f872d3456381b437271ab949804ffbae0e6a5a2

8 years agoMerge \"Docs: Fixed wrong return type of a method\" into mnc-io-docs
Hemal Patel [Thu, 7 Jul 2016 16:07:59 +0000 (16:07 +0000)]
Merge \"Docs: Fixed wrong return type of a method\" into mnc-io-docs
am: 13ce5dca58

Change-Id: Iece5dfd7fcf3bd0113e3e5fb84a0eac7ad361ae0

8 years agoMerge "Docs: Fixed wrong return type of a method" into mnc-io-docs
Hemal Patel [Thu, 7 Jul 2016 15:57:01 +0000 (15:57 +0000)]
Merge "Docs: Fixed wrong return type of a method" into mnc-io-docs

8 years agoDO NOT MERGE revert system api loadSafeLabel am: 863ac471cf am: 92b8cbd472 am: b4849f...
fionaxu [Thu, 7 Jul 2016 01:55:16 +0000 (01:55 +0000)]
DO NOT MERGE revert system api loadSafeLabel am: 863ac471cf am: 92b8cbd472 am: b4849f8d74  -s ours am: d061c3abfa am: f6923d2993 am: 50904bedb5
am: aad33e6905  -s ours

Change-Id: I8de53f5fa9e45bb5b39eb9d2cd3901f49850e93f

8 years agoDO NOT MERGE revert system api loadSafeLabel am: 863ac471cf am: 92b8cbd472 am: b4849f...
fionaxu [Thu, 7 Jul 2016 01:47:45 +0000 (01:47 +0000)]
DO NOT MERGE revert system api loadSafeLabel am: 863ac471cf am: 92b8cbd472 am: b4849f8d74  -s ours am: d061c3abfa am: f6923d2993
am: 50904bedb5

Change-Id: I733cc2b3421780398a2a764748c9d9155c39327b

8 years agoDO NOT MERGE revert system api loadSafeLabel am: 863ac471cf am: 92b8cbd472 am: b4849f...
fionaxu [Thu, 7 Jul 2016 01:39:09 +0000 (01:39 +0000)]
DO NOT MERGE revert system api loadSafeLabel am: 863ac471cf am: 92b8cbd472 am: b4849f8d74  -s ours am: d061c3abfa
am: f6923d2993

Change-Id: If22f635f2e4cf0a3ce79ef6916abe3cb60c6b419

8 years agoDO NOT MERGE revert system api loadSafeLabel am: 863ac471cf am: 92b8cbd472 am: b4849f...
fionaxu [Thu, 7 Jul 2016 01:32:07 +0000 (01:32 +0000)]
DO NOT MERGE revert system api loadSafeLabel am: 863ac471cf am: 92b8cbd472 am: b4849f8d74  -s ours
am: d061c3abfa

Change-Id: Ia6af0a650e4fe0afdcf56ecee7473be2cdef7b32

8 years agoDO NOT MERGE revert system api loadSafeLabel am: 863ac471cf am: 92b8cbd472
fionaxu [Thu, 7 Jul 2016 01:20:29 +0000 (01:20 +0000)]
DO NOT MERGE revert system api loadSafeLabel am: 863ac471cf am: 92b8cbd472
am: b4849f8d74  -s ours

Change-Id: Id3089485c93309a4d1ee97e12aeda63c015f397a

8 years agoDO NOT MERGE revert system api loadSafeLabel am: 863ac471cf
fionaxu [Thu, 7 Jul 2016 01:13:47 +0000 (01:13 +0000)]
DO NOT MERGE revert system api loadSafeLabel am: 863ac471cf
am: 92b8cbd472

Change-Id: Ie23b6f96b4d624469f842c8822dc78f83c2d9714

8 years agoMore javadoc for audio recording activity API
Jean-Michel Trivi [Wed, 6 Jul 2016 21:34:52 +0000 (14:34 -0700)]
More javadoc for audio recording activity API

Better overview of feature inside AudioRecordingConfiguration
 class description.
Addition of @see links in AudioManager query and callback methods.

Bug 27929523

Change-Id: I9159ffd40d68f7c65f59570119821087643f9030

8 years agoDO NOT MERGE revert system api loadSafeLabel
fionaxu [Thu, 7 Jul 2016 01:07:43 +0000 (01:07 +0000)]
DO NOT MERGE revert system api loadSafeLabel
am: 863ac471cf

Change-Id: I9230b78b2e1ac29cfd76db00be0c31e690566ac7

8 years agoDO NOT MERGE revert system api loadSafeLabel
fionaxu [Thu, 30 Jun 2016 22:59:55 +0000 (15:59 -0700)]
DO NOT MERGE revert system api loadSafeLabel

Bug: 28557603
Change-Id: Ib2dd0fc19217655a4d6b49cdf49ce36dfd6577d5

8 years agoMerge \\\\"DO NOT MERGE revert system api loadSafeLabel\\\\" into mnc-dev am: d2e2288...
Chen Xu [Wed, 6 Jul 2016 23:42:41 +0000 (23:42 +0000)]
Merge \\\\"DO NOT MERGE revert system api loadSafeLabel\\\\" into mnc-dev am: d2e2288fe3 am: 59fc768893 am: 69a071e55c
am: e5643a13c4  -s ours

Change-Id: I68bfaeedf5290ea792aa0570e68e24d0d6dada11

8 years agoMerge \\\"DO NOT MERGE revert system api loadSafeLabel\\\" into mnc-dev am: d2e2288fe...
fionaxu [Wed, 6 Jul 2016 23:36:00 +0000 (23:36 +0000)]
Merge \\\"DO NOT MERGE revert system api loadSafeLabel\\\" into mnc-dev am: d2e2288fe3 am: 59fc768893
am: 69a071e55c

Change-Id: If59d61dfdc00f740ffcf8fbe5233b191eb03a797

8 years agoMerge \\"DO NOT MERGE revert system api loadSafeLabel\\" into mnc-dev am: d2e2288fe3
Chen Xu [Wed, 6 Jul 2016 23:29:51 +0000 (23:29 +0000)]
Merge \\"DO NOT MERGE revert system api loadSafeLabel\\" into mnc-dev am: d2e2288fe3
am: 59fc768893

Change-Id: I1eeb704e6b0a29e3574e969649ba72bbb5d9a9c2

8 years agoMerge \"DO NOT MERGE revert system api loadSafeLabel\" into mnc-dev
fionaxu [Wed, 6 Jul 2016 23:24:04 +0000 (23:24 +0000)]
Merge \"DO NOT MERGE revert system api loadSafeLabel\" into mnc-dev
am: d2e2288fe3

Change-Id: If7bb704d5d6ae942b7ceac3e9f22acf4cf3a7b4b

8 years agoMerge "DO NOT MERGE revert system api loadSafeLabel" into mnc-dev
Chen Xu [Wed, 6 Jul 2016 23:16:53 +0000 (23:16 +0000)]
Merge "DO NOT MERGE revert system api loadSafeLabel" into mnc-dev

8 years agoMerge "remove "referenceonly" flag from the offline-docs build. Add new offline-docs...
Scott Main [Wed, 6 Jul 2016 22:48:01 +0000 (22:48 +0000)]
Merge "remove "referenceonly" flag from the offline-docs build. Add new offline-docs-referenceonly make rule. And update online-sdk and offline-sdk to use the new site templates." into nyc-dev

8 years agoMerge "Use proper lock when accessing the generation registry" into nyc-dev
Svetoslav Ganov [Wed, 6 Jul 2016 22:10:08 +0000 (22:10 +0000)]
Merge "Use proper lock when accessing the generation registry" into nyc-dev

8 years agoMerge "Make registerDefaultNetwork work on metered networks." into nyc-dev
Pankaj Kanwar [Wed, 6 Jul 2016 20:35:22 +0000 (20:35 +0000)]
Merge "Make registerDefaultNetwork work on metered networks." into nyc-dev

8 years agoUse proper lock when accessing the generation registry
Svet Ganov [Wed, 6 Jul 2016 19:16:53 +0000 (12:16 -0700)]
Use proper lock when accessing the generation registry

We use 'this' for synchronization in NameValueCache but some code
that accesses the generation registry uses 'this' in a different
context ending up syncing on the wrong instance. This is why
sync on this is just a bad idea.

bug:29956424

Change-Id: Ide2d4f07a5f40cb3f0e8f50e4c8de216d15a31ee

8 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 5 Jul 2016 21:07:10 +0000 (14:07 -0700)]
Import translations. DO NOT MERGE

Change-Id: Idf9776c5e49200e5880dd16b81e43ae095471caa
Auto-generated-cl: translation import

8 years agoFix simple typo in System Permissions guide
Wonil Kim [Sat, 2 Jul 2016 03:06:57 +0000 (12:06 +0900)]
Fix simple typo in System Permissions guide

TYou to You

BUG: 29946799
Change-Id: I9796a91109d5f0d756f5273ebc56c44ff4cf25f6

8 years agoMerge "Docs: Performance final changes" into nyc-dev
Joe Fernandez [Sat, 2 Jul 2016 00:15:20 +0000 (00:15 +0000)]
Merge "Docs: Performance final changes" into nyc-dev

8 years agoDocs: Performance final changes
David Friedman [Sat, 2 Jul 2016 00:11:02 +0000 (17:11 -0700)]
Docs: Performance final changes

Change-Id: I50e7a2e7b455ca3032da339e48a217ce713d1c40

8 years agoMerge "docs: performance: Reduce APK Sizes" into nyc-dev
Joe Fernandez [Fri, 1 Jul 2016 23:21:34 +0000 (23:21 +0000)]
Merge "docs: performance: Reduce APK Sizes" into nyc-dev

8 years agoMerge "Docs: Job-scheduling doc for new DAC Performance section." into nyc-dev
Joe Fernandez [Fri, 1 Jul 2016 23:08:47 +0000 (23:08 +0000)]
Merge "Docs: Job-scheduling doc for new DAC Performance section." into nyc-dev

8 years agoDocs: Job-scheduling doc for new DAC Performance section.
David Friedman [Fri, 1 Jul 2016 00:23:29 +0000 (17:23 -0700)]
Docs: Job-scheduling doc for new DAC Performance section.

Change-Id: Iccdbfcede6774bd7b5e368c53637ca8e194c7ec5

8 years agoMerge \\\\\\\\"DO NOT MERGE revert public api loadSafeLabel\\\\\\\\" into lmp-dev...
Chen Xu [Fri, 1 Jul 2016 23:02:11 +0000 (23:02 +0000)]
Merge \\\\\\\\"DO NOT MERGE revert public api loadSafeLabel\\\\\\\\" into lmp-dev am: 521efcd1e3  -s ours am: 7bd0eea999 am: 0828455ca9 am: caabaab8bc  -s ours am: 67f8e822ac am: f82ca1f3e9 am: 0f741391c3
am: 4000bdb3ea  -s ours

Change-Id: I7a010f957438467d2edfb10a28a364527dac492e

8 years agodocs: performance: Reduce APK Sizes
Eric Schmidt [Fri, 24 Jun 2016 18:30:24 +0000 (11:30 -0700)]
docs: performance: Reduce APK Sizes

Bug: 29152053
Change-Id: I5aa4e7d59c32ef5d6897a47263e055358b1c9dda

8 years agoMerge \\\\\\\"DO NOT MERGE revert public api loadSafeLabel\\\\\\\" into lmp-dev am...
fionaxu [Fri, 1 Jul 2016 22:55:45 +0000 (22:55 +0000)]
Merge \\\\\\\"DO NOT MERGE revert public api loadSafeLabel\\\\\\\" into lmp-dev am: 521efcd1e3  -s ours am: 7bd0eea999 am: 0828455ca9 am: caabaab8bc  -s ours am: 67f8e822ac am: f82ca1f3e9
am: 0f741391c3

Change-Id: I9748b9d7b065a6d2bbd9c2a3061409c58b53d261

8 years agoMerge \\\\\\"DO NOT MERGE revert public api loadSafeLabel\\\\\\" into lmp-dev am...
Chen Xu [Fri, 1 Jul 2016 22:45:46 +0000 (22:45 +0000)]
Merge \\\\\\"DO NOT MERGE revert public api loadSafeLabel\\\\\\" into lmp-dev am: 521efcd1e3  -s ours am: 7bd0eea999 am: 0828455ca9 am: caabaab8bc  -s ours am: 67f8e822ac
am: f82ca1f3e9

Change-Id: Ib714c74aa3bede2bea496204b7d1cb7ff2380dca

8 years agoMerge \\\\\"DO NOT MERGE revert public api loadSafeLabel\\\\\" into lmp-dev am: 521ef...
fionaxu [Fri, 1 Jul 2016 22:38:28 +0000 (22:38 +0000)]
Merge \\\\\"DO NOT MERGE revert public api loadSafeLabel\\\\\" into lmp-dev am: 521efcd1e3  -s ours am: 7bd0eea999 am: 0828455ca9 am: caabaab8bc  -s ours
am: 67f8e822ac

Change-Id: I54214d329e81a59e418cc9f4a5ff150b6348a8c2

8 years agoMerge \\\\"DO NOT MERGE revert public api loadSafeLabel\\\\" into lmp-dev am: 521efcd...
Chen Xu [Fri, 1 Jul 2016 22:32:05 +0000 (22:32 +0000)]
Merge \\\\"DO NOT MERGE revert public api loadSafeLabel\\\\" into lmp-dev am: 521efcd1e3  -s ours am: 7bd0eea999 am: 0828455ca9
am: caabaab8bc  -s ours

Change-Id: If1a5d01375b2a4e503ddf93bba5e009754889d44

8 years agoMerge "Docs: Final edits for initial release of this doc for Performance section...
Joe Fernandez [Fri, 1 Jul 2016 22:21:29 +0000 (22:21 +0000)]
Merge "Docs: Final edits for initial release of this doc for Performance section of DAC." into nyc-dev

8 years agoMerge \\\"DO NOT MERGE revert public api loadSafeLabel\\\" into lmp-dev am: 521efcd1e...
fionaxu [Fri, 1 Jul 2016 22:16:10 +0000 (22:16 +0000)]
Merge \\\"DO NOT MERGE revert public api loadSafeLabel\\\" into lmp-dev am: 521efcd1e3  -s ours am: 7bd0eea999
am: 0828455ca9

Change-Id: Ie1d5e38af7c3c49eb69f61e379096b17dd004961

8 years agoMerge \\"DO NOT MERGE revert public api loadSafeLabel\\" into lmp-dev am: 521efcd1e3...
Chen Xu [Fri, 1 Jul 2016 22:09:39 +0000 (22:09 +0000)]
Merge \\"DO NOT MERGE revert public api loadSafeLabel\\" into lmp-dev am: 521efcd1e3  -s ours
am: 7bd0eea999

Change-Id: I4ae23825fcef45856aa8551725c38fba0dd4892a

8 years agoMerge \"DO NOT MERGE revert public api loadSafeLabel\" into lmp-dev
fionaxu [Fri, 1 Jul 2016 21:59:03 +0000 (21:59 +0000)]
Merge \"DO NOT MERGE revert public api loadSafeLabel\" into lmp-dev
am: 521efcd1e3  -s ours

Change-Id: I278455eb32488b221de93acd52b64956149cad54