OSDN Git Service
Baligh Uddin [Thu, 5 Nov 2015 19:54:53 +0000 (19:54 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
70df552ac2 -s ours
am:
f61a22fe5d -s ours
* commit '
f61a22fe5d974ee568ac5b547a45e93f2b0cbcb2':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 19:53:32 +0000 (19:53 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am:
31f0d18a03 -s ours
am:
cb60be1c2a -s ours
* commit '
cb60be1c2ab9ce4bd19250d544b2afb29a6e5f3d':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 19:44:14 +0000 (19:44 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
70df552ac2 -s ours
* commit '
70df552ac2a2154bae5f1420bfd8bbaa4dc08811':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 19:42:53 +0000 (19:42 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am:
31f0d18a03 -s ours
* commit '
31f0d18a03115ba4a112af14fd007a2e9e7c4d72':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 5 Nov 2015 19:32:07 +0000 (19:32 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Baligh Uddin [Thu, 5 Nov 2015 19:32:05 +0000 (19:32 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
Adam Lesinski [Thu, 5 Nov 2015 19:20:05 +0000 (19:20 +0000)]
Merge "AAPT2: Fix small issue with detecting translatable resources"
Chad Brubaker [Thu, 5 Nov 2015 19:05:47 +0000 (19:05 +0000)]
Merge "Add initial network security config implementation" am:
8c35820720 am:
0bafbbfcb4
am:
b4b53b0741
* commit '
b4b53b0741b6ff75842d6630d5d1010c4efa766c':
Add initial network security config implementation
Chad Brubaker [Thu, 5 Nov 2015 18:58:39 +0000 (18:58 +0000)]
Merge "Add initial network security config implementation" am:
8c35820720
am:
0bafbbfcb4
* commit '
0bafbbfcb4cbb6e6f20c0309f5c4242be83f18d7':
Add initial network security config implementation
Adam Lesinski [Wed, 4 Nov 2015 21:51:45 +0000 (13:51 -0800)]
AAPT2: Fix small issue with detecting translatable resources
Change-Id: Idd21b5de4d20be06c6f8c8eb5a22ccd68afc4927
Brian Carlstrom [Thu, 5 Nov 2015 18:55:49 +0000 (18:55 +0000)]
Merge "Fixes for sm and pm usage" am:
ffb15da518 am:
671d5965f7
am:
f73e78fe1c
* commit '
f73e78fe1cb6803a29f7f85b49792f4e8a7350c8':
Fixes for sm and pm usage
Chad Brubaker [Thu, 5 Nov 2015 18:52:46 +0000 (18:52 +0000)]
Merge "Add initial network security config implementation"
am:
8c35820720
* commit '
8c358207206c5e19541c65e3f9761d1adb54550b':
Add initial network security config implementation
Brian Carlstrom [Thu, 5 Nov 2015 18:48:22 +0000 (18:48 +0000)]
Merge "Fixes for sm and pm usage" am:
ffb15da518
am:
671d5965f7
* commit '
671d5965f7b15ecba10453e8f445418dc0e730e6':
Fixes for sm and pm usage
Chad Brubaker [Thu, 5 Nov 2015 18:46:24 +0000 (18:46 +0000)]
Merge "Add initial network security config implementation"
Brian Carlstrom [Thu, 5 Nov 2015 18:42:53 +0000 (18:42 +0000)]
Merge "Fixes for sm and pm usage"
am:
ffb15da518
* commit '
ffb15da518e35727e218bfba48927902d4368e2f':
Fixes for sm and pm usage
Brian Carlstrom [Thu, 5 Nov 2015 18:38:56 +0000 (18:38 +0000)]
Merge "Fixes for sm and pm usage"
Dan Albert [Thu, 5 Nov 2015 18:33:51 +0000 (18:33 +0000)]
Merge "Don\'t apply clang flag to gcc builds." am:
d9a1b35df6 am:
a41288b88f
am:
e0bcc4efe9
* commit '
e0bcc4efe96f196104e6de681b28de295d70fb84':
Don't apply clang flag to gcc builds.
Brian Carlstrom [Thu, 5 Nov 2015 18:33:40 +0000 (10:33 -0800)]
Fixes for sm and pm usage
sm showed IllegalArgumentException after usage.
pm inconsistently used "return showUsage()"
Bug:
20948199
Change-Id: I5828489a9d4ef2eabfb97dd408d66e1560a5a983
Dan Albert [Thu, 5 Nov 2015 18:28:19 +0000 (18:28 +0000)]
Merge "Don\'t apply clang flag to gcc builds." am:
d9a1b35df6
am:
a41288b88f
* commit '
a41288b88f18273a61ed0af977408761598216cf':
Don't apply clang flag to gcc builds.
John Reck [Thu, 5 Nov 2015 18:24:14 +0000 (18:24 +0000)]
Merge "add DeviceInfo"
Dan Albert [Thu, 5 Nov 2015 18:22:57 +0000 (18:22 +0000)]
Merge "Don\'t apply clang flag to gcc builds."
am:
d9a1b35df6
* commit '
d9a1b35df62eddc56f69281aea1534d187b63205':
Don't apply clang flag to gcc builds.
Dan Albert [Thu, 5 Nov 2015 18:18:45 +0000 (18:18 +0000)]
Merge "Don't apply clang flag to gcc builds."
Julia Reynolds [Thu, 5 Nov 2015 18:13:24 +0000 (18:13 +0000)]
Merge "Fix radio button flash on hour change."
John Reck [Thu, 5 Nov 2015 17:22:17 +0000 (09:22 -0800)]
add DeviceInfo
This reverts commit
096895550b9d5430d7a001d491566decf4f9791b.
Change-Id: Ib2ed1e96d8f7f88302f5e27fe735687194553104
Deepanshu Gupta [Thu, 5 Nov 2015 17:29:47 +0000 (17:29 +0000)]
Merge "Fix Switch colors" into mnc-ub-dev am:
71093465ab
am:
ceb2b54909
* commit '
ceb2b549095b5f9a70baef6a0a847b453735f97a':
Fix Switch colors
Deepanshu Gupta [Thu, 5 Nov 2015 17:24:38 +0000 (17:24 +0000)]
Merge "Fix Switch colors" into mnc-ub-dev
am:
71093465ab
* commit '
71093465abbdf887c705b40fb0cb8a2919894c4b':
Fix Switch colors
Deepanshu Gupta [Thu, 5 Nov 2015 17:21:16 +0000 (17:21 +0000)]
Merge "Fix Switch colors" into mnc-ub-dev
Deepanshu Gupta [Thu, 5 Nov 2015 01:49:16 +0000 (17:49 -0800)]
Fix Switch colors
The conversion of the PorterDuff mode from int to enum was incorrect
resulting in the wrong PorterDuff Mode being used.
Change-Id: I7607d505b6e4382e6101869971154f6a77db279c
Filip Gruszczynski [Thu, 5 Nov 2015 17:00:18 +0000 (17:00 +0000)]
Merge "Animate the dock divider appearance/disappearance."
Filip Gruszczynski [Thu, 5 Nov 2015 00:10:54 +0000 (16:10 -0800)]
Animate the dock divider appearance/disappearance.
We want to animate the dock divider appearance only after the entrance
animation of the docked activity finishes, so these two don't clash. For
disappearance they will animate together.
Bug:
24913915
Change-Id: Ibe5c3960f21fcc5e64039b158605fa09017c5c34
Filip Gruszczynski [Thu, 5 Nov 2015 16:49:01 +0000 (16:49 +0000)]
Merge "Split code out from WMS.realyoutWindow."
Julia Reynolds [Thu, 5 Nov 2015 16:08:02 +0000 (11:08 -0500)]
Fix radio button flash on hour change.
Also delete confusing debug variable.
Bug:
25459795
Change-Id: I9208ece4edf5fbcff5f257994f47d81a901766e8
Svetoslav Ganov [Thu, 5 Nov 2015 15:50:28 +0000 (15:50 +0000)]
Merge "Take into account default app for default grants" am:
82eeb2f20c am:
0c7e9262a1
am:
f7db8e407b
* commit '
f7db8e407b02a3cb2fe1e1e5838b1ebcb67f6dc5':
Take into account default app for default grants
Svetoslav Ganov [Thu, 5 Nov 2015 15:48:34 +0000 (15:48 +0000)]
Merge "Enforce weaker grant if app is default handler for miltiple action" am:
035374d7a2 am:
a9b62e1330
am:
1809ccc62e
* commit '
1809ccc62e6c3649b3024a099dccccb3b773cf49':
Enforce weaker grant if app is default handler for miltiple action
Jason Monk [Wed, 4 Nov 2015 19:57:15 +0000 (14:57 -0500)]
Updates to Drawer
Support doing nothing on tvs and watches. Also better not doing
anything with no categories existing.
Change-Id: I4a12d4d907a08e75ed3cdcd3f7c68a3a100c687d
Dan Albert [Thu, 5 Nov 2015 08:59:09 +0000 (00:59 -0800)]
Don't apply clang flag to gcc builds.
For whatever reason GCC doesn't fail the build on unknown flags unless
there is also a warning emitted. Since we're now deprecating
UniquePtr, the warning is thrown here and the build fails (despite not
being -Werror).
Bug: http://b/
22403888
Change-Id: I4af7911a51f7af9aa47a596a76f3e9d79535585b
Terry Heo [Thu, 5 Nov 2015 06:53:33 +0000 (15:53 +0900)]
CEC: Check validity of tvinput id
Bug:
25006096
Change-Id: I1eec8c5ec863b85d66d9c9722101af7f7d3d2f40
Tomasz Mikolajewski [Wed, 4 Nov 2015 09:24:09 +0000 (18:24 +0900)]
Implement efficient move on Internal Storage.
Bug:
24884813
Change-Id: I5a8dfeb13313a3e60ba2993643eb547adca7b851
Tomasz Mikolajewski [Thu, 5 Nov 2015 04:02:36 +0000 (04:02 +0000)]
Merge "Remove TRANSFER_MODE_NONE from CopyManager."
Chong Zhang [Thu, 5 Nov 2015 03:55:51 +0000 (03:55 +0000)]
Merge "fix missing dim layer surface"
Chong Zhang [Thu, 5 Nov 2015 02:36:00 +0000 (18:36 -0800)]
fix missing dim layer surface
bug:
24913379
Change-Id: Id3280ba9cccea57ca9cf0274cea589cd58e71a56
Tomasz Mikolajewski [Wed, 4 Nov 2015 06:33:20 +0000 (15:33 +0900)]
Remove TRANSFER_MODE_NONE from CopyManager.
This field is not necessary, as an operation is always either copy or move.
Change-Id: Ide68bb2bf5d237ed4c9abe8c443edd8e12dd82dd
Svetoslav Ganov [Thu, 5 Nov 2015 02:30:08 +0000 (02:30 +0000)]
Merge "Take into account default app for default grants" am:
82eeb2f20c
am:
0c7e9262a1
* commit '
0c7e9262a1cc89b748e281f330dd1ffecec6df3f':
Take into account default app for default grants
Svetoslav Ganov [Thu, 5 Nov 2015 02:28:40 +0000 (02:28 +0000)]
Merge "Enforce weaker grant if app is default handler for miltiple action" am:
035374d7a2
am:
a9b62e1330
* commit '
a9b62e13305d9cb43f53831f0b92d72bd490c1ae':
Enforce weaker grant if app is default handler for miltiple action
Svetoslav Ganov [Thu, 5 Nov 2015 02:25:32 +0000 (02:25 +0000)]
Merge "Take into account default app for default grants"
am:
82eeb2f20c
* commit '
82eeb2f20c934ddc97380032b3c8ecacc21d9a04':
Take into account default app for default grants
Tomasz Mikolajewski [Thu, 5 Nov 2015 02:25:23 +0000 (02:25 +0000)]
Merge "Wire copyDocument and moveDocument to CopyService."
Tomasz Mikolajewski [Wed, 4 Nov 2015 02:20:58 +0000 (11:20 +0900)]
Wire copyDocument and moveDocument to CopyService.
Bug:
24884665
Change-Id: Iaeac9ffa468150853f0f36c439f98df53937e519
Svetoslav Ganov [Thu, 5 Nov 2015 02:23:44 +0000 (02:23 +0000)]
Merge "Enforce weaker grant if app is default handler for miltiple action"
am:
035374d7a2
* commit '
035374d7a29b4e0b0bc71bdfb3555b2e547ce1da':
Enforce weaker grant if app is default handler for miltiple action
Filip Gruszczynski [Wed, 4 Nov 2015 02:05:47 +0000 (18:05 -0800)]
Split code out from WMS.realyoutWindow.
Change-Id: If57237013d87d864c219e5f6415de3d360cbbe75
Svetoslav Ganov [Thu, 5 Nov 2015 02:19:12 +0000 (02:19 +0000)]
Merge "Take into account default app for default grants"
Felipe Leme [Thu, 5 Nov 2015 02:19:06 +0000 (02:19 +0000)]
Merge "Clarified usage of onDetach() and onCreate() when setRetainInstance() is set to true. BUG:
25455734"
Svetoslav Ganov [Thu, 5 Nov 2015 02:19:00 +0000 (02:19 +0000)]
Merge "Enforce weaker grant if app is default handler for miltiple action"
Svetoslav [Tue, 3 Nov 2015 02:40:18 +0000 (18:40 -0800)]
Enforce weaker grant if app is default handler for miltiple action
Change-Id: Ibc46e458e277412ebb276eb5ba6f2765b6b6c5e9
Chris Tate [Thu, 5 Nov 2015 02:02:49 +0000 (02:02 +0000)]
Merge "Make WorkSource version of alarm listener API @SystemApi"
Winson Chung [Thu, 5 Nov 2015 01:59:57 +0000 (01:59 +0000)]
Merge "Adding dnd to/from freeform workspaces."
Winson [Wed, 4 Nov 2015 18:50:28 +0000 (10:50 -0800)]
Adding dnd to/from freeform workspaces.
Change-Id: I5b75fe5a942e9a2e344e62229e860b5108f9872e
Winson [Thu, 5 Nov 2015 01:39:55 +0000 (17:39 -0800)]
Fixing regression in alt-tab task.
Change-Id: Iee73baded04616ee92046609c37257d1551520fb
Chris Tate [Thu, 5 Nov 2015 01:49:24 +0000 (01:49 +0000)]
Merge "Docs: be explicit about oldState contract for backup helpers"
John Reck [Thu, 5 Nov 2015 01:39:37 +0000 (01:39 +0000)]
Merge "Revert "add DeviceInfo""
Chong Zhang [Thu, 5 Nov 2015 01:38:32 +0000 (01:38 +0000)]
Merge "Discard input events sent to dead window"
John Reck [Thu, 5 Nov 2015 01:38:25 +0000 (01:38 +0000)]
Revert "add DeviceInfo"
This reverts commit
b2442896e3a226c7ebe9d47fa80b257e98a6a34d.
Change-Id: I50f6555451f71067505245333c8e558b5e3b2b3b
Christopher Tate [Thu, 5 Nov 2015 01:35:17 +0000 (17:35 -0800)]
Docs: be explicit about oldState contract for backup helpers
Call out specifically that each helper must only consume the
prior-state data that it produced in the first place, not reading
beyond its own part of the state file.
Bug
25473872
Change-Id: I1f24a5738a799eb21d966510372a0f3852436166
Ben Kwa [Thu, 5 Nov 2015 01:01:15 +0000 (01:01 +0000)]
Merge "Move DirectoryFragment and family to dirlist pkg."
Chong Zhang [Thu, 5 Nov 2015 00:23:10 +0000 (16:23 -0800)]
Discard input events sent to dead window
And add a check to skip repositioning if window doesn't have a
valid input channel.
bug:
25345787
Change-Id: I555eb9a2ce258d77cd69c53c323dc3db646c773f
Tomasz Mikolajewski [Wed, 4 Nov 2015 23:17:14 +0000 (23:17 +0000)]
Merge "Add support for opening files in specified MIME type to DocumentsProvider."
Steve McKay [Tue, 3 Nov 2015 23:23:16 +0000 (15:23 -0800)]
Move DirectoryFragment and family to dirlist pkg.
Stuff was getting out of control in the main package.
Change-Id: Ia06ba96f5bbe13388d51e6ad52a9dac76af97cc0
Chad Brubaker [Fri, 23 Oct 2015 22:33:56 +0000 (15:33 -0700)]
Add initial network security config implementation
Initial implementation of a unified application wide static
network security configuration.
This currently encompases:
* Trust decisions such as what trust anchors to use as well as static
certificate pinning.
* Policy on what to do with cleartext traffic.
In order to prevent issues due to interplay of various components in an
application and their potentially different security requirements
configuration can be specified at a per-domain granularity in addition
to application wide defaults.
This change contains the internal data structures and trust management
code, hooking these up in application startup will come in a future
commit.
Change-Id: I53ce5ba510a4221d58839e61713262a8f4c6699c
John Reck [Wed, 4 Nov 2015 21:50:36 +0000 (21:50 +0000)]
Merge "add DeviceInfo"
John Reck [Wed, 4 Nov 2015 15:39:35 +0000 (07:39 -0800)]
add DeviceInfo
Change-Id: I4c122278a7e88b6f47c4dd3c5fc553df7d3c900d
Chris Tate [Wed, 4 Nov 2015 21:42:55 +0000 (21:42 +0000)]
Merge "Fix BlobBackupHelper state tracking"
Jason Monk [Wed, 4 Nov 2015 21:10:21 +0000 (21:10 +0000)]
Merge "Settings Drawer: Handle multi-profile/user correctly"
Riley Andrews [Wed, 4 Nov 2015 20:43:38 +0000 (20:43 +0000)]
Merge "Convert ashmem bitmap thresholds to constants." into mnc-dr-dev am:
c8bb39d98d am:
2c740f1dcf am:
6c1144dc0f
am:
132bb1e4b1
* commit '
132bb1e4b10755d2bc0810135511fd999badbe4b':
Convert ashmem bitmap thresholds to constants.
Riley Andrews [Wed, 4 Nov 2015 20:37:18 +0000 (20:37 +0000)]
Merge "Convert ashmem bitmap thresholds to constants." into mnc-dr-dev am:
c8bb39d98d am:
2c740f1dcf
am:
6c1144dc0f
* commit '
6c1144dc0f8b2452ca2a204ca471e2d23339d5a3':
Convert ashmem bitmap thresholds to constants.
Riley Andrews [Wed, 4 Nov 2015 20:30:48 +0000 (20:30 +0000)]
Merge "Convert ashmem bitmap thresholds to constants." into mnc-dr-dev am:
c8bb39d98d
am:
2c740f1dcf
* commit '
2c740f1dcf7bfd75a1dde2f7403cb25ae6559556':
Convert ashmem bitmap thresholds to constants.
Riley Andrews [Wed, 4 Nov 2015 20:24:36 +0000 (20:24 +0000)]
Merge "Convert ashmem bitmap thresholds to constants." into mnc-dr-dev
am:
c8bb39d98d
* commit '
c8bb39d98d7c2a07f1a5c745f6e89e379e4a25f0':
Convert ashmem bitmap thresholds to constants.
Chris Craik [Wed, 4 Nov 2015 20:21:13 +0000 (20:21 +0000)]
Merge "Early return when the scale is 0." into mnc-dr-dev am:
10eb6ab94b am:
8b581e2bc7 am:
a853bb450c
am:
34e9b5b2e4
* commit '
34e9b5b2e418dd43e374dcbb3be27710c53d4b9c':
Early return when the scale is 0.
Jason Monk [Wed, 4 Nov 2015 20:19:18 +0000 (20:19 +0000)]
Merge "First pass at drawer support for SettingsLib"
Riley Andrews [Wed, 4 Nov 2015 20:18:35 +0000 (20:18 +0000)]
Merge "Convert ashmem bitmap thresholds to constants." into mnc-dr-dev
Chris Craik [Wed, 4 Nov 2015 20:17:15 +0000 (20:17 +0000)]
Merge "Remove -ffast-math from libhwui makefile" into mnc-dr-dev am:
c4aaf0f4b8 am:
62b16e2e10 am:
1938c39f77
am:
289c3ba2c4 -s ours
* commit '
289c3ba2c4b4d97108fc79977339e7bf7b585f7f':
Remove -ffast-math from libhwui makefile
Jason Monk [Wed, 4 Nov 2015 18:16:00 +0000 (13:16 -0500)]
Settings Drawer: Handle multi-profile/user correctly
Change-Id: Ibef3cb38325415d514dc86fcd4ce7b95825361f8
Jason Monk [Tue, 3 Nov 2015 23:24:29 +0000 (18:24 -0500)]
First pass at drawer support for SettingsLib
Change-Id: I9669bd511dd3c4b7f59b8600a5af65d9837af015
Baligh Uddin [Wed, 4 Nov 2015 19:56:04 +0000 (11:56 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25433205
Change-Id: I3ae0e8f44a5933c708d072f2053dbde77795e411
Baligh Uddin [Wed, 4 Nov 2015 19:51:55 +0000 (11:51 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
25433205
Change-Id: I46efa0b9d7293d80c68cb6a1e21dfaa509c6d7d2
Chris Craik [Wed, 4 Nov 2015 19:46:47 +0000 (19:46 +0000)]
Merge "Early return when the scale is 0." into mnc-dr-dev am:
10eb6ab94b am:
8b581e2bc7
am:
a853bb450c
* commit '
a853bb450ce7e6f06220a86dcc171a837d30511b':
Early return when the scale is 0.
Julia Reynolds [Wed, 4 Nov 2015 19:44:49 +0000 (19:44 +0000)]
Merge changes I49660236,I56a7970a
* changes:
Delete unused code.
Unhide setting for CTS testing.
Chris Craik [Wed, 4 Nov 2015 19:40:04 +0000 (19:40 +0000)]
Merge "Remove -ffast-math from libhwui makefile" into mnc-dr-dev am:
c4aaf0f4b8 am:
62b16e2e10
am:
1938c39f77
* commit '
1938c39f77a52c1058e7b2434bdc5d08ed9053b9':
Remove -ffast-math from libhwui makefile
Chris Craik [Wed, 4 Nov 2015 19:40:02 +0000 (19:40 +0000)]
Merge "Early return when the scale is 0." into mnc-dr-dev am:
10eb6ab94b
am:
8b581e2bc7
* commit '
8b581e2bc797d3b470ad7ff3d362a998b42da4ea':
Early return when the scale is 0.
Chris Craik [Wed, 4 Nov 2015 19:33:11 +0000 (19:33 +0000)]
Merge "Early return when the scale is 0." into mnc-dr-dev
am:
10eb6ab94b
* commit '
10eb6ab94b932c33a708e007b0681b26930260e3':
Early return when the scale is 0.
Chris Craik [Wed, 4 Nov 2015 19:33:11 +0000 (19:33 +0000)]
Merge "Remove -ffast-math from libhwui makefile" into mnc-dr-dev am:
c4aaf0f4b8
am:
62b16e2e10
* commit '
62b16e2e10e488eb69ae0d11d43c7693ad809ec2':
Remove -ffast-math from libhwui makefile
Christopher Tate [Wed, 4 Nov 2015 19:10:48 +0000 (11:10 -0800)]
Make WorkSource version of alarm listener API @SystemApi
WorkSource is not public API but this should be available to
system support modules.
Change-Id: I7283ab8aa5c5e298959d21a5c8fe55ed119bc6a3
Chris Craik [Wed, 4 Nov 2015 19:28:39 +0000 (19:28 +0000)]
Merge "Early return when the scale is 0." into mnc-dr-dev
Chris Craik [Wed, 4 Nov 2015 19:27:19 +0000 (19:27 +0000)]
Merge "Remove -ffast-math from libhwui makefile" into mnc-dr-dev
am:
c4aaf0f4b8
* commit '
c4aaf0f4b853e7df1eaffc350618e07474d0bad1':
Remove -ffast-math from libhwui makefile
Chris Craik [Wed, 4 Nov 2015 19:20:52 +0000 (19:20 +0000)]
Merge "Remove -ffast-math from libhwui makefile" into mnc-dr-dev
Christopher Tate [Wed, 4 Nov 2015 18:45:49 +0000 (10:45 -0800)]
Fix BlobBackupHelper state tracking
The disk-friendly use of BufferedInputStream in state parsing was
actually breaking the state management system when multiple helpers
are involved in backup. The BufferedInputStream would blithely
pre-fetch 8K from the state file -- but that would consume some
state data that the dispatcher and subsequent helpers needed to see
in order to properly evaluate prior state themselves. The contract
here is that when using the helper mechanism, state-data consumption
must *only* consume as much data as the helper originally stored
into the file.
Switching to a direct-read stream instead fixes the problem by
avoiding read overrun. The rest of the changes are expanded
debugging output that made diagnosis possible.
Bug
25473872
Change-Id: I91de38dfec96f589700479f41ac26f144ba4463c
Chong Zhang [Wed, 4 Nov 2015 18:56:34 +0000 (18:56 +0000)]
Merge "Construct ActivityOptions near top level"
Filip Gruszczynski [Wed, 4 Nov 2015 18:55:06 +0000 (18:55 +0000)]
Merge "Remove blink during the freeform -> recents transition."
Adam Lesinski [Wed, 4 Nov 2015 18:50:27 +0000 (18:50 +0000)]
Merge "Use wakeup reason when FingerPrint sensor wakes up the device"
Geoff Mendal [Wed, 4 Nov 2015 18:44:31 +0000 (18:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am:
8e7ab07ce7 -s ours am:
cbe037b01a -s ours am:
c5b905f500 -s ours
am:
6df893939e -s ours
* commit '
6df893939e765d910748cfd8a42473793919e9f3':
Import translations. DO NOT MERGE
John Reck [Wed, 4 Nov 2015 18:43:11 +0000 (18:43 +0000)]
Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base into mnc-ub-dev am:
e22d81debd
am:
891e52ba29
* commit '
891e52ba296a33d0e51befa209c1ce14a2746991':
John Reck [Wed, 4 Nov 2015 18:41:49 +0000 (18:41 +0000)]
Merge "Revert "Use clang for libhwui"" into mnc-dr-dev am:
1e1fbd804b am:
f8635c2e04 am:
26f50df754
am:
392b0926aa -s ours
* commit '
392b0926aa19ae3856bfddbbeeeb7639f051a86b':
Revert "Use clang for libhwui"