git.osdn.net Git - android-x86/frameworks-base.git/log

Rob Carr [Thu, 21 Apr 2016 00:23:54 +0000 (00:23 +0000)]

Merge "Prevent recents from closing while moving PiP to fullscreen." into nyc-dev am: abadeba99a
am: d762b90312

* commit 'd762b903127d11768f5c47350966105c658d22e0':

Change-Id: I65e837f14aee6eb238834ef7d50886e7f5bc2449

commit | commitdiff | tree

Suprabh Shukla [Thu, 21 Apr 2016 00:23:49 +0000 (00:23 +0000)]

Merge "Removing disk access from startActivity thread" into nyc-dev am: 6c0ead993e
am: 52746e79f8

* commit '52746e79f888721354941ae0e37451e6e9b9162d':

Change-Id: I37ea2eb58efd50593018f1161f488b68f525eebd

commit | commitdiff | tree

Eino-Ville Talvala [Thu, 21 Apr 2016 00:23:44 +0000 (00:23 +0000)]

Merge "Camera2: Ignore exception on double-completed capture sequences." into nyc-dev am: 5856779c3a
am: a6587338ea

* commit 'a6587338ea17c17ca94da9b8584813bf8e7f858c':

Change-Id: I3cbbadfc867e792710d506e2a291c75e8556a1c7

commit | commitdiff | tree

Adrian Roos [Thu, 21 Apr 2016 00:23:38 +0000 (00:23 +0000)]

Merge "Fix inline reply clobbering when narrowly missing send button" into nyc-dev am: 75fe7d5d79
am: f4c21179ac

* commit 'f4c21179ac2fa0da375ba7c7dad6a466d47a6277':

Change-Id: I9e45dec7a37d201897b0448c73246808bccbb420

commit | commitdiff | tree

Felipe Leme [Thu, 21 Apr 2016 00:23:31 +0000 (00:23 +0000)]

Merge "Set BugreportProgressService to run on foreground." into nyc-dev am: 3053c3f2a9
am: 13e3b2bc78

* commit '13e3b2bc7899899674551d3a1cdc926ba905e926':

Change-Id: I5b4eecf49e431eac9ed38d6d2b68e1bad9fb39b6

commit | commitdiff | tree

Robert Carr [Thu, 21 Apr 2016 00:18:13 +0000 (00:18 +0000)]

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

commit | commitdiff | tree

Suprabh Shukla [Thu, 21 Apr 2016 00:18:04 +0000 (00:18 +0000)]

Merge "Removing disk access from startActivity thread" into nyc-dev
am: 6c0ead993e

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

Change-Id: I0115c5a8c9f7c1550f09ac8b9c1025f83e09bace

commit | commitdiff | tree

Eino-Ville Talvala [Thu, 21 Apr 2016 00:17:55 +0000 (00:17 +0000)]

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

commit | commitdiff | tree

Adrian Roos [Thu, 21 Apr 2016 00:17:46 +0000 (00:17 +0000)]

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

commit | commitdiff | tree

Vladislav Kaznacheev [Thu, 21 Apr 2016 00:17:45 +0000 (00:17 +0000)]

Merge "Add JavaDoc for View.updateDragShadow" into nyc-dev am: 2860936
am: 1a5cc60b39

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

Change-Id: I07bfcff42ea12ae0260c850012d936121b3d3ea6

commit | commitdiff | tree

Felipe Leme [Thu, 21 Apr 2016 00:17:40 +0000 (00:17 +0000)]

Merge "Set BugreportProgressService to run on foreground." into nyc-dev
am: 3053c3f2a9

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

Change-Id: I6ff60394218bceac0fdd4eed4839f5819f532180

commit | commitdiff | tree

Rob Carr [Thu, 21 Apr 2016 00:17:40 +0000 (00:17 +0000)]

Merge "Prevent recents from closing while moving PiP to fullscreen." into nyc-dev am: abadeba
am: 63278b4ebe

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

Change-Id: Ife12f301828d84f76c8594a1e852f3886a533a78

commit | commitdiff | tree

Suprabh Shukla [Thu, 21 Apr 2016 00:17:35 +0000 (00:17 +0000)]

Merge "Removing disk access from startActivity thread" into nyc-dev am: 6c0ead9
am: 2537c274e1

* commit '2537c274e10b9429056e2deaf1d1d40ae500ed4b':
Removing disk access from startActivity thread

Change-Id: Ie5fca445c5e2f507a4a5bcf99fd25898cd5d2e23

commit | commitdiff | tree

Eino-Ville Talvala [Thu, 21 Apr 2016 00:17:30 +0000 (00:17 +0000)]

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

commit | commitdiff | tree

Adrian Roos [Thu, 21 Apr 2016 00:17:24 +0000 (00:17 +0000)]

Merge "Fix inline reply clobbering when narrowly missing send button" into nyc-dev am: 75fe7d5
am: e93ff33338

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

Change-Id: Ic5e8257d05487a91828cf2acbdfcf9637e24c40e

commit | commitdiff | tree

Felipe Leme [Thu, 21 Apr 2016 00:17:17 +0000 (00:17 +0000)]

Merge "Set BugreportProgressService to run on foreground." into nyc-dev am: 3053c3f
am: 10dcbecd8c

* commit '10dcbecd8c14f82f9da5787afdf9663c3867c82d':
Set BugreportProgressService to run on foreground.

Change-Id: Iabd7b03e8af7da7fa7aaf25b6c5a2e25586d48b3

commit | commitdiff | tree

Vladislav Kaznacheev [Thu, 21 Apr 2016 00:11:28 +0000 (00:11 +0000)]

Merge "Add JavaDoc for View.updateDragShadow" into nyc-dev
am: 2860936

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

Change-Id: I9aa23cafbeedf21e2cbca4e84adc0b424f7cfec0

commit | commitdiff | tree

Robert Carr [Thu, 21 Apr 2016 00:11:27 +0000 (00:11 +0000)]

Merge "Prevent recents from closing while moving PiP to fullscreen." into nyc-dev
am: abadeba

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

Change-Id: I97fa47524a1c78aa637fee4d6a086dec966698e7

commit | commitdiff | tree

Suprabh Shukla [Thu, 21 Apr 2016 00:03:13 +0000 (00:03 +0000)]

Merge "Removing disk access from startActivity thread" into nyc-dev
am: 6c0ead9

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

Change-Id: I7f62940ac1b51109f8804cc92c56dcd2b755340f

commit | commitdiff | tree

Eino-Ville Talvala [Thu, 21 Apr 2016 00:03:11 +0000 (00:03 +0000)]

Merge "Camera2: Ignore exception on double-completed capture sequences." into nyc-dev
am: 5856779

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

Change-Id: Ie22c0bbdc83cba529bf521ebaef3349a5e22b976

commit | commitdiff | tree

TreeHugger Robot [Thu, 21 Apr 2016 00:02:06 +0000 (00:02 +0000)]

Merge "Add JavaDoc for View.updateDragShadow" into nyc-dev

commit | commitdiff | tree

Rob Carr [Thu, 21 Apr 2016 00:00:06 +0000 (00:00 +0000)]

Merge "Prevent recents from closing while moving PiP to fullscreen." into nyc-dev

commit | commitdiff | tree

TreeHugger Robot [Wed, 20 Apr 2016 23:58:01 +0000 (23:58 +0000)]

Merge "Removing disk access from startActivity thread" into nyc-dev

commit | commitdiff | tree

Eino-Ville Talvala [Wed, 20 Apr 2016 23:55:09 +0000 (23:55 +0000)]

Merge "Camera2: Ignore exception on double-completed capture sequences." into nyc-dev

commit | commitdiff | tree

Henrik Baard [Wed, 20 Apr 2016 23:48:40 +0000 (23:48 +0000)]

Merge "Doze settings example not matching real keys" am: 570a13f am: 790699d
am: 2988b8f6

* commit '2988b8f641e9d9602cc6ebdd1fad388a57a5f6ec':
Doze settings example not matching real keys

Change-Id: Ia83d408d2aa7d45d244e1c46f0852eed1f529670

commit | commitdiff | tree

Adrian Roos [Wed, 20 Apr 2016 23:44:54 +0000 (23:44 +0000)]

Merge "Fix inline reply clobbering when narrowly missing send button" into nyc-dev
am: 75fe7d5

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

Change-Id: I61f9303383937030750edd95eee11862b59e8447

commit | commitdiff | tree

Adam Lesinski [Wed, 20 Apr 2016 23:42:01 +0000 (23:42 +0000)]

Merge "Doze settings example not matching real keys" am: 570a13f
am: 790699d

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

Change-Id: I5c1a0757f5db2ba3ca2fcf37e77641ac820fbe6f

commit | commitdiff | tree

TreeHugger Robot [Wed, 20 Apr 2016 23:39:50 +0000 (23:39 +0000)]

Merge "Fix inline reply clobbering when narrowly missing send button" into nyc-dev

commit | commitdiff | tree

Felipe Leme [Wed, 20 Apr 2016 23:33:28 +0000 (23:33 +0000)]

Merge "Set BugreportProgressService to run on foreground." into nyc-dev
am: 3053c3f

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

Change-Id: Ib5b92dfcaf3dca5710abc19f261fed8017fcae1f

commit | commitdiff | tree

Adam Lesinski [Wed, 20 Apr 2016 23:30:36 +0000 (23:30 +0000)]

Merge "ResourcesManager: Throw exception if failed to load asset path" into nyc-dev am: 1362ae0
am: 4892e3e

* commit '4892e3e1d96e3dad0f40a76742200d1cfc5f1b5e':

Change-Id: Ia6ae5b19122ecaf8bd4c20d4b7bfdfd2c1c59a4a

commit | commitdiff | tree

Lifu Tang [Wed, 20 Apr 2016 23:30:33 +0000 (23:30 +0000)]

Merge "Added defensive code to prevent system crash" into nyc-dev am: a381455
am: 7742264

* commit '77422649f1cd565d6238a02da260dd6e087899e5':

Change-Id: I22ea4e5863b0684cf3198afea1a6408e85ef8df8

commit | commitdiff | tree

Lifu Tang [Wed, 20 Apr 2016 23:30:30 +0000 (23:30 +0000)]

Merge "Fixed bug in upgrading GpsMeasurement" into nyc-dev am: e1b5171
am: 4eb3607

* commit '4eb3607eb80c93ed4016a7e4af8d1c129b3af186':

Change-Id: I7db306588c908077948fcf95b3371496eecbb343

commit | commitdiff | tree

Chris Tate [Wed, 20 Apr 2016 23:30:26 +0000 (23:30 +0000)]

Merge "Don\'t back up wallpapers that we\'ve been told not to" into nyc-dev am: 665189f
am: a767ce6

* commit 'a767ce6a8638a076af2a87d0e7a150f0bb8ea65a':

Change-Id: I7ed70c86aeefef037dc591598276f488c158bb0e

commit | commitdiff | tree

Christopher Tate [Wed, 20 Apr 2016 23:30:21 +0000 (23:30 +0000)]

resolve merge conflicts of 44e07e0 to mnc-dev am: 825b713 am: 8c635e7 am: 343600c am: b965ced -s ours am: 129c01a
am: e3e398f

* commit 'e3e398f1964fa4a67d3ffad43110a78093f506d6':

Change-Id: Ibd25d682faea1fef51d33cfa871b64f0b6b0414f

commit | commitdiff | tree

Rob Carr [Wed, 20 Apr 2016 23:30:15 +0000 (23:30 +0000)]

Merge "Do not prematurely update position while bounds animating." into nyc-dev am: 5a6c58e
am: 55db403

* commit '55db403c76ca2fb706352dcc7a9d861170e6d400':

Change-Id: I0b778a4c4bb7fa9525ccf41f900f8a7bd421f070

commit | commitdiff | tree

Jim Miller [Wed, 20 Apr 2016 23:30:08 +0000 (23:30 +0000)]

Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev am: 54c4374
am: 3978135

* commit '3978135639e56889405ed949f94faa224c57246c':

Change-Id: Ifa013b5139b29e44ed896015f45464678cd3b146

commit | commitdiff | tree

Phil Burk [Wed, 20 Apr 2016 23:30:00 +0000 (23:30 +0000)]

Merge "MidiDevice: do not open ports on closed device" into nyc-dev am: 2faac0d
am: a0d18fe

* commit 'a0d18fe9341ac0239b0be035f2a1deaf2661bf86':

Change-Id: I540b2734c12cb0cfc03ce7818ca9eb0dfc9e70ba

commit | commitdiff | tree

Fyodor Kupolov [Wed, 20 Apr 2016 23:29:52 +0000 (23:29 +0000)]

Merge "Test coverage for new FBE functionality" into nyc-dev am: 366a457
am: e2cd249

* commit 'e2cd2496a9c6f4ea4d846083098feaf1d64f4dea':

Change-Id: Iab2687ff5c97ab5d2294bf6ba7948a255d70e4b0

commit | commitdiff | tree

Ruchi Kandoi [Wed, 20 Apr 2016 23:29:44 +0000 (23:29 +0000)]

Merge "Revert "PowerManager: Adds the Sustained performance API."" into nyc-dev am: 0fea8ad
am: 9043031

* commit '904303190b44efc862af2f86e23826baa37409ee':

Change-Id: Ieadc185f59f41530c8b6fb7bdd841636445894cb

commit | commitdiff | tree

TreeHugger Robot [Wed, 20 Apr 2016 23:23:10 +0000 (23:23 +0000)]

Merge "Set BugreportProgressService to run on foreground." into nyc-dev

commit | commitdiff | tree

Adam Lesinski [Wed, 20 Apr 2016 23:00:21 +0000 (23:00 +0000)]

Merge "ResourcesManager: Throw exception if failed to load asset path" into nyc-dev am: 1362ae0
am: 40c6118

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

Change-Id: I609d2b2a22ecb274c21a413edabd7ac4b28fbc94

commit | commitdiff | tree

Adam Lesinski [Wed, 20 Apr 2016 22:56:11 +0000 (22:56 +0000)]

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

commit | commitdiff | tree

Adam Lesinski [Wed, 20 Apr 2016 22:56:11 +0000 (22:56 +0000)]

commit | commitdiff | tree

Henrik Baard [Wed, 20 Apr 2016 22:51:47 +0000 (22:51 +0000)]

Merge "Doze settings example not matching real keys"
am: 570a13f

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

Change-Id: I62dade8bece244e9033a230c1f116f8caad35a6f

commit | commitdiff | tree

Adam Lesinski [Wed, 20 Apr 2016 22:46:04 +0000 (22:46 +0000)]

Merge "ResourcesManager: Throw exception if failed to load asset path" into nyc-dev

commit | commitdiff | tree

Lifu Tang [Wed, 20 Apr 2016 22:40:32 +0000 (22:40 +0000)]

Merge "Added defensive code to prevent system crash" into nyc-dev am: a381455
am: ffc60f5

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

Change-Id: I69f9c44526cd8ef5d38f17e282bb99fd8180efbc

commit | commitdiff | tree

Lifu Tang [Wed, 20 Apr 2016 22:40:29 +0000 (22:40 +0000)]

Merge "Fixed bug in upgrading GpsMeasurement" into nyc-dev am: e1b5171
am: 428b882

* commit '428b882710903d73326cf63dc9ba66e9bb0261e1':
Fixed bug in upgrading GpsMeasurement

Change-Id: Ia964a22937d2b1a34648d3dcc1a04df7c290a1b9

commit | commitdiff | tree

Adam Lesinski [Wed, 20 Apr 2016 22:37:18 +0000 (22:37 +0000)]

Merge "Doze settings example not matching real keys"

commit | commitdiff | tree

Chris Tate [Wed, 20 Apr 2016 22:31:24 +0000 (22:31 +0000)]

Merge "Don\'t back up wallpapers that we\'ve been told not to" into nyc-dev am: 665189f
am: 9e92c03

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

Change-Id: Ife6123b4b6627b9e1b2607fb8a3f63e3128c3e2d

commit | commitdiff | tree

Christopher Tate [Wed, 20 Apr 2016 22:31:23 +0000 (22:31 +0000)]

resolve merge conflicts of 44e07e0 to mnc-dev am: 825b713 am: 8c635e7 am: 343600c am: b965ced -s ours am: 129c01a
am: 88499d6

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

Change-Id: Id31786b8f2f905e41e31dd7f1f8315f8dc519980

commit | commitdiff | tree

Lifu Tang [Wed, 20 Apr 2016 22:30:55 +0000 (22:30 +0000)]

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

commit | commitdiff | tree

Lifu Tang [Wed, 20 Apr 2016 22:30:53 +0000 (22:30 +0000)]

commit | commitdiff | tree

Lifu Tang [Wed, 20 Apr 2016 22:30:53 +0000 (22:30 +0000)]

Merge "Fixed bug in upgrading GpsMeasurement" into nyc-dev
am: e1b5171

* commit 'e1b51715bdd1d59913ef4cb83071ef8eaac968de':
Fixed bug in upgrading GpsMeasurement

Change-Id: Ic20b5232d5114486dbefb5c4adf1409ecf1b3870

commit | commitdiff | tree

Lifu Tang [Wed, 20 Apr 2016 22:30:52 +0000 (22:30 +0000)]

commit | commitdiff | tree

Suprabh Shukla [Wed, 20 Apr 2016 22:24:31 +0000 (15:24 -0700)]

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

commit | commitdiff | tree

Lifu Tang [Wed, 20 Apr 2016 22:19:17 +0000 (22:19 +0000)]

Merge "Added defensive code to prevent system crash" into nyc-dev

commit | commitdiff | tree

Lifu Tang [Wed, 20 Apr 2016 22:19:04 +0000 (22:19 +0000)]

Merge "Fixed bug in upgrading GpsMeasurement" into nyc-dev

commit | commitdiff | tree

Christopher Tate [Wed, 20 Apr 2016 22:13:17 +0000 (22:13 +0000)]

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

commit | commitdiff | tree

Rob Carr [Wed, 20 Apr 2016 22:13:16 +0000 (22:13 +0000)]

Merge "Do not prematurely update position while bounds animating." into nyc-dev am: 5a6c58e
am: bef4823

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

Change-Id: Ieca9090311764dc5c2c05605017541a19f3069a8

commit | commitdiff | tree

Christopher Tate [Wed, 20 Apr 2016 22:13:15 +0000 (22:13 +0000)]

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

commit | commitdiff | tree

Jim Miller [Wed, 20 Apr 2016 22:13:15 +0000 (22:13 +0000)]

Merge "Fix bug where fingerprint for wrong userId was attempted to be removed." into nyc-dev am: 54c4374
am: 5480783

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

Change-Id: I950f1eccdff2daaf7fabc2f8492691209b7b3f7a

commit | commitdiff | tree

Phil Burk [Wed, 20 Apr 2016 22:13:13 +0000 (22:13 +0000)]

Merge "MidiDevice: do not open ports on closed device" into nyc-dev am: 2faac0d
am: 10f1740

* commit '10f1740c1cff279518a53c30d4eafe563a452033':
MidiDevice: do not open ports on closed device

Change-Id: I98ea3953e313bdb6644ce1546e38de7b6dc4f25d

commit | commitdiff | tree

Fyodor Kupolov [Wed, 20 Apr 2016 22:13:09 +0000 (22:13 +0000)]

Merge "Test coverage for new FBE functionality" into nyc-dev am: 366a457
am: fb91c83

* commit 'fb91c8315296b9ec0c7a173752c62ca1d38eb4f9':
Test coverage for new FBE functionality

Change-Id: I2e974d082ed8ced006081714e924dd32c6827904

commit | commitdiff | tree

Christopher Tate [Wed, 20 Apr 2016 22:13:08 +0000 (22:13 +0000)]

commit | commitdiff | tree

Christopher Tate [Wed, 20 Apr 2016 22:13:07 +0000 (22:13 +0000)]

commit | commitdiff | tree

Chris Tate [Wed, 20 Apr 2016 22:10:38 +0000 (22:10 +0000)]

Merge "Don't back up wallpapers that we've been told not to" into nyc-dev

commit | commitdiff | tree

Christopher Tate [Wed, 20 Apr 2016 22:09:28 +0000 (22:09 +0000)]

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

commit | commitdiff | tree

Eino-Ville Talvala [Wed, 20 Apr 2016 22:05:40 +0000 (15:05 -0700)]

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

commit | commitdiff | tree

Robert Carr [Wed, 20 Apr 2016 21:52:39 +0000 (21:52 +0000)]

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

commit | commitdiff | tree

Jim Miller [Wed, 20 Apr 2016 21:52:36 +0000 (21:52 +0000)]

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

commit | commitdiff | tree

Phil Burk [Wed, 20 Apr 2016 21:52:33 +0000 (21:52 +0000)]

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

commit | commitdiff | tree

Fyodor Kupolov [Wed, 20 Apr 2016 21:52:30 +0000 (21:52 +0000)]

Merge "Test coverage for new FBE functionality" into nyc-dev
am: 366a457

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

Change-Id: I4f271c0046a96642cfb8f5c81ca5c6a7c41d7062

commit | commitdiff | tree

Ruchi Kandoi [Wed, 20 Apr 2016 21:49:01 +0000 (21:49 +0000)]

Merge "Revert "PowerManager: Adds the Sustained performance API."" into nyc-dev am: 0fea8ad
am: 4c24df5

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

Change-Id: Ia93df4f83b8b8f3c428eeae95cefc0cfc6fb26c6

commit | commitdiff | tree

Shubham Ajmera [Wed, 20 Apr 2016 21:48:58 +0000 (21:48 +0000)]

Merge "Track libcore change e2270147c6ddfb164776b68295078a5e6c6dfee7" into nyc-dev am: f3d5a4d
am: 958e98c

* commit '958e98c62e69e552d10cf133537a1d7125e03abd':

Change-Id: Iae7af44bd7b5b264253f4a891aa3c0c417dfa107

commit | commitdiff | tree

Chong Zhang [Wed, 20 Apr 2016 21:48:52 +0000 (21:48 +0000)]

Merge "Fix IME adjust when stack focus changes while IME is visible" into nyc-dev am: 3966fb9
am: 7f30d90

* commit '7f30d908f1af66d673f723fa47c4292a7f94aa67':

Change-Id: I4055f5964bd0c7ae8e9e8a579e96afc6d09ab949

commit | commitdiff | tree

Christopher Tate [Wed, 20 Apr 2016 21:48:43 +0000 (21:48 +0000)]

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

commit | commitdiff | tree

Ruchi Kandoi [Wed, 20 Apr 2016 21:48:43 +0000 (21:48 +0000)]

Merge "window: Adds a Sustained Performance Mode window flag." into nyc-dev am: a645c97
am: 5e292bf

* commit '5e292bf51f1c6aea579053a9ecbecb718d4f6255':

Change-Id: I01363420af212a215a97f279369f286c1ca66744

commit | commitdiff | tree

Ruben Brunk [Wed, 20 Apr 2016 21:48:34 +0000 (21:48 +0000)]

Merge "Add settings for altering VR display behavior." into nyc-dev am: 6ada702
am: 2fbf2b7

* commit '2fbf2b701e51c21eb837814dbb5e0201337a7b9d':

Change-Id: I874e2d29f451b126ab65818524105d8e44febb9f

commit | commitdiff | tree

Daniel Estrada Alva [Wed, 20 Apr 2016 21:48:26 +0000 (21:48 +0000)]

Merge "Add support for multiple callback registration in." into nyc-dev am: fdb26b9
am: 9737ba1

* commit '9737ba1153baa902a89ea74fbd209687d62af94b':

Change-Id: I3a11621407ba3852707c341f1ec4b2bb881260b5

commit | commitdiff | tree

Dongwon Kang [Wed, 20 Apr 2016 21:48:17 +0000 (21:48 +0000)]

Merge "TIF: Do not build input list for background user" into nyc-dev am: 4a6bd4b
am: 9ab7665

* commit '9ab76653da8bcde9229b28c15a4f0f190267d456':

Change-Id: Ic2cce91b8fff0447d6c48a97dae0aca9166773d0

commit | commitdiff | tree

Julia Reynolds [Wed, 20 Apr 2016 21:48:05 +0000 (21:48 +0000)]

Merge "Align radio buttons with app icon, change text color." into nyc-dev am: 1ff2412
am: 08738a2

* commit '08738a2f553fed389db81d02c3a93c45945bca74':

Change-Id: I13b6f20f6a48a7221b0c2d590ae36d1f740496e2

commit | commitdiff | tree

Julia Reynolds [Wed, 20 Apr 2016 21:47:45 +0000 (21:47 +0000)]

Merge "Animate volume dialog expansion/contraction." into nyc-dev am: e86ac2f
am: 460f707

* commit '460f707e152a8204b14f3ffcb35330aeadc3a4e7':

Change-Id: I06f35e3b66bd30f1cd3363886506ea16084006e3

commit | commitdiff | tree

TreeHugger Robot [Wed, 20 Apr 2016 21:47:26 +0000 (21:47 +0000)]

Merge "Only try to add details to zip once." into nyc-dev am: 0304688
am: 39dd493

* commit '39dd4939ab26469ab2bc63c4a497960df24ec741':

Change-Id: I8da4c5193b451eb93302861856039fac18c51bcf

commit | commitdiff | tree

Mitchell Wills [Wed, 20 Apr 2016 21:46:09 +0000 (21:46 +0000)]

Update scan and last network info in the WorkThread am: cf0875a am: c441faa am: 2dbac6c am: de629c7
am: dde6195

* commit 'dde619510c6c920441a4f1954045aa4759331ef1':

Change-Id: I387b87824e499a201fbee64e6d713396faf28556

commit | commitdiff | tree

Andreas Gampe [Wed, 20 Apr 2016 21:45:37 +0000 (21:45 +0000)]

Merge "Frameworks/base: Add holder to BaseBundle" into nyc-dev am: 58f2072
am: c17adf6

* commit 'c17adf62e56f3a42174c81110d170542371a0a25':

Change-Id: I92ebb39ea86928a15db8659debf97bebb923f608

commit | commitdiff | tree

Trevor Johns [Wed, 20 Apr 2016 21:45:16 +0000 (21:45 +0000)]

Merge changes from topic \'merge_docs_nyc-dev\' into nyc-dev am: 59c9a93
am: c0d2c43

* commit 'c0d2c43a22c9a0feda8d651d432aa3893e0cf952':

Change-Id: I239987188f9bc78b0986b9cf5946decf960c72c4

commit | commitdiff | tree

Rob Carr [Wed, 20 Apr 2016 21:45:00 +0000 (21:45 +0000)]

Merge "When restacking IM windows preserve relative order." into nyc-dev am: db973df
am: 24cd97a

* commit '24cd97aba3cc388ec639a4627e67e96dc4e65ac1':

Change-Id: I6c0218cb177ce43599ff706f89a84764f8ce99d7

commit | commitdiff | tree

Rob Carr [Wed, 20 Apr 2016 21:44:43 +0000 (21:44 +0000)]

Merge "Respect WRAP_CONTENT when resolving drop down position." into nyc-dev am: 5a2554a
am: 287dfb6

* commit '287dfb665a04822513d4c1522abaa04c58c60c76':

Change-Id: I237aee62a9482fa86260bb4c8d1cac098d880f28

Merge "Track libcore change be1608980825868eb1c70fab6eb86fe06bd304ce" into nyc-dev am: 8c205b5
am: 15d254c

* commit '15d254ca74aa054c8eb17f8e8a5fdabaaa9b8daf':

Change-Id: Ib45f938a9604c972651f6eab41ee8c367039665b

commit | commitdiff | tree

Sudheer Shanka [Wed, 20 Apr 2016 21:44:07 +0000 (21:44 +0000)]

Merge "Add restrictedSwitchSummary attribute to restricted switch preferences." into nyc-dev am: df9ecfc
am: 6aea488

* commit '6aea4883c05f525efff9fb5224bee3bfdad9d244':

Change-Id: Icb2c53901885317bf87d0e02dd9ecd5a64ec5c6f

Merge "ExifInterface: Fix a bug to return only a JPEG-compressed thumbnail" into nyc-dev am: 801d416
am: b3f8a96

* commit 'b3f8a968e27779a0f4cfe0864af4df6f8bdbefe0':

Change-Id: Icce3264882498f0690e508ba71b2ab08a2cd4bdf

commit | commitdiff | tree

Felipe Leme [Fri, 15 Apr 2016 19:49:34 +0000 (12:49 -0700)]

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

commit | commitdiff | tree

Sudheer Shanka [Wed, 20 Apr 2016 21:43:27 +0000 (21:43 +0000)]

Merge "Fix additional summary of RestrictedSwitchPreference." into nyc-dev am: 205d10b
am: fc6317d

* commit 'fc6317db844fe6c6fbc549461ff02070e8b06af4':

Change-Id: I405e258e02efc852e65d27eaf4c3d0bf45f26b45

commit | commitdiff | tree

Robert Carr [Wed, 20 Apr 2016 21:43:21 +0000 (21:43 +0000)]

commit | commitdiff | tree

Jim Miller [Wed, 20 Apr 2016 21:43:19 +0000 (21:43 +0000)]

commit | commitdiff | tree

Christopher Tate [Wed, 20 Apr 2016 21:43:17 +0000 (21:43 +0000)]

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

commit | commitdiff | tree

Jason Monk [Wed, 20 Apr 2016 21:43:05 +0000 (21:43 +0000)]

Merge "Daydream -> screen saver" into nyc-dev am: eeaaf26
am: 22c837e

* commit '22c837e8fc2f67bb90a871e9fb818e41c6ac4c74':

Change-Id: I834d0da5a498860f06de820a643f9ffa365af468

commit | commitdiff | tree

TreeHugger Robot [Wed, 20 Apr 2016 21:42:40 +0000 (21:42 +0000)]

Merge "Added onRestrictBackgroundWhitelistChanged callback." into nyc-dev am: 9724fba
am: eac7508

* commit 'eac7508a543f54a5e750557af0bd68735a961fac':

Change-Id: I2b3381b6f351a3f9dffa2b0ae1c2d50688b9ad85

commit | commitdiff | tree

Jason Monk [Wed, 20 Apr 2016 21:42:10 +0000 (21:42 +0000)]

Merge "Allow QS details to scroll when the screen is really small" into nyc-dev am: 10ea519
am: 3defe5a

* commit '3defe5a4bbb4fcf5436e06185c7f040923284f1d':

Change-Id: Id646cf41c2999b6d5cf02f61b8ab285b6c4de39c

commit | commitdiff | tree

Vladislav Kaznacheev [Wed, 20 Apr 2016 21:41:24 +0000 (21:41 +0000)]

Merge "Send ACTION_DRAG_EXITED when the pointer moves over a non-touchable window" into nyc-dev am: c8df6aa
am: b1b9297

* commit 'b1b9297d61912d63f8bb481edc93b3f1ee42f736':

Change-Id: I4909bcdb20ab388b950334e2051b9eab0cf9c27f