OSDN Git Service
Chong Zhang [Thu, 1 Sep 2016 00:56:10 +0000 (00:56 +0000)]
Merge "Do not log surface destroy by default" into nyc-mr1-dev am:
dc02317d92
am:
4800ade070
Change-Id: I9f3b7958a2e8c740a218fdafcafae37cb179ef09
Chong Zhang [Thu, 1 Sep 2016 00:56:05 +0000 (00:56 +0000)]
Do not log surface destroy by default am:
ad23b3fa11
am:
104a58b3c4
Change-Id: I99239c9c3d6f5129dfb5a7254dd594159ea5d700
Chong Zhang [Thu, 1 Sep 2016 00:46:00 +0000 (00:46 +0000)]
Merge "Do not log surface destroy by default" into nyc-mr1-dev
am:
dc02317d92
Change-Id: I5ad4e2a8f96e32a79eb95603ad9dba3d672feb62
Chong Zhang [Thu, 1 Sep 2016 00:45:58 +0000 (00:45 +0000)]
Do not log surface destroy by default
am:
ad23b3fa11
Change-Id: I91303c5855ac0733a1de0c303236070d87089b85
TreeHugger Robot [Thu, 1 Sep 2016 00:39:34 +0000 (00:39 +0000)]
Merge "Do not log surface destroy by default" into nyc-mr1-dev
Pablo Ceballos [Thu, 1 Sep 2016 00:23:24 +0000 (00:23 +0000)]
Merge "Handle null Surface in createVirtualDisplay" into nyc-mr1-dev am:
9103680158
am:
e584593641
Change-Id: I6f36890fc8cb7ae5f1839199279fd76158c75c3e
Pablo Ceballos [Thu, 1 Sep 2016 00:23:21 +0000 (00:23 +0000)]
Handle null Surface in createVirtualDisplay am:
eb3370d490
am:
b7d3f5b63b
Change-Id: I2c94542234bed20440dc5b927e1f27de47cf44d5
Pablo Ceballos [Thu, 1 Sep 2016 00:16:46 +0000 (00:16 +0000)]
Merge "Handle null Surface in createVirtualDisplay" into nyc-mr1-dev
am:
9103680158
Change-Id: Ife70ed600ed008839af4ff024afa26920817d6a7
Pablo Ceballos [Thu, 1 Sep 2016 00:16:42 +0000 (00:16 +0000)]
Handle null Surface in createVirtualDisplay
am:
eb3370d490
Change-Id: I8af2a4356c2ea857affb047c946a5656f6c144f6
Pablo Ceballos [Thu, 1 Sep 2016 00:06:30 +0000 (00:06 +0000)]
Merge "Handle null Surface in createVirtualDisplay" into nyc-mr1-dev
Sudheer Shanka [Wed, 31 Aug 2016 23:50:28 +0000 (23:50 +0000)]
Merge "Allow package verifier and uninstaller to do silent uninstalls." into nyc-mr1-dev am:
0b69970e36
am:
608d4d8a46
Change-Id: I6f4bca57fe879f69626ca2b16d63ea2d7f20f295
Sudheer Shanka [Wed, 31 Aug 2016 23:47:46 +0000 (23:47 +0000)]
Allow package verifier and uninstaller to do silent uninstalls. am:
bf6154a5ba
am:
51b6b7d507
Change-Id: I4443dcf82d9a40d0051618b65175018489e1dba2
Jeff Sharkey [Wed, 31 Aug 2016 23:47:42 +0000 (23:47 +0000)]
Merge "DO NOT MERGE. Block adoptable storage when using FBE." into nyc-mr1-dev am:
c081d2b870
am:
8215d988eb
Change-Id: Ia55bb188f420fca11dadcc940505d297a0a5f16d
Jeff Sharkey [Wed, 31 Aug 2016 23:47:39 +0000 (23:47 +0000)]
DO NOT MERGE. Block adoptable storage when using FBE. am:
6ed7418228
am:
b1123e7871
Change-Id: Ie1d13350e15e3bf5bb41d16b6960b55ebb8d966b
Jeff Sharkey [Wed, 31 Aug 2016 23:47:35 +0000 (23:47 +0000)]
Merge "DO NOT MERGE. Update lockscreen message when user unlocked." into nyc-mr1-dev am:
26887dc880
am:
444af99af6
Change-Id: Ie3a8bfbcb88190aba2402a43e86bafafcc51aae1
Jeff Sharkey [Wed, 31 Aug 2016 23:47:31 +0000 (23:47 +0000)]
DO NOT MERGE. Update lockscreen message when user unlocked. am:
99e1bca91a
am:
be4949f489
Change-Id: Ic44fb8c9ce8462e24891c72ddbb265f494b6d4f1
Sudheer Shanka [Wed, 31 Aug 2016 23:30:15 +0000 (23:30 +0000)]
Merge "Allow package verifier and uninstaller to do silent uninstalls." into nyc-mr1-dev
am:
0b69970e36
Change-Id: Id271199ce9e7e690bed052dcb4c804a185827544
Sudheer Shanka [Wed, 31 Aug 2016 23:30:12 +0000 (23:30 +0000)]
Allow package verifier and uninstaller to do silent uninstalls.
am:
bf6154a5ba
Change-Id: Iab55e58e02a2088c541406bc0b71aa14df7b028e
Jeff Sharkey [Wed, 31 Aug 2016 23:30:08 +0000 (23:30 +0000)]
Merge "DO NOT MERGE. Block adoptable storage when using FBE." into nyc-mr1-dev
am:
c081d2b870
Change-Id: Ibce0c8e82d31b7eea405bc72d486d25a3051f08e
Jeff Sharkey [Wed, 31 Aug 2016 23:30:05 +0000 (23:30 +0000)]
DO NOT MERGE. Block adoptable storage when using FBE.
am:
6ed7418228
Change-Id: I3880da0330ea3acc62655878df4876495e24a2a3
Jeff Sharkey [Wed, 31 Aug 2016 23:30:00 +0000 (23:30 +0000)]
Merge "DO NOT MERGE. Update lockscreen message when user unlocked." into nyc-mr1-dev
am:
26887dc880
Change-Id: If086b75dd28b0838cd576469eb4ad05deea01d50
Jeff Sharkey [Wed, 31 Aug 2016 23:29:54 +0000 (23:29 +0000)]
DO NOT MERGE. Update lockscreen message when user unlocked.
am:
99e1bca91a
Change-Id: I578646f2ff948c0180eee1b815aa0edbfa5fb187
Jeff Sharkey [Wed, 31 Aug 2016 23:29:29 +0000 (23:29 +0000)]
Merge "DO NOT MERGE. Clarify FileObserver docs for null value." into nyc-mr1-dev am:
cdd2b6f311
am:
50e3aa4181
Change-Id: Ib6de25647526a0a734b7c012ec82c5a3ff82ff11
Jeff Sharkey [Wed, 31 Aug 2016 23:29:26 +0000 (23:29 +0000)]
DO NOT MERGE. Clarify FileObserver docs for null value. am:
c041f5a3b8
am:
a341d70602
Change-Id: Ib737218df19aed7f09ba142cce4fc9c62edffd5d
Todd Kennedy [Wed, 31 Aug 2016 23:29:20 +0000 (23:29 +0000)]
Merge "throw if >1 verifier found" into nyc-mr1-dev am:
a1ce6ee444
am:
2ebbd82c5a
Change-Id: I733ab1dcc2d55faebce8445f2aa5ebaa710d8c5a
Todd Kennedy [Wed, 31 Aug 2016 23:29:16 +0000 (23:29 +0000)]
throw if >1 verifier found am:
5320ee42c6
am:
73a05d1865
Change-Id: I897cfe173beb551494dae1bf9c6fc682a1ee4915
Sudheer Shanka [Wed, 31 Aug 2016 23:23:43 +0000 (23:23 +0000)]
Merge "Allow package verifier and uninstaller to do silent uninstalls." into nyc-mr1-dev
Jeff Sharkey [Wed, 31 Aug 2016 23:22:06 +0000 (23:22 +0000)]
Merge "DO NOT MERGE. Clarify FileObserver docs for null value." into nyc-mr1-dev
am:
cdd2b6f311
Change-Id: Ia6304e9515e8e7c9bb19d17d2833a58873f1801e
Jeff Sharkey [Wed, 31 Aug 2016 23:22:04 +0000 (23:22 +0000)]
DO NOT MERGE. Clarify FileObserver docs for null value.
am:
c041f5a3b8
Change-Id: I3c0f0098eed321419c8d0e2a1a66c2bf380df8d1
TreeHugger Robot [Wed, 31 Aug 2016 23:17:33 +0000 (23:17 +0000)]
Merge "DO NOT MERGE. Block adoptable storage when using FBE." into nyc-mr1-dev
TreeHugger Robot [Wed, 31 Aug 2016 23:14:19 +0000 (23:14 +0000)]
Merge "DO NOT MERGE. Update lockscreen message when user unlocked." into nyc-mr1-dev
TreeHugger Robot [Wed, 31 Aug 2016 23:13:01 +0000 (23:13 +0000)]
Merge "DO NOT MERGE. Clarify FileObserver docs for null value." into nyc-mr1-dev
Todd Kennedy [Wed, 31 Aug 2016 23:10:13 +0000 (23:10 +0000)]
Merge "throw if >1 verifier found" into nyc-mr1-dev
am:
a1ce6ee444
Change-Id: Iea25f9bdde9b4fac5512b09364e75c8e18b20960
Todd Kennedy [Wed, 31 Aug 2016 23:10:11 +0000 (23:10 +0000)]
throw if >1 verifier found
am:
5320ee42c6
Change-Id: Ie59f45fa660564ecf073bde4e750d65cf2752467
Chong Zhang [Wed, 31 Aug 2016 23:05:27 +0000 (16:05 -0700)]
Do not log surface destroy by default
Put it back under SHOW_TRANSACTIONS, this was for assist debugging
some early surface destroy issues but should be no longer needed.
Change-Id: I0806ac0ad2c9de3d0ccf9af995ced25c9a2f7668
TreeHugger Robot [Wed, 31 Aug 2016 22:56:58 +0000 (22:56 +0000)]
Merge "throw if >1 verifier found" into nyc-mr1-dev
Pablo Ceballos [Wed, 31 Aug 2016 22:00:17 +0000 (15:00 -0700)]
Handle null Surface in createVirtualDisplay
One can pass a null Surface to createVirtualDisplay and then set the
Surface after creation. Properly handle the isSingleBuffered check for
this case.
Bug
31219726
Change-Id: I14ebaca58912fdb4989e0ba0f4c251df31e24617
Jeff Sharkey [Tue, 23 Aug 2016 16:24:56 +0000 (10:24 -0600)]
DO NOT MERGE. Clarify FileObserver docs for null value.
Change-Id: I7dc0b0d26220d6eb82f956a9860cfb6aeccfd12f
Test: none
Bug:
30511606
(cherry picked from commit
902316d5533632321a945651b1d044c4e23bf742)
Jeff Sharkey [Tue, 23 Aug 2016 19:53:53 +0000 (13:53 -0600)]
DO NOT MERGE. Block adoptable storage when using FBE.
For adoptable storage and FBE to coexist we need a new dm-biocrypt
kernel feature which isn't ready yet. So for now, prevent devices
from being adopted on FBE devices.
Bug:
30770036
Test: none
Change-Id: I51d54d2a8976ed02a03b107545aa094cf68df5d0
(cherry picked from commit
3b7f4b69b7701c57f0eaf0822f93a25fd4d8fa9d)
Jeff Sharkey [Tue, 23 Aug 2016 22:32:03 +0000 (16:32 -0600)]
DO NOT MERGE. Update lockscreen message when user unlocked.
If a user doesn't have credentials, we start the unlock process
automatically, but that races with the UI binding process. Fix by
rebinding the UI once we hear the user is unlocked.
Change-Id: Id678b97aa6120ba78088fb6cf4c2a65d129e98a3
Test: none
Bug:
30840626
(cherry picked from commit
181001379fed124ab9fcb2a5fccedf68c48fa5a7)
Felipe Leme [Wed, 31 Aug 2016 21:34:33 +0000 (21:34 +0000)]
Merge "Revert "Adds a section for unaccounted data."" into nyc-mr1-dev am:
a5e0fedbb3
am:
6529bad2e4
Change-Id: I4781fd21fdae729101d49a62e38ea816d3a5fd52
Felipe Leme [Wed, 31 Aug 2016 21:34:28 +0000 (21:34 +0000)]
Revert "Adds a section for unaccounted data." am:
952a0d9fdb
am:
ad35387fa8
Change-Id: Ib670baf44da60ab0a42a98e2301dff806c08ce04
Felipe Leme [Wed, 31 Aug 2016 21:24:17 +0000 (21:24 +0000)]
Merge "Revert "Adds a section for unaccounted data."" into nyc-mr1-dev
am:
a5e0fedbb3
Change-Id: I2766088ae49cb1ac14bdfa57719ae1d4106c75e4
Felipe Leme [Wed, 31 Aug 2016 21:24:15 +0000 (21:24 +0000)]
Revert "Adds a section for unaccounted data."
am:
952a0d9fdb
Change-Id: Icc190c2d7216205bcf37ff7a4b873db14dddecc6
TreeHugger Robot [Wed, 31 Aug 2016 21:17:18 +0000 (21:17 +0000)]
Merge "Revert "Adds a section for unaccounted data."" into nyc-mr1-dev
Adrian Roos [Wed, 31 Aug 2016 20:49:51 +0000 (20:49 +0000)]
Merge "Wallpaper: Fix letterboxing if wallpaper is scaled but not cropped" into nyc-dr1-dev am:
f06bb5c0f9 am:
03f206a2ed
am:
7f0c7757c0
Change-Id: I90eec3943d17b77330e1bf63cf082942bb8b6cd4
Adrian Roos [Wed, 31 Aug 2016 20:49:42 +0000 (20:49 +0000)]
Wallpaper: Fix letterboxing if wallpaper is scaled but not cropped am:
5c97ff23a3 am:
865f437e99
am:
7634e5e52c
Change-Id: Ib9b7ff9ed007be33192f8e1449c2ed005276279b
Adrian Roos [Wed, 31 Aug 2016 20:42:46 +0000 (20:42 +0000)]
Merge "Wallpaper: Fix letterboxing if wallpaper is scaled but not cropped" into nyc-dr1-dev am:
f06bb5c0f9
am:
03f206a2ed
Change-Id: Ib7afe469f2efd6fa26c9d7b98042ae0efa8d7e58
Adrian Roos [Wed, 31 Aug 2016 20:42:44 +0000 (20:42 +0000)]
Wallpaper: Fix letterboxing if wallpaper is scaled but not cropped am:
5c97ff23a3
am:
865f437e99
Change-Id: I2ea3832611f0e5a707b49be80e80b546d5636081
Adrian Roos [Wed, 31 Aug 2016 20:37:11 +0000 (20:37 +0000)]
Merge "Wallpaper: Fix letterboxing if wallpaper is scaled but not cropped" into nyc-dr1-dev
am:
f06bb5c0f9
Change-Id: I796b2c67f367797f7b0b9f03714d194be33de53d
Adrian Roos [Wed, 31 Aug 2016 20:37:09 +0000 (20:37 +0000)]
Wallpaper: Fix letterboxing if wallpaper is scaled but not cropped
am:
5c97ff23a3
Change-Id: I873b469fa9ca12e14f5465cd6af8d69c92176e43
TreeHugger Robot [Wed, 31 Aug 2016 20:31:53 +0000 (20:31 +0000)]
Merge "Wallpaper: Fix letterboxing if wallpaper is scaled but not cropped" into nyc-dr1-dev
Wyatt Riley [Wed, 31 Aug 2016 20:14:14 +0000 (20:14 +0000)]
Merge "AGNSS LPP settings for Telus & Bell" into nyc-dr1-dev am:
3554ce0e18 am:
59ba8dfa50
am:
1dd614db2a
Change-Id: Id13a2401f6be8c5e0a835425c9a6a939fb67671e
Wyatt Riley [Wed, 31 Aug 2016 20:14:02 +0000 (20:14 +0000)]
AGNSS LPP settings for Telus & Bell am:
5dadc4dbb4 am:
3af39b4f2d
am:
60eeaab4ef
Change-Id: Iaf3396e79268054a864bad6e93b61c402e68744b
Wyatt Riley [Wed, 31 Aug 2016 20:09:29 +0000 (20:09 +0000)]
Merge "AGNSS LPP settings for Telus & Bell" into nyc-dr1-dev am:
3554ce0e18
am:
59ba8dfa50
Change-Id: I4826e2127f8477b6caa26b7ee3e2d2947b55447e
Wyatt Riley [Wed, 31 Aug 2016 20:09:27 +0000 (20:09 +0000)]
AGNSS LPP settings for Telus & Bell am:
5dadc4dbb4
am:
3af39b4f2d
Change-Id: I36c0ddffb4a62206b9a779e0d92d2e4026f7d452
Wyatt Riley [Wed, 31 Aug 2016 20:01:36 +0000 (20:01 +0000)]
Merge "AGNSS LPP settings for Telus & Bell" into nyc-dr1-dev
am:
3554ce0e18
Change-Id: I9f7153d4c613bb3f42ee3a83cdd6a4def8ea8eda
Wyatt Riley [Wed, 31 Aug 2016 20:01:33 +0000 (20:01 +0000)]
AGNSS LPP settings for Telus & Bell
am:
5dadc4dbb4
Change-Id: I35db85ad57be1c0cec34e833a2c67ccb34c3df60
Wyatt Riley [Wed, 31 Aug 2016 19:56:54 +0000 (19:56 +0000)]
Merge "AGNSS LPP settings for Telus & Bell" into nyc-dr1-dev
Rob Carr [Wed, 31 Aug 2016 19:31:55 +0000 (19:31 +0000)]
Merge "PopupWindow: Gravity fixes." into nyc-mr1-dev am:
8330a91def
am:
7a98efb80c
Change-Id: I08108693556db93dcc2c81e00c975ffa8fa0013f
Robert Carr [Wed, 31 Aug 2016 19:31:48 +0000 (19:31 +0000)]
PopupWindow: Gravity fixes. am:
085160612d
am:
a732ea6c1f
Change-Id: Ide4ccd6cbfef913392a46b89486de064e0196ad6
Rob Carr [Wed, 31 Aug 2016 19:26:59 +0000 (19:26 +0000)]
Merge "PopupWindow: Gravity fixes." into nyc-mr1-dev
am:
8330a91def
Change-Id: I5deb5d4e90502ea6c935b840824ca74eaa9a1bbd
Robert Carr [Wed, 31 Aug 2016 19:26:55 +0000 (19:26 +0000)]
PopupWindow: Gravity fixes.
am:
085160612d
Change-Id: Ia9477ead7cf1cdd942817f2f427053c6187a1cdf
Rob Carr [Wed, 31 Aug 2016 19:21:50 +0000 (19:21 +0000)]
Merge "PopupWindow: Gravity fixes." into nyc-mr1-dev
Adrian Roos [Wed, 31 Aug 2016 17:25:38 +0000 (10:25 -0700)]
Wallpaper: Fix letterboxing if wallpaper is scaled but not cropped
Fixes a bug where the wrong part of an image was decoded if
the image needed to be scaled but not cropped.
Change-Id: I011e59d85b526097ef1daabd63805c7cdc74c17b
Fixes:
31112957
Wyatt Riley [Wed, 31 Aug 2016 19:11:19 +0000 (19:11 +0000)]
Merge "Custom LPP AGPS config for Rogers" into nyc-dr1-dev am:
e13df588a4 am:
b0857a6c27
am:
3aab7f8ae2
Change-Id: I28682948c0439fcca4d6490b75e8e6682cdb9744
Wyatt Riley [Wed, 31 Aug 2016 19:11:12 +0000 (19:11 +0000)]
Custom LPP AGPS config for Rogers am:
2ebd1f6b75 am:
efdb5072ab
am:
fd26dc5bf1
Change-Id: I90724853f0614e32ac8cc8a49de9bd253818401c
Wyatt Riley [Wed, 31 Aug 2016 19:04:34 +0000 (19:04 +0000)]
Merge "Custom LPP AGPS config for Rogers" into nyc-dr1-dev am:
e13df588a4
am:
b0857a6c27
Change-Id: If35dde65bd23a4503e3c576308d540bf2679e397
Wyatt Riley [Wed, 31 Aug 2016 19:04:33 +0000 (19:04 +0000)]
Custom LPP AGPS config for Rogers am:
2ebd1f6b75
am:
efdb5072ab
Change-Id: I82829c2374b0f424b8b8f5e335f61aa111f7591f
Wyatt Riley [Wed, 31 Aug 2016 18:58:30 +0000 (18:58 +0000)]
Merge "Custom LPP AGPS config for Rogers" into nyc-dr1-dev
am:
e13df588a4
Change-Id: I461a69d477f540424b40ed76cba11bfaabbcabb8
Wyatt Riley [Wed, 31 Aug 2016 18:58:28 +0000 (18:58 +0000)]
Custom LPP AGPS config for Rogers
am:
2ebd1f6b75
Change-Id: I75b8742817794ee30e65388549d6c05270acdc5b
Wyatt Riley [Wed, 31 Aug 2016 18:52:40 +0000 (18:52 +0000)]
Merge "Custom LPP AGPS config for Rogers" into nyc-dr1-dev
Wyatt Riley [Wed, 31 Aug 2016 17:59:59 +0000 (10:59 -0700)]
AGNSS LPP settings for Telus & Bell
Similar to Rogers settings
Mcc/Mnc values selected from mcclist.com, intersected with
existing config.xml files
Bug:
31187109
Bug:
31186773
Change-Id: Iba3ebc873828b6f59765674817bc86f6337e618c
Felipe Leme [Wed, 31 Aug 2016 18:46:06 +0000 (18:46 +0000)]
Merge "Remove wtf log when optional apps are not found." into nyc-mr1-dev am:
f29f973643
am:
957391839d
Change-Id: Ibf9440df7103e50370fcfde90d04ed8207c8ad65
Felipe Leme [Wed, 31 Aug 2016 18:46:01 +0000 (18:46 +0000)]
Remove wtf log when optional apps are not found. am:
6fa02e95ba
am:
e20c47686b
Change-Id: I038a1c3782800040c946da50417f4afde362cdd9
Hall Liu [Wed, 31 Aug 2016 18:38:10 +0000 (18:38 +0000)]
Merge "Rename PROPERTY_SHOW_CALLBACK_NUMBER" into nyc-mr1-dev am:
4c01673a7b
am:
983295d420
Change-Id: Ic66e2f7ca33498eb08b11749d5ff89d0028b0ce7
Hall Liu [Wed, 31 Aug 2016 18:37:35 +0000 (18:37 +0000)]
Rename PROPERTY_SHOW_CALLBACK_NUMBER am:
25c7c4d100
am:
506b924421
Change-Id: If0c4c5162d7fdb13e9ee20fdc74a1ac916d5ac2f
Allen Hair [Wed, 31 Aug 2016 18:37:19 +0000 (18:37 +0000)]
Merge "Fine tune code coverage filters for SystemUI tests." into nyc-mr1-dev am:
e9a9e6b92c
am:
8327a96262
Change-Id: I74ffaf38baef7d7029c608bc4d96a4a7a45075d3
Allen Hair [Wed, 31 Aug 2016 18:36:02 +0000 (18:36 +0000)]
Fine tune code coverage filters for SystemUI tests. am:
8fef05f2c1
am:
2d0504edbf
Change-Id: I62c4548fa5c04a3997f74eaca2faa548279bf797
Svetoslav Ganov [Wed, 31 Aug 2016 18:35:46 +0000 (18:35 +0000)]
Merge "Properly close fd backing a MemoryIntArray" into nyc-dev am:
84763eb770 am:
eb59bf4e5d am:
509f536b48
am:
f1b18cae8c
Change-Id: I1ad064f81227675a6504908fbfbfe290614eb3b4
Svetoslav Ganov [Wed, 31 Aug 2016 18:35:41 +0000 (18:35 +0000)]
Properly close fd backing a MemoryIntArray am:
e257d6e167 am:
916f703b90 am:
853f2c51d9
am:
fe45224a5b
Change-Id: I317c6fcab37fbaed76c696e6266c6da890fedd58
Android Build Merger (Role) [Wed, 31 Aug 2016 18:31:22 +0000 (18:31 +0000)]
Merge "Merge "Call Debug.getPss without a lock held" into nyc-mr1-dev am:
9edadbd87a am:
ea4420b557" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 31 Aug 2016 18:31:12 +0000 (18:31 +0000)]
Merge "Call Debug.getPss without a lock held am:
10e8f16add am:
f10d31f5d0" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 31 Aug 2016 18:30:57 +0000 (18:30 +0000)]
Merge changes from topic 'am-
ee884cf0aecf458e82b1ef62075c2045' into nyc-mr1-dev-plus-aosp
* changes:
Merge "Add a whitelist of sockets on fork." into nyc-mr1-dev am:
f7d8a1648b am:
666c7ae3e4
Add a whitelist of sockets on fork. am:
3764a260f0 am:
3f58724a46
Android Build Merger (Role) [Wed, 31 Aug 2016 18:30:42 +0000 (18:30 +0000)]
Merge "Merge "replace the N Preview landing page with the redirect to the package index also update version metadata (no longer preview, now 7.0)" into nyc-dev am:
a06f40bd05 am:
1c30ff407e am:
e9274876ae am:
b64e7adf7a" into nyc-mr1-dev-plus-aosp
Amith Yamasani [Wed, 31 Aug 2016 18:29:39 +0000 (18:29 +0000)]
Merge "Call Debug.getPss without a lock held" into nyc-mr1-dev am:
9edadbd87a
am:
ea4420b557
Change-Id: I14058ff247708307d6530b6df591de514312970d
Amith Yamasani [Wed, 31 Aug 2016 18:29:35 +0000 (18:29 +0000)]
Call Debug.getPss without a lock held am:
10e8f16add
am:
f10d31f5d0
Change-Id: I037274eab1841fb57440bbd13a5f290e079736dd
Narayan Kamath [Wed, 31 Aug 2016 18:29:21 +0000 (18:29 +0000)]
Merge "Add a whitelist of sockets on fork." into nyc-mr1-dev am:
f7d8a1648b
am:
666c7ae3e4
Change-Id: I762872d37503d88cae375a58ff9b4f1c24828807
Narayan Kamath [Wed, 31 Aug 2016 18:28:52 +0000 (18:28 +0000)]
Add a whitelist of sockets on fork. am:
3764a260f0
am:
3f58724a46
Change-Id: Ib7316b2386e91cecd991f67631bfc076702d1702
Jakub Pawlowski [Wed, 31 Aug 2016 18:28:45 +0000 (18:28 +0000)]
Merge "Separate advertiser from GATT client (1/4)" am:
5f87c4539a am:
40a16ea242
am:
9f341e4e49
Change-Id: Ic3461b98449636cfc125890f255b1332d0ef5132
Scott Main [Wed, 31 Aug 2016 18:28:45 +0000 (18:28 +0000)]
Merge "replace the N Preview landing page with the redirect to the package index also update version metadata (no longer preview, now 7.0)" into nyc-dev am:
a06f40bd05 am:
1c30ff407e am:
e9274876ae
am:
b64e7adf7a
Change-Id: I552fa85c9004b2dbaeb714289db789c184b18559
Scott Main [Wed, 31 Aug 2016 18:24:52 +0000 (18:24 +0000)]
Merge "resolve merge conflicts of
e8a3ea8 to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp
Jakub Pawlowski [Wed, 31 Aug 2016 18:21:00 +0000 (18:21 +0000)]
Merge "Separate advertiser from GATT client (1/4)" am:
5f87c4539a
am:
40a16ea242
Change-Id: I0d08f623e78fdd779b39083d0da3a45aee72ff3c
Jakub Pawlowski [Wed, 31 Aug 2016 18:14:17 +0000 (18:14 +0000)]
Merge "Separate advertiser from GATT client (1/4)"
am:
5f87c4539a
Change-Id: I0cc39d08fdef8637e156414e3ef4e669a01f921f
Jakub Pawlowski [Wed, 31 Aug 2016 18:05:26 +0000 (18:05 +0000)]
Merge "Separate advertiser from GATT client (1/4)"
Felipe Leme [Wed, 31 Aug 2016 17:59:33 +0000 (17:59 +0000)]
Merge "Remove wtf log when optional apps are not found." into nyc-mr1-dev
am:
f29f973643
Change-Id: I306e6e655f4f9f3b90f1099a79a719d8dca0bf97
Felipe Leme [Wed, 31 Aug 2016 17:59:30 +0000 (17:59 +0000)]
Remove wtf log when optional apps are not found.
am:
6fa02e95ba
Change-Id: Ie8359e68f31979c18b2dd2b0dbad627c2045a293
TreeHugger Robot [Wed, 31 Aug 2016 17:54:23 +0000 (17:54 +0000)]
Merge "Remove wtf log when optional apps are not found." into nyc-mr1-dev
Hall Liu [Wed, 31 Aug 2016 17:50:40 +0000 (17:50 +0000)]
Merge "Rename PROPERTY_SHOW_CALLBACK_NUMBER" into nyc-mr1-dev
am:
4c01673a7b
Change-Id: Ibf8514ef25b6f9384b188a5eefb61bf8f237c7af
Hall Liu [Wed, 31 Aug 2016 17:50:32 +0000 (17:50 +0000)]
Rename PROPERTY_SHOW_CALLBACK_NUMBER
am:
25c7c4d100
Change-Id: I91b4a6778b72c24bf2b97a9ac1529b6d24a5005e
OSDN Git Service
