244548 Commits

Author SHA1 Message Date
Adrian Roos
6d5dfa3977 Merge "A11y: Fix battery icon and clock descriptions" into nyc-dev
am: 206748d10e

* commit '206748d10e5f3b42e198af6a2e0801fb47ec3c01':
  A11y: Fix battery icon and clock descriptions

Change-Id: I92f4bad9e6224fdafd7a48e3ceec3452c7150e03
2016-04-21 00:34:33 +00:00
TreeHugger Robot
206748d10e Merge "A11y: Fix battery icon and clock descriptions" into nyc-dev 2016-04-21 00:25:16 +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
Jorim Jaggi
a44352598e Merge "Disallow changing stacks if top activity" into nyc-dev
am: 1fa356289e

* commit '1fa356289e50d9a48d84afe831b230b087870e76':
  Disallow changing stacks if top activity

Change-Id: I9ae3ec2054b835724fead6ec8a940b228018ffba
2016-04-21 00:23:30 +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
Robert Carr
d762b90312 Merge "Prevent recents from closing while moving PiP to fullscreen." into nyc-dev
am: abadeba99a

* commit 'abadeba99afbb1d80a38b396407822c96c7e3706':
  Prevent recents from closing while moving PiP to fullscreen.

Change-Id: I672c73f0a60fd37498e647edec42c8be3e10780e
2016-04-21 00:18:13 +00:00
Suprabh Shukla
52746e79f8 Merge "Removing disk access from startActivity thread" into nyc-dev
am: 6c0ead993e

* commit '6c0ead993e48f6e260972171b1187ef77b6094fb':
  Removing disk access from startActivity thread

Change-Id: I0115c5a8c9f7c1550f09ac8b9c1025f83e09bace
2016-04-21 00:18:04 +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
Adrian Roos
f4c21179ac Merge "Fix inline reply clobbering when narrowly missing send button" into nyc-dev
am: 75fe7d5d79

* commit '75fe7d5d791d8372af9d2e11a50287e6119a9780':
  Fix inline reply clobbering when narrowly missing send button

Change-Id: I4edee46cb06a4c6f7beadab5e8a56cdc902fdbec
2016-04-21 00:17:46 +00:00
Felipe Leme
13e3b2bc78 Merge "Set BugreportProgressService to run on foreground." into nyc-dev
am: 3053c3f2a9

* commit '3053c3f2a94b24ceeed9c46cb84045c285d3523b':
  Set BugreportProgressService to run on foreground.

Change-Id: I6ff60394218bceac0fdd4eed4839f5819f532180
2016-04-21 00:17:40 +00:00
TreeHugger Robot
1fa356289e Merge "Disallow changing stacks if top activity" into nyc-dev 2016-04-21 00:11:50 +00:00
TreeHugger Robot
28609360cf Merge "Add JavaDoc for View.updateDragShadow" into nyc-dev 2016-04-21 00:02:08 +00:00
Rob Carr
abadeba99a Merge "Prevent recents from closing while moving PiP to fullscreen." into nyc-dev 2016-04-21 00:00:09 +00:00
TreeHugger Robot
6c0ead993e Merge "Removing disk access from startActivity thread" into nyc-dev 2016-04-20 23:58:03 +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
TreeHugger Robot
75fe7d5d79 Merge "Fix inline reply clobbering when narrowly missing send button" into nyc-dev 2016-04-20 23:39:52 +00:00
TreeHugger Robot
3053c3f2a9 Merge "Set BugreportProgressService to run on foreground." into nyc-dev 2016-04-20 23:23:11 +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
Adrian Roos
70dcf8392c A11y: Fix battery icon and clock descriptions
Now announces charging state on the battery icon
and AM/PM on the clock.

Change-Id: Ib8d249e60b555834e5e224287ea332178ce7c165
Fixes: 27552350
2016-04-20 15:51:59 -07: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
Jorim Jaggi
4ad9856eb8 Disallow changing stacks if top activity
When we attach an activity to an existing
task, and that task is already on top,
disallow changing stacks altogether even
if launch stack id is set.

Bug: 28026847
Change-Id: Ie70f0585a29dc1b85a5093624fede32110be3c76
2016-04-20 22:39:12 +00:00
Adam Lesinski
570a13f0cb Merge "Doze settings example not matching real keys" 2016-04-20 22:37:18 +00:00
Lifu Tang
ffc60f50be Merge "Added defensive code to prevent system crash" into nyc-dev
am: a381455

* commit 'a381455472a814c8dbd98fcb4312f46ed1373c88':
  Added defensive code to prevent system crash

Change-Id: I97dd4a994c86bf9bc845de08a8ff9c303bb86240
2016-04-20 22:30:55 +00:00
Lifu Tang
428b882710 Merge "Fixed bug in upgrading GpsMeasurement" into nyc-dev
am: e1b5171

* commit 'e1b51715bdd1d59913ef4cb83071ef8eaac968de':
  Fixed bug in upgrading GpsMeasurement

Change-Id: Ic20b5232d5114486dbefb5c4adf1409ecf1b3870
2016-04-20 22:30:53 +00:00
Suprabh Shukla
dc4b80dde4 Removing disk access from startActivity thread
Code was checking whether the directory for recent_images existed in
many places unnecessarily causing StrictMode violations. Moved the
code to only attempt to check and create the directory before
actually writing to disk.

Bug: b/28195831
Change-Id: I05f77a10f1dafc8cc0b1836b62352d56549ac1ee
2016-04-20 15:27:42 -07:00
Lifu Tang
a381455472 Merge "Added defensive code to prevent system crash" into nyc-dev 2016-04-20 22:19:19 +00:00
Lifu Tang
e1b51715bd Merge "Fixed bug in upgrading GpsMeasurement" into nyc-dev 2016-04-20 22:19: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
Christopher Tate
88499d6983 resolve merge conflicts of 44e07e0 to mnc-dev am: 825b713 am: 8c635e7 am: 343600c am: b965ced -s ours
am: 129c01a

* commit '129c01af82df8560f9db9c990651e54689e55274':
  Kill the real/isolated uid group, not the ApplicationInfo uid

Change-Id: Iea83a750479615a4cec01179b8df2f4880c61cc6
2016-04-20 22:13:15 +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
Christopher Tate
129c01af82 resolve merge conflicts of 44e07e0 to mnc-dev am: 825b713 am: 8c635e7 am: 343600c
am: b965ced  -s ours

* commit 'b965ced011bdd7a3ec5450f93d1c58b889514f11':
  Kill the real/isolated uid group, not the ApplicationInfo uid

Change-Id: Idf9a9824d411ca2b178fadda040f46864bc96a58
2016-04-20 22:09:28 +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
Robert Carr
bef48230fd Merge "Do not prematurely update position while bounds animating." into nyc-dev
am: 5a6c58e

* commit '5a6c58e00202ed83cd60a02cd6a79da65598b655':
  Do not prematurely update position while bounds animating.

Change-Id: I35f86944de95f50947384ba104e91d7d4a85f58b
2016-04-20 21:52:39 +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
Phil Burk
10f1740c1c Merge "MidiDevice: do not open ports on closed device" into nyc-dev
am: 2faac0d

* commit '2faac0d74169ddc1f54f9cd356dc23b96a74c9eb':
  MidiDevice: do not open ports on closed device

Change-Id: I6f98e504d682a5902dd29f5fa54023e7a8bc9814
2016-04-20 21:52:33 +00:00
Fyodor Kupolov
fb91c83152 Merge "Test coverage for new FBE functionality" into nyc-dev
am: 366a457

* commit '366a457b6da6caf3d376a8ef0be6a386aee5c216':
  Test coverage for new FBE functionality

Change-Id: I4f271c0046a96642cfb8f5c81ca5c6a7c41d7062
2016-04-20 21:52:30 +00:00
Christopher Tate
b965ced011 resolve merge conflicts of 44e07e0 to mnc-dev am: 825b713 am: 8c635e7
am: 343600c

* commit '343600c3ecff31826e50d40821927e446adb9b0a':
  Kill the real/isolated uid group, not the ApplicationInfo uid

Change-Id: I68dbf8f280672ec9770b6c57b9a17313f448e14a
2016-04-20 21:48:43 +00:00
Felipe Leme
69c53e65b9 Set BugreportProgressService to run on foreground.
BugreportProgressService do not persist the user-provided
information (like details and screenshot paths), so if it's killed by
the framework, that info is lost.

Running it as foreground mitigates the changes of it being killed.

BUG: 27431998
BUG: 28291423
Change-Id: I2f58507beb38309628f2f19d3f7f950d07eca16f
2016-04-20 14:43:37 -07:00
Christopher Tate
343600c3ec resolve merge conflicts of 44e07e0 to mnc-dev am: 825b713
am: 8c635e7

* commit '8c635e73c698302ce6661f227c274164972f048e':
  Kill the real/isolated uid group, not the ApplicationInfo uid

Change-Id: Iae6fe5af0a8e0f27e8b45a56aecc2d722d7c3bc3
2016-04-20 21:43:17 +00:00
Vladislav Kaznacheev
ea4d221c42 Add JavaDoc for View.updateDragShadow
Bug: 28296402
Change-Id: I2aec5ab9932c3177cb08dbf1210abfd949e0dab7
2016-04-20 14:40:32 -07:00
Rob Carr
5a6c58e002 Merge "Do not prematurely update position while bounds animating." into nyc-dev 2016-04-20 21:37:12 +00:00
Christopher Tate
8c635e73c6 resolve merge conflicts of 44e07e0 to mnc-dev
am: 825b713

* commit '825b7134699fbaaa16423c52b7b424d4a9afefb1':
  Kill the real/isolated uid group, not the ApplicationInfo uid

Change-Id: I0c120c8dbf76857985ebea04eadca81fa6470cb2
2016-04-20 21:35:50 +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
Phil Burk
2faac0d741 Merge "MidiDevice: do not open ports on closed device" into nyc-dev 2016-04-20 21:15:33 +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
Shubham Ajmera
958e98c62e Merge "Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7" into nyc-dev
am: f3d5a4d

* commit 'f3d5a4dd60b3ec461e4d9fee97ce99a92cb29b1b':
  Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7

Change-Id: I4b34b2effa629b184ca50453c673b61ea3d6a47b
2016-04-20 21:14:55 +00:00