Commit Graph

58272 Commits

Author SHA1 Message Date
Philip P. Moltmann
a70594be57 Merge "Print API for N: Fix docs and change interfaces as requested." into nyc-dev
am: 50a871857d

* commit '50a871857d4a6c6f8d6ce8b3621414e60a32eaf6':
  Print API for N: Fix docs and change interfaces as requested.

Change-Id: Id9b2b228001802d6b5325e6b01d318e265541441
2016-04-21 00:23:34 +00:00
Vladislav Kaznacheev
bd048c598d Merge "Add JavaDoc for View.updateDragShadow" into nyc-dev
am: 28609360cf

* commit '28609360cfe25446ab5b0ba165af363378b3d805':
  Add JavaDoc for View.updateDragShadow

Change-Id: I2d5488d78f4095cdfa3558dc0a4e3a785c420648
2016-04-21 00:18:20 +00:00
Eino-Ville Talvala
a6587338ea Merge "Camera2: Ignore exception on double-completed capture sequences." into nyc-dev
am: 5856779c3a

* commit '5856779c3a3e00e256cdf5cb571a85975d781cf4':
  Camera2: Ignore exception on double-completed capture sequences.

Change-Id: I7905d6ef70ba031736fcc2cea9f1ffdabe09851e
2016-04-21 00:17:55 +00:00
Philip P. Moltmann
50a871857d Merge "Print API for N: Fix docs and change interfaces as requested." into nyc-dev 2016-04-21 00:17:48 +00:00
TreeHugger Robot
28609360cf Merge "Add JavaDoc for View.updateDragShadow" into nyc-dev 2016-04-21 00:02:08 +00:00
Eino-Ville Talvala
5856779c3a Merge "Camera2: Ignore exception on double-completed capture sequences." into nyc-dev 2016-04-20 23:55:11 +00:00
Adam Lesinski
2988b8f641 Merge "Doze settings example not matching real keys" am: 570a13f
am: 790699d

* commit '790699db64ee18d143cd9813e91044fcc5a26713':
  Doze settings example not matching real keys

Change-Id: I5c1a0757f5db2ba3ca2fcf37e77641ac820fbe6f
2016-04-20 23:42:01 +00:00
Adam Lesinski
40c611853e Merge "ResourcesManager: Throw exception if failed to load asset path" into nyc-dev
am: 1362ae0

* commit '1362ae062a196c8450a0b649dd0c5af66d1f05a1':
  ResourcesManager: Throw exception if failed to load asset path

Change-Id: I59a5eeb3502d12382e30faceb769eaef719b65d1
2016-04-20 22:56:11 +00:00
Henrik Baard
790699db64 Merge "Doze settings example not matching real keys"
am: 570a13f

* commit '570a13f0cb233b4a216243025a9fed3df3c72849':
  Doze settings example not matching real keys

Change-Id: I62dade8bece244e9033a230c1f116f8caad35a6f
2016-04-20 22:51:47 +00:00
Adam Lesinski
1362ae062a Merge "ResourcesManager: Throw exception if failed to load asset path" into nyc-dev 2016-04-20 22:46:05 +00:00
Christopher Tate
9e92c03991 Merge "Don\'t back up wallpapers that we\'ve been told not to" into nyc-dev
am: 665189f

* commit '665189f92646d34bf02082120cba3c62aa718770':
  Don't back up wallpapers that we've been told not to

Change-Id: I45d037436e349445f091a7dad5abad4b7421ad8e
2016-04-20 22:13:17 +00:00
Chris Tate
665189f926 Merge "Don't back up wallpapers that we've been told not to" into nyc-dev 2016-04-20 22:10:40 +00:00
Eino-Ville Talvala
7e71896561 Camera2: Ignore exception on double-completed capture sequences.
As a workaround for b/27870771, convert fatal exception into a
warning.

Duplicate calls to finishPendingSequence with the same sequenceId
are seen in user crash reports, but with no further context and
inability to reproduce after testing various hypothesis, just
warn about it happening.

Bug: 27870771
Change-Id: Icd7d408887e04b94092689ce61809d6c664d8e3a
2016-04-20 15:05:40 -07:00
Jim Miller
5480783692 Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev
am: 54c4374

* commit '54c4374b4a67fdfbda936e7f4a8a9538e16c3557':
  Fix bug where fingerprint for wrong userId was attempted to be removed.

Change-Id: I9f5db7259dc9af79f57d16577c2a9d5481ad31ba
2016-04-20 21:52:36 +00:00
Vladislav Kaznacheev
ea4d221c42 Add JavaDoc for View.updateDragShadow
Bug: 28296402
Change-Id: I2aec5ab9932c3177cb08dbf1210abfd949e0dab7
2016-04-20 14:40:32 -07:00
Christopher Tate
d7faf53605 Don't back up wallpapers that we've been told not to
In addition, now that the full uncropped wallpaper image is being
backed up, we now handle that via the full-data backup path instead
of key/value.  Restore still knows about legacy data that gets
delivered via the older key/value mechanism.

This change also has the effect of removing the size limitations
around wallpaper restore acceptance.  Any size source imagery is
valid, as crop & scale are rerun in a device-appropriate way
after the restore.

Bug 25453848
Bug 25727875

Change-Id: Idc64a2eaab97a8ecc9d2b8ca5dc011f29cab324d
2016-04-20 14:34:07 -07:00
Jim Miller
54c4374b4a Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev 2016-04-20 21:33:15 +00:00
Ruchi Kandoi
4c24df5a31 Merge "Revert "PowerManager: Adds the Sustained performance API."" into nyc-dev
am: 0fea8ad

* commit '0fea8ad44748abd031c2e73cd5e6bce6a086c5f3':
  Revert "PowerManager: Adds the Sustained performance API."

Change-Id: I7a5d0be180f9c224b9ccb2551ab4f0dbf7c9c4e9
2016-04-20 21:14:59 +00:00
Ruchi Kandoi
5e292bf51f Merge "window: Adds a Sustained Performance Mode window flag." into nyc-dev
am: a645c97

* commit 'a645c9753ff004e616a6df4a15c9d2e999508d91':
  window: Adds a Sustained Performance Mode window flag.

Change-Id: Ib839ac8cd7dfa0e216de46bb8b343787d230a36c
2016-04-20 21:14:47 +00:00
Ruben Brunk
2fbf2b701e Merge "Add settings for altering VR display behavior." into nyc-dev
am: 6ada702

* commit '6ada702993227233fd362e98de93cc9e798dc75d':
  Add settings for altering VR display behavior.

Change-Id: Iaf8584c47a91b0a49c4075e6d4fcef10afc3ae11
2016-04-20 21:14:42 +00:00
destradaa
9737ba1153 Merge "Add support for multiple callback registration in." into nyc-dev
am: fdb26b9

* commit 'fdb26b90cbbd1db31d2ee1b2c4c38cfcc7d6a46c':
  Add support for multiple callback registration in.

Change-Id: I52d4f7f2bc7d79ebd80759a94c7cdd23ba724144
2016-04-20 21:14:36 +00:00
Andreas Gampe
c17adf62e5 Merge "Frameworks/base: Add holder to BaseBundle" into nyc-dev
am: 58f2072

* commit '58f20726e99947a0f2781b5d4be3052be6eb94dd':
  Frameworks/base: Add holder to BaseBundle

Change-Id: I0b177b9a7b3b11e579b8cc62b89e4036908bf237
2016-04-20 21:12:53 +00:00
Trevor Johns
c0d2c43a22 Merge changes from topic \'merge_docs_nyc-dev\' into nyc-dev
am: 59c9a93

* commit '59c9a93fc268e226495d4ee8cf7c507c2ea2c433':
  Remove links to createAndInitializeUser() and createUser()
  Resolve merge conflicts of a5060ee to nyc-dev

Change-Id: Iddc9419069d8f5d555baf0c1ef4b2f2ebf75c370
2016-04-20 21:12:38 +00:00
Robert Carr
287dfb665a Merge "Respect WRAP_CONTENT when resolving drop down position." into nyc-dev
am: 5a2554a

* commit '5a2554a8544525953c0847a1d3c975413eb07986':
  Respect WRAP_CONTENT when resolving drop down position.

Change-Id: I81a283518d4afca0fb05185af64ce323a6f7c6b3
2016-04-20 21:12:15 +00:00
Felipe Leme
eac7508a54 Merge "Added onRestrictBackgroundWhitelistChanged callback." into nyc-dev
am: 9724fba

* commit '9724fba83545fd075cbda62bb13cdc7820c7291a':
  Added onRestrictBackgroundWhitelistChanged callback.

Change-Id: I1ee90168f1cf29a117961ba1e269fbc89c7f443b
2016-04-20 21:10:41 +00:00
Ruchi Kandoi
9c36c02f0e Revert "PowerManager: Adds the Sustained performance API."
This reverts commit 0abc001275.

Bug: 28150358
Change-Id: I99c71b3d6641310a33e898d6fd475d37c79ba9d0
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2016-04-20 20:49:18 +00:00
Philip P. Moltmann
b99876416c Print API for N: Fix docs and change interfaces as requested.
Fixes: 28291443
Change-Id: I1a1585796032351a739d54171bd67ccc76f0f08a
2016-04-20 13:42:18 -07:00
Adam Lesinski
3477927db4 ResourcesManager: Throw exception if failed to load asset path
Previously if we failed to load an asset path, we would return a
null AssetManager which would lead to an immediate NPE.

Throw a proper exception instead, detailing which path failed to load.

Bug:28216288
Change-Id: I491b9316b837bf333b5ae78d4eb1ee31741617ec
2016-04-20 13:36:19 -07:00
Ruchi Kandoi
a645c9753f Merge "window: Adds a Sustained Performance Mode window flag." into nyc-dev 2016-04-20 20:35:21 +00:00
Jim Miller
8f2aca0ee4 Fix bug where fingerprint for wrong userId was attempted to be removed.
- cleaned up private API to ensure userId is distinct from groupId.
- fixed bug where we were sending the wrong userId when attempting to
- fix warning about wrong fingerId when receiving final id of 0.

Fixes bug 28268635

Change-Id: I9507723c1a763152775f2feff76c16762f23cf2d
2016-04-20 13:34:11 -07:00
Ruben Brunk
6ada702993 Merge "Add settings for altering VR display behavior." into nyc-dev 2016-04-20 19:51:51 +00:00
Daniel Estrada Alva
fdb26b90cb Merge "Add support for multiple callback registration in." into nyc-dev 2016-04-20 19:22:10 +00:00
Andreas Gampe
58f20726e9 Merge "Frameworks/base: Add holder to BaseBundle" into nyc-dev 2016-04-20 18:58:32 +00:00
Trevor Johns
59c9a93fc2 Merge changes from topic 'merge_docs_nyc-dev' into nyc-dev
* changes:
  Remove links to createAndInitializeUser() and createUser()
  Resolve merge conflicts of a5060ee to nyc-dev
2016-04-20 18:35:57 +00:00
Rob Carr
5a2554a854 Merge "Respect WRAP_CONTENT when resolving drop down position." into nyc-dev 2016-04-20 18:30:16 +00:00
TreeHugger Robot
9724fba835 Merge "Added onRestrictBackgroundWhitelistChanged callback." into nyc-dev 2016-04-20 17:44:56 +00:00
Ruchi Kandoi
43e38de253 window: Adds a Sustained Performance Mode window flag.
Adds setSustainedPerformanceMode(boolean) API for applications to set
the mode for a given window. The mode will be disabled automatically when the
window is no longer in focus.

Bug: 28150358
Change-Id: Ibe8bc564eeaaccbcaad5c4f792cda16da931dffd
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2016-04-20 09:57:11 -07:00
Philip P. Moltmann
b8ccfaa4ff Merge "Expose additional fields needed by PrintRecommendationService GTS test and move files into properly named directory." into nyc-dev
am: a1a1aa3

* commit 'a1a1aa3c682215f0ac7251c43f77985b9aced2a2':
  Expose additional fields needed by PrintRecommendationService GTS test and move files into properly named directory.

Change-Id: I6a177370c3fdcf0d81eedc3bc383f389f058b06a
2016-04-20 15:06:47 +00:00
Philip P. Moltmann
a1a1aa3c68 Merge "Expose additional fields needed by PrintRecommendationService GTS test and move files into properly named directory." into nyc-dev 2016-04-20 15:01:05 +00:00
Rubin Xu
48cef81f6e Merge "Kill foreground apps when turning off work" into nyc-dev
am: 49425d6

* commit '49425d612cee3864a316e9ecb6ec3faeae519b1e':
  Kill foreground apps when turning off work

Change-Id: Ie8ea1ec98232437623c83f7d32c1f05c47580b35
2016-04-20 09:40:38 +00:00
Rubin Xu
49425d612c Merge "Kill foreground apps when turning off work" into nyc-dev 2016-04-20 09:33:52 +00:00
Andreas Gampe
52764cba59 Frameworks/base: Add holder to BaseBundle
Move EMPTY_PARCEL into an inner holder class. Add holder to
preloaded-classes. Clean up dependencies.

Allows to compile-time initialize:
* android.os.BaseBundle
* android.os.Bundle
* android.os.PersistableBundle
* android.telephony.CarrierConfigManager

Bug: 27265238
Change-Id: Ib8017aa419c2985963b3c68a8046462a38652ef2
2016-04-19 20:46:43 -07:00
Jakub Pawlowski
68852d1776 Merge "OobData documentation" into nyc-dev
am: 75760e6

* commit '75760e6b62e46fc9abcde523878459b08558f9d1':
  OobData documentation

Change-Id: Ief21f781808b84c5c2f63eade310b90209d1cd83
2016-04-20 03:20:15 +00:00
Jakub Pawlowski
75760e6b62 Merge "OobData documentation" into nyc-dev 2016-04-20 03:15:23 +00:00
Robert Carr
2665604edd Respect WRAP_CONTENT when resolving drop down position.
We recently added the width/height <0 check to prevent
passing unresolved widths in to tryFitVertical or
tryFitHorizontal and produce strange behaviors. This made
more sense than the code before it but still not that much
sense. We need to treat MATCH_PARENT and WRAP_CONTENT differently
as the documentation suggests.

Bug: 28267951
Change-Id: I6f2f248c8d1f63d31bdd75c24f7250c28381c712
2016-04-19 19:10:44 -07:00
destradaa
78cebca720 Add support for multiple callback registration in.
- Allows several callbacks from different processes to register with
  the ContextHub service.
- Add an 'internal' callback that can be used for primary clients.
- Fix issue with parceling NanoApp info

Change-Id: Iec203e8b8bc847cb9274f3f4157d0773984dd87c
2016-04-19 17:45:18 -07:00
Jorim Jaggi
4ed3f1dd1c Merge "Fixes for resize thread" into nyc-dev
am: 13219992a0

* commit '13219992a0e8b08195ffd596d40d9ceecbf741e0':
  Fixes for resize thread

Change-Id: I2efa14b883a2d9ad31b6e2c4fd72a2b2258adf69
2016-04-20 00:14:31 +00:00
Jorim Jaggi
13219992a0 Merge "Fixes for resize thread" into nyc-dev 2016-04-20 00:07:54 +00:00
Doris Liu
86ac81b6ba Merge "Fix pause/resume for AnimatorSet" into nyc-dev
am: dd67b0d

* commit 'dd67b0d52521bb828bc31732fe3ac8b786a19cce':
  Fix pause/resume for AnimatorSet

Change-Id: I235c869ce54fdf789898f8663a92fd22a4872600
2016-04-19 22:24:27 +00:00
Robert Carr
1b72363846 Merge "Force windows to be scalable during pinned animation." into nyc-dev
am: 4e9a9df

* commit '4e9a9dfb67ebc48028b1613a03144101d94f7d92':
  Force windows to be scalable during pinned animation.

Change-Id: I772d120442ed82c55c71fbf5ce841735d7a14cc5
2016-04-19 22:17:16 +00:00