Commit Graph

59256 Commits

Author SHA1 Message Date
Christopher Tate
57fe3eea85 Merge "Don\'t back up wallpapers that we\'ve been told not to" into nyc-dev am: 665189f am: 9e92c03
am: cdfe208a99

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

Change-Id: I45e4c3c47e371c3808e5669e2c7af6d8405edb7a
2016-04-21 00:24:55 +00:00
Jim Miller
aa453ebd70 Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev am: 54c4374 am: 5480783
am: eabb274ace

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

Change-Id: I3a62ec2f591f7ec7c7f40a01f8a70848c9805945
2016-04-21 00:23:36 +00:00
Ruchi Kandoi
a2b96b1c8c Merge "Revert "PowerManager: Adds the Sustained performance API."" into nyc-dev am: 0fea8ad am: 4c24df5
am: d84169a92f

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

Change-Id: Iadb804137b77b1fd9f20da6b03c2b8e30617ed0c
2016-04-21 00:21:51 +00:00
Ruchi Kandoi
e325e5629f Merge "window: Adds a Sustained Performance Mode window flag." into nyc-dev am: a645c97 am: 75da7b4
am: a78d8d3

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

Change-Id: I4f2c47cdaa9fa6391e73d725aebb0348ae28f0ac
2016-04-20 23:05:29 +00:00
Ruben Brunk
560b03f47c Merge "Add settings for altering VR display behavior." into nyc-dev am: 6ada702 am: 5356c87
am: 04121ec

* commit '04121ec1223672f4242c6c48cb55387c29cd735d':
  Add settings for altering VR display behavior.

Change-Id: If39bcfb8f6a739a907f7f46c7ea0201f3e436460
2016-04-20 23:04:40 +00:00
destradaa
3535dde486 Merge "Add support for multiple callback registration in." into nyc-dev am: fdb26b9 am: be80c9b
am: a916bd9

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

Change-Id: Ieaf502cd7e58832a362033dbeb54d95c13339d40
2016-04-20 23:03:51 +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
Andreas Gampe
74755c9eb5 resolve merge conflicts of 7983723 to master
Change-Id: I1e903d23598c8066b9103499287a7ee04d33c75a
2016-04-20 15:11:43 -07: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
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
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
Trevor Johns
0392182bff Merge changes from topic \'merge_docs_nyc-dev\' into nyc-dev am: 59c9a93 am: 254f1b8
am: e1b5670

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

Change-Id: I8cf43f9ad491c6f23eb5fe0051293267ab2d03bf
2016-04-20 21:32:39 +00:00
Robert Carr
2bce1a2585 Merge "Respect WRAP_CONTENT when resolving drop down position." into nyc-dev am: 5a2554a am: bf2a2fa
am: ae3539f

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

Change-Id: I5c4752f51747d08bfdfb4530e6ed3e32b99dd90c
2016-04-20 21:32:13 +00:00
Felipe Leme
b756f6ed34 Merge "Added onRestrictBackgroundWhitelistChanged callback." into nyc-dev am: 9724fba am: 0627850
am: 9acf151

* commit '9acf1516eb00827464fce1ab6c893de9721081e4':
  Added onRestrictBackgroundWhitelistChanged callback.

Change-Id: Iae1c0af0aec6dba501249c0db08ade5a36f99607
2016-04-20 21:29:18 +00:00
Ruchi Kandoi
a78d8d303e Merge "window: Adds a Sustained Performance Mode window flag." into nyc-dev am: a645c97
am: 75da7b4

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

Change-Id: Id029aa2f10e4d278c385487739978075607f29a1
2016-04-20 21:17:12 +00:00
Ruben Brunk
04121ec122 Merge "Add settings for altering VR display behavior." into nyc-dev am: 6ada702
am: 5356c87

* commit '5356c871ac1d8ce2ee0de79e24c450d6907e70bb':
  Add settings for altering VR display behavior.

Change-Id: I35e79e9ba7517d05a0737e4974286a6a341c9640
2016-04-20 21:16:51 +00:00
Daniel Estrada Alva
a916bd9639 Merge "Add support for multiple callback registration in." into nyc-dev am: fdb26b9
am: be80c9b

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

Change-Id: I183cb869aefe6aaa06ac2079cf41c981ac8fe81c
2016-04-20 21:16:37 +00:00
Andreas Gampe
798372384e Merge "Frameworks/base: Add holder to BaseBundle" into nyc-dev am: 58f2072
am: 6ce2774

* commit '6ce27741799f0059e343cde5e0fbef9073c60ee8':
  Frameworks/base: Add holder to BaseBundle

Change-Id: Ia4053ed3e376a08dbe8f1273d86c3ebdb2cca388
2016-04-20 21:15:26 +00:00
Trevor Johns
e1b56701fd Merge changes from topic \'merge_docs_nyc-dev\' into nyc-dev am: 59c9a93
am: 254f1b8

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

Change-Id: I32a3081af9ca5533785c90b7239ffd5b5e69d5bf
2016-04-20 21:15:11 +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
Rob Carr
ae3539f055 Merge "Respect WRAP_CONTENT when resolving drop down position." into nyc-dev am: 5a2554a
am: bf2a2fa

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

Change-Id: I82ab0dcef53f34ba5275826e47a724842bd6cdd8
2016-04-20 21:14:41 +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
TreeHugger Robot
9acf1516eb Merge "Added onRestrictBackgroundWhitelistChanged callback." into nyc-dev am: 9724fba
am: 0627850

* commit '0627850430ba3dad041891de570e0d08e22c13d2':
  Added onRestrictBackgroundWhitelistChanged callback.

Change-Id: I278f8b4f8e29ea69b15e7bef9556c0ed0a81c82b
2016-04-20 21:11:50 +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
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
24fdc17792 Merge "Expose additional fields needed by PrintRecommendationService GTS test and move files into properly named directory." into nyc-dev am: a1a1aa3 am: b8ccfaa4
am: 7a1ae0b

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

Change-Id: Iaefe74d98b308d9ed676b47dfcc96222ec476ab8
2016-04-20 15:13:02 +00: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
7f55d526f1 Merge "Kill foreground apps when turning off work" into nyc-dev am: 49425d6 am: 48cef81
am: 512ab59

* commit '512ab599fc903da21b67c0c4d01ce9ffb8e6d68f':
  Kill foreground apps when turning off work

Change-Id: I83e0e9792225416c6a0c9de4a8201dcb2e37666f
2016-04-20 09:46:31 +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
Jakub Pawlowski
6a5cb51b5e Merge "OobData documentation" into nyc-dev am: 75760e6 am: a08c14d
am: c97b0a7

* commit 'c97b0a734ddf093cbaf2e5fb7db2615c46d31dc5':
  OobData documentation

Change-Id: I0fa5e83a5a920d93fcc156e6ba308f9a05968db3
2016-04-20 05:26:47 +00:00
Jakub Pawlowski
c97b0a734d Merge "OobData documentation" into nyc-dev am: 75760e6
am: a08c14d

* commit 'a08c14d05c47f1818dcb83c63143fcfb37044dd6':
  OobData documentation

Change-Id: I6a045e0fd21bf3293cc8a1cd474be231109db009
2016-04-20 05:20:51 +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