Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
249,716 Commits 3 Branches 0 Tags
9dabe94fb6813dcdcb2b4e69f3f2e193778ca713
Commit Graph

59287 Commits

Author SHA1 Message Date
Shreyas Basarge
9dabe94fb6 Merge "Fix logspam by JobInfo" into nyc-dev am: bb9dd3c9fd am: f153182db7 
am: b8408d8eb7

* commit 'b8408d8eb755da42db3cf25868920d5b583b77ca':
  Fix logspam by JobInfo

Change-Id: I7bc166a3353b2a3d29719744d4f006662f738d8f
 2016-04-21 02:32:12 +00:00
Philip P. Moltmann
c383eea86a Merge "Prevent printing from finishing activity." into nyc-dev am: 41304f47f4 am: a9c65ffb00 
am: 7db07e5731

* commit '7db07e57318c74291b6ec84f48a5df09acd688ec':
  Prevent printing from finishing activity.

Change-Id: Ibbe7d4f14e109c51fbd239b1998f8f0f580a8ed8
 2016-04-21 02:27:03 +00:00
Philip P. Moltmann
3ae0b0afac Merge "Print API for N: Fix docs and change interfaces as requested." into nyc-dev am: 50a871857d am: a70594be57 
am: 8a7f60095b

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

Change-Id: I254333882dbec52948045d71978b9d7d015822cc
 2016-04-21 02:19:08 +00:00
Vladislav Kaznacheev
32c8b330df Merge "Add JavaDoc for View.updateDragShadow" into nyc-dev am: 2860936 am: 1a5cc60b39 
am: 24d1f99711

* commit '24d1f997115c8e114900bd2306e4e11a0c05e35f':
  Add JavaDoc for View.updateDragShadow

Change-Id: I7fc6a1b8403687329dd217c09781ccc1887bc331
 2016-04-21 02:10:02 +00:00
Eino-Ville Talvala
a7d12c80c5 Merge "Camera2: Ignore exception on double-completed capture sequences." into nyc-dev am: 5856779 am: 896a1a42f7 
am: 4006ef1d6f

* commit '4006ef1d6f1d6952995fb06fe226b6eed90bf89a':
  Camera2: Ignore exception on double-completed capture sequences.

Change-Id: I7434e3ff65958466ce6624ba8dffd2e47a07ca11
 2016-04-21 02:05:58 +00:00
Shreyas Basarge
f153182db7 Merge "Fix logspam by JobInfo" into nyc-dev 
am: bb9dd3c9fd

* commit 'bb9dd3c9fdef30ed4bf776fbf8cb74c7eed2e87e':
  Fix logspam by JobInfo

Change-Id: I58ec5ed68dad8df8c5f73c3e313181c36f0d27dd
 2016-04-21 00:50:04 +00:00
Dianne Hackborn
bb9dd3c9fd Merge "Fix logspam by JobInfo" into nyc-dev 2016-04-21 00:39:43 +00:00
Adam Lesinski
0144ca2371 Merge "Doze settings example not matching real keys" am: 570a13f am: 790699d am: 2988b8f6 
am: 466e03e86b

* commit '466e03e86b7f17b4fcfcefda2e9f8e3921463663':
  Doze settings example not matching real keys

Change-Id: I8f1b1e290097b953efa681ee5ad3ec6a46105631
 2016-04-21 00:38:26 +00:00
Philip P. Moltmann
7db07e5731 Merge "Prevent printing from finishing activity." into nyc-dev am: 41304f47f4 
am: a9c65ffb00

* commit 'a9c65ffb003c8c00667f9ec0d3d7efd28c334b6c':
  Prevent printing from finishing activity.

Change-Id: I8f3263acd7323f6cb7804c75b2cd877768963ada
 2016-04-21 00:37:22 +00:00
Adam Lesinski
604a0a9fc2 Merge "ResourcesManager: Throw exception if failed to load asset path" into nyc-dev am: 1362ae0 am: 40c6118 
am: fc2de302f4

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

Change-Id: I9fb7f2df3d37cb4ba6cb8fa9e3fc10a7999c6e36
 2016-04-21 00:36:36 +00:00
Philip P. Moltmann
458216854a Merge "Prevent printing from finishing activity." into nyc-dev 
am: 41304f47f4

* commit '41304f47f4d5d6cdd4d160c9553f47b1e641aff8':
  Prevent printing from finishing activity.

Change-Id: Ia3de45edab34f91a0da0f0474c8e870f3f132e45
 2016-04-21 00:34:36 +00:00
Philip P. Moltmann
41304f47f4 Merge "Prevent printing from finishing activity." into nyc-dev 2016-04-21 00:31:42 +00:00
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
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
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
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
Vladislav Kaznacheev
24d1f99711 Merge "Add JavaDoc for View.updateDragShadow" into nyc-dev am: 2860936 
am: 1a5cc60b39

* commit '1a5cc60b3968d54b9c7bf4e6883b3b4ca55821ca':
  Add JavaDoc for View.updateDragShadow

Change-Id: I07bfcff42ea12ae0260c850012d936121b3d3ea6
 2016-04-21 00:17:45 +00:00
Eino-Ville Talvala
4006ef1d6f Merge "Camera2: Ignore exception on double-completed capture sequences." into nyc-dev am: 5856779 
am: 896a1a42f7

* commit '896a1a42f708eee4c70e0e99f47bcb304311e3c0':
  Camera2: Ignore exception on double-completed capture sequences.

Change-Id: I2375878fba957134228ab0c45bf396e69c820320
 2016-04-21 00:17:30 +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
Shreyas Basarge
b0c83ec062 Fix logspam by JobInfo 
Print interval clamp message
only for periodic jobs having
period/flex less than the minimum value.

Bug: 28296128
Change-Id: Id0d7c3b56048582a490bb8214eca491ec2bbdc93
 2016-04-21 00:44:58 +01: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
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
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
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
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
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