Commit Graph

65456 Commits

Author SHA1 Message Date
The Android Automerger
750ccd5333 Manually merge branch 'nyc-mr1-dev-plus-aosp' to shortcircuit automerger b/28407115 2016-04-27 22:14:50 +00:00
Antonio Cansado
b649d42ecf Merge "Fixing network tags." into nyc-dev am: 2c9bb7c
am: 72baa83

* commit '72baa83895fa35be96b8dd2f5f5ac4cbdd5c2795':
  Fixing network tags.

Change-Id: I9fc3fb5a2288a2b90132fcf5cd4576000ba5f1c9
2016-04-27 21:59:13 +00:00
Antonio Cansado
2c9bb7c09a Merge "Fixing network tags." into nyc-dev 2016-04-27 21:28:13 +00:00
Felipe Leme
89ba9ddf26 Merge "Update background data restrictions intent javadoc." into nyc-dev
am: 8b5e9f1

* commit '8b5e9f1bcf25ae38f812dc750772cf19abba6638':
  Update background data restrictions intent javadoc.

Change-Id: Iaa01becc95debb5aa68cd8308bbe69936e769508
2016-04-27 21:21:00 +00:00
TreeHugger Robot
8b5e9f1bcf Merge "Update background data restrictions intent javadoc." into nyc-dev 2016-04-27 21:16:00 +00:00
Yin-Chia Yeh
ef7f6cdcd3 Merge "Camera: codegen doc update (dynamic black level)" into nyc-dev
am: 0d7bddc

* commit '0d7bddcbdecf62a72b8a232930de538dff2e93a9':
  Camera: codegen doc update (dynamic black level)

Change-Id: I131e0473f73c6695279f906eefce217f819d2d90
2016-04-27 20:52:12 +00:00
Jeff Sharkey
6ed8ae5ec4 Merge "Only log when system UID finds missing data paths." into nyc-dev
am: 2c3f2c4

* commit '2c3f2c4da90613bafc93ed34e53867da10084212':
  Only log when system UID finds missing data paths.

Change-Id: I90b8fe98181dc2b7d00f0c9d320acce316d637e9
2016-04-27 20:41:19 +00:00
Yin-Chia Yeh
0d7bddcbde Merge "Camera: codegen doc update (dynamic black level)" into nyc-dev 2016-04-27 20:40:27 +00:00
Jeff Sharkey
2c3f2c4da9 Merge "Only log when system UID finds missing data paths." into nyc-dev 2016-04-27 20:34:19 +00:00
Dimitry Ivanov
0c6e213dc7 Merge changes I12c9448e,I928175a3 into nyc-dev
* changes:
  Create linker namespace for the system server classloader
  Extract pathclassloader initialization to a separate class
2016-04-27 20:32:26 +00:00
Dimitry Ivanov
cda22ed541 resolve merge conflicts from goog/stage-aosp-master to goog/nyc-dev-plus-aosp
Change-Id: I09c5c2881947b28547a40febf32f02722b03ef81
2016-04-27 13:16:17 -07:00
Jeff Hao
6fdf5951ae Merge "Support to pass <uses-library> option through to dex2oat." into nyc-dev
am: 864bc48

* commit '864bc48e0104451e20281258429677a9ebbab9ac':
  Support to pass <uses-library> option through to dex2oat.

Change-Id: Ia276b7594e31177f0295e03982aae96267367887
2016-04-27 20:02:24 +00:00
Raph Levien
7bb8e8c7a9 Merge "Give guidance on alternatives to deprecated locale field" into nyc-dev am: 78dd08d am: b22b5d7
am: 8435e68

* commit '8435e68e0ea5401300e2bfb03252b172bdf6be5b':
  Give guidance on alternatives to deprecated locale field

Change-Id: Ic75d9c8e440a9a77faf71d48ebde2b3ee3415b00
2016-04-27 20:01:17 +00:00
Peng Xu
48a4f817ad Merge "Intialize Java Sensor object uuid in JNI" into nyc-dev am: 7b0a3be am: 893b42e
am: 4cb78f8

* commit '4cb78f86d0991a4d89f205cee23fa0150c35f25d':
  Intialize Java Sensor object uuid in JNI

Change-Id: I0655cb508a5d936c825ceb2a3e7fb34ea8aaacae
2016-04-27 20:01:08 +00:00
Jeff Hao
864bc48e01 Merge "Support to pass <uses-library> option through to dex2oat." into nyc-dev 2016-04-27 19:54:04 +00:00
Clara Bayarri
38801e149b Merge "Fix TextUtils#getReverse deprecated doc" into nyc-dev am: b639ae6 am: 4852f67
am: 179e405

* commit '179e405df9708ea18c35ee865abbcbccba07bd78':
  Fix TextUtils#getReverse deprecated doc

Change-Id: I5c2875731129ffdd98f02814ebaac7556825e87e
2016-04-27 19:51:38 +00:00
Raph Levien
b22b5d7e60 Merge "Give guidance on alternatives to deprecated locale field" into nyc-dev
am: 78dd08d

* commit '78dd08d5dd49ba3e054e1416849606a22064b389':
  Give guidance on alternatives to deprecated locale field

Change-Id: Ibb3a28940ac9c2baeb3f31c760e651633a39a43f
2016-04-27 19:46:25 +00:00
Peng Xu
893b42e4f8 Merge "Intialize Java Sensor object uuid in JNI" into nyc-dev
am: 7b0a3be

* commit '7b0a3be0012edae0d17e0a92c66b30c9025f5886':
  Intialize Java Sensor object uuid in JNI

Change-Id: I2fd63c82891e1b7290406190d076d08dab4917c5
2016-04-27 19:46:21 +00:00
Raph Levien
78dd08d5dd Merge "Give guidance on alternatives to deprecated locale field" into nyc-dev 2016-04-27 19:42:23 +00:00
Clara Bayarri
4852f67ccd Merge "Fix TextUtils#getReverse deprecated doc" into nyc-dev
am: b639ae6

* commit 'b639ae697a07fd1a3755a9d3b3a264c24d685d35':
  Fix TextUtils#getReverse deprecated doc

Change-Id: Id33e49d9f11d47d0bf6badd101b5b08ffeb9150c
2016-04-27 19:41:09 +00:00
Peng Xu
7b0a3be001 Merge "Intialize Java Sensor object uuid in JNI" into nyc-dev 2016-04-27 19:37:59 +00:00
Raph Levien
b639ae697a Merge "Fix TextUtils#getReverse deprecated doc" into nyc-dev 2016-04-27 19:31:12 +00:00
Adam Powell
b5a40d542a Merge "Fix a bug where restartLoader would result in a stuck loader" into nyc-dev am: 596a4a1 am: dd58799
am: ce09139

* commit 'ce091392274585a897e489ed7b49e82ee222f0cc':
  Fix a bug where restartLoader would result in a stuck loader

Change-Id: Idb5c97da8760792598a2d78be05b624f120cc6c7
2016-04-27 19:30:48 +00:00
Adam Powell
dd587993ae Merge "Fix a bug where restartLoader would result in a stuck loader" into nyc-dev
am: 596a4a1

* commit '596a4a1592a8f5e7b708d884145e280df9b638d0':
  Fix a bug where restartLoader would result in a stuck loader

Change-Id: I635309e5b37dfca8befdadeb578a71ae1619ac00
2016-04-27 19:18:31 +00:00
TreeHugger Robot
596a4a1592 Merge "Fix a bug where restartLoader would result in a stuck loader" into nyc-dev 2016-04-27 19:12:51 +00:00
Dimitry Ivanov
89dad3360e Create linker namespace for the system server classloader
Bug: http://b/27702070
Change-Id: I12c9448e877202937cf558de75042bcb46f6a933
(cherry picked from commit eb5866d4b0)
2016-04-27 11:42:29 -07:00
Dimitry Ivanov
b1ef62bb38 Extract pathclassloader initialization to a separate class
To be able to reuse this code when creating a classloader for
the system_server.

Bug: http://b/27245894
Bug: http://b/27702070
Change-Id: I928175a39a1beb0446d863a5b8f5edf94686e768
(cherry picked from commit 5d7d777fa6)
2016-04-27 11:38:41 -07:00
Jeff Sharkey
21f507274b Only log when system UID finds missing data paths.
We're really only interested in tracking down when the system UID
tries touching missing data paths, since it's the only one with enough
permissions to mkdirs() directly without going through installd.

Without the guard added in this CL, we'd end up logging for direct
boot aware apps that tried obtaining CE paths while locked, which is
perfectly valid.

Bug: 28272737
Change-Id: Id24f3160f61d8ad8047d5c551bc6a91c868bd301
2016-04-27 12:38:20 -06:00
Dimitry Ivanov
fa8b96c6c1 Merge changes from topic \'target-sdk-0-fix\'
am: 493576b

* commit '493576bc5db94068b5a767021a4a5c8b6963c836':
  Create linker namespace for the system server classloader
  Extract pathclassloader initialization to a separate class

Change-Id: Ifbebd0a98c3d80620b53bf7ebef76222e57ca923
2016-04-27 18:33:55 +00:00
Bo Liu
b1229186d1 Merge "Revert "Expose setDrawGLFunctionDetachedCallback to webview"" into nyc-dev am: 08ca2e3 am: 55f3776
am: 7d3c51c

* commit '7d3c51cfdd6e54b157ad62a3dd85856dad758513':
  Revert "Expose setDrawGLFunctionDetachedCallback to webview"

Change-Id: I258f3ad08c23dac94f3679813188ec715b9635ac
2016-04-27 18:19:44 +00:00
Hui Shu
2c9eaeaa16 Merge "API Review: Add @IntDef and other annotations to Menu Item flags." into nyc-dev am: 9a5f9c2 am: b69b8c4
am: 4ca3434

* commit '4ca34342a8a20fc0471c36eeebeaa3be9604f219':
  API Review: Add @IntDef and other annotations to Menu Item flags.

Change-Id: I7f28d0a46e2e9333bfcfd37677b4780bcd006c4d
2016-04-27 18:19:32 +00:00
Bo Liu
7d3c51cfdd Merge "Revert "Expose setDrawGLFunctionDetachedCallback to webview"" into nyc-dev am: 08ca2e3
am: 55f3776

* commit '55f3776d82c2ebc9831868bcc068d53ceb38565f':
  Revert "Expose setDrawGLFunctionDetachedCallback to webview"

Change-Id: I6aa64553e7dfec0757bcd5b6d3299289185c5c6c
2016-04-27 18:11:30 +00:00
Jeff Hao
c7b9482b0c Support to pass <uses-library> option through to dex2oat.
This change takes an app's shared libraries specified by <uses-library>
and passes it through to dex2oat to be used during compilation.

Part of a multi-project change.

Bug: 26880306

(cherry-picked from 7b331b6a8a)

Change-Id: I523b1b74775e7ed27072498509e743f1f10b1164
2016-04-27 11:11:17 -07:00
Bo Liu
7dc710d564 Merge "Revert "Expose setDrawGLFunctionDetachedCallback to webview"" into nyc-dev
am: 08ca2e3

* commit '08ca2e3a7593ced4967c56709a1fe675408d42dc':
  Revert "Expose setDrawGLFunctionDetachedCallback to webview"

Change-Id: I4bba52ddc4b89273eceb2627facbb9091eb341c0
2016-04-27 18:06:25 +00:00
Raph Levien
b163870d46 Give guidance on alternatives to deprecated locale field
The deprecation message for the "locale" field should clearly state
what to do instead when only the primary locale is needed.

Bug: 27532422
Change-Id: I3e83cc1e9054d4e199d7e34b1a42b7bcd6c77f62
2016-04-27 11:02:12 -07:00
Bo Liu
08ca2e3a75 Merge "Revert "Expose setDrawGLFunctionDetachedCallback to webview"" into nyc-dev 2016-04-27 17:58:34 +00:00
The Android Automerger
8bdf39e19c Manually merge branch 'nyc-mr1-dev-plus-aosp' to fix automerger blockage b/28407115 2016-04-27 17:58:24 +00:00
Hui Shu
b69b8c414e Merge "API Review: Add @IntDef and other annotations to Menu Item flags." into nyc-dev
am: 9a5f9c2

* commit '9a5f9c208752bdb8c14fd2f2ef88408442f49c84':
  API Review: Add @IntDef and other annotations to Menu Item flags.

Change-Id: Ie571f6cb9dc496349aeb2b56e2648fb549e2d3ad
2016-04-27 17:56:55 +00:00
Selim Gurun
9a5f9c2087 Merge "API Review: Add @IntDef and other annotations to Menu Item flags." into nyc-dev 2016-04-27 17:48:32 +00:00
Adam Powell
e5552be22a Fix a bug where restartLoader would result in a stuck loader
Framework edition

In some cases restartLoader calls that happen in quick succession
could cause the new loader to become stuck and never run. Treat loader
restarts for loaders that have not yet started the same as starting a
brand new loader.

Bug 27437287
https://code.google.com/p/android/issues/detail?id=56464

Change-Id: Ia4e276fc8e63d43b9c52c6155cea827b194d8b19
2016-04-27 10:42:19 -07:00
Clara Bayarri
d608a0adcb Fix TextUtils#getReverse deprecated doc
Note there is no alternative method to use.

Bug: 28296055
Change-Id: I1e44c1dad6009434a92c6a53862e6f061114bc56
2016-04-27 10:28:03 -07:00
Dimitry Ivanov
eb5866d4b0 Create linker namespace for the system server classloader
Bug: http://b/27702070
Change-Id: I12c9448e877202937cf558de75042bcb46f6a933
2016-04-27 10:22:09 -07:00
Phil Weaver
85c5bf935f Merge "Fix crash with a11y set text with text filters." into nyc-dev
am: 7a61d60

* commit '7a61d6031b0ce9de00bfc77caa196396ad1781d5':
  Fix crash with a11y set text with text filters.

Change-Id: I2123ccd020f720ed28b0d0922e8f1dfdaa8261bb
2016-04-27 16:55:15 +00:00
Phil Weaver
7a61d6031b Merge "Fix crash with a11y set text with text filters." into nyc-dev 2016-04-27 16:49:27 +00:00
Hangyu Kuang
61734544d1 Merge changes from topic \'atv-hdr\' into nyc-dev
am: 39bb2c2

* commit '39bb2c29b427b0cf2396a8691176584094ae805c':
  Unhide getHdrCapabilities and HdrCapabilities.
  Plumb HDR capabilities to Display
  Revert "Revert "Hook up HDR capabilities from native SurfaceControl""

Change-Id: I53f0414c0a408edeae8ffe7161a035e45b8670b7
2016-04-27 16:46:30 +00:00
Hangyu Kuang
39bb2c29b4 Merge changes from topic 'atv-hdr' into nyc-dev
* changes:
  Unhide getHdrCapabilities and HdrCapabilities.
  Plumb HDR capabilities to Display
  Revert "Revert "Hook up HDR capabilities from native SurfaceControl""
2016-04-27 16:38:21 +00:00
Clara Bayarri
ad63540b01 Merge "Cleanup LocaleList docs given API review" into nyc-dev
am: 4dc63f7

* commit '4dc63f78a910e421d106cffc105b085f1ab1e2ae':
  Cleanup LocaleList docs given API review

Change-Id: Ic48021bdd5d021abd7eb8a10fa8540defdeb51bf
2016-04-27 15:42:57 +00:00
Clara Bayarri
4dc63f78a9 Merge "Cleanup LocaleList docs given API review" into nyc-dev 2016-04-27 15:32:58 +00:00
John Reck
f97dca612e Merge "API tweaks to PixelCopy and make it public" into nyc-dev
am: 7f209d3

* commit '7f209d37f17d4df09475137c38b84a3338c84023':
  API tweaks to PixelCopy and make it public

Change-Id: I1aac8afacfd054fe10fc26a73552608c51dfa9f5
2016-04-27 14:44:38 +00:00
John Reck
7f209d37f1 Merge "API tweaks to PixelCopy and make it public" into nyc-dev 2016-04-27 14:36:53 +00:00