OSDN Git Service
Chia-I Wu [Thu, 2 Jun 2016 22:52:05 +0000 (22:52 +0000)]
Merge "vulkan: remove EnumerateDeviceLayerProperties internally" into nyc-dev am:
691fcb9603
am:
f05cb26281
* commit '
f05cb2628178098243af7d3047f936364e261b64':
vulkan: remove EnumerateDeviceLayerProperties internally
Change-Id: Ib54b022f4d9245ea8a00d4c413ef0224a873c76f
Chia-I Wu [Thu, 2 Jun 2016 22:49:38 +0000 (22:49 +0000)]
Merge "vulkan: remove EnumerateDeviceLayerProperties internally" into nyc-dev
am:
691fcb9603
* commit '
691fcb96033db2f09030e8c71e86dad7e2fbfd43':
vulkan: remove EnumerateDeviceLayerProperties internally
Change-Id: I6121447ccfc7794e4b716280c3180e3ef0033a2a
Chia-I Wu [Thu, 2 Jun 2016 22:36:26 +0000 (22:36 +0000)]
Merge "vulkan: remove EnumerateDeviceLayerProperties internally" into nyc-dev
Android Build Merger (Role) [Thu, 2 Jun 2016 18:21:20 +0000 (18:21 +0000)]
Merge "Merge "Camera: Add media/camera NDK documents" into nyc-dev am:
470241b168 am:
951dbcce95" into nyc-mr1-dev-plus-aosp
Yin-Chia Yeh [Thu, 2 Jun 2016 18:20:29 +0000 (18:20 +0000)]
Merge "Camera: Add media/camera NDK documents" into nyc-dev am:
470241b168
am:
951dbcce95
* commit '
951dbcce950b2fb06c85ff3724f673e3c997d2fc':
Camera: Add media/camera NDK documents
Change-Id: If46a7059f298d08efccd0c02a2ff038106e9f198
Yin-Chia Yeh [Thu, 2 Jun 2016 18:20:28 +0000 (18:20 +0000)]
Merge "Camera: Add media/camera NDK documents" into nyc-dev am:
470241b168
am:
1212e59d1a
* commit '
1212e59d1a4c50e5edb9d6a1b2560f7e047b52a9':
Camera: Add media/camera NDK documents
Change-Id: I79ff714fe781cd40cfea574f76ebe5626be05505
Yin-Chia Yeh [Thu, 2 Jun 2016 18:17:38 +0000 (18:17 +0000)]
Merge "Camera: Add media/camera NDK documents" into nyc-dev
am:
470241b168
* commit '
470241b168a9db7514bc0df775109db591836d4b':
Camera: Add media/camera NDK documents
Change-Id: Id7dbb10ea403f8210c003b8ba83f9ae65106c73f
Yin-Chia Yeh [Thu, 2 Jun 2016 18:17:37 +0000 (18:17 +0000)]
Merge "Camera: Add media/camera NDK documents" into nyc-dev
am:
470241b168
* commit '
470241b168a9db7514bc0df775109db591836d4b':
Camera: Add media/camera NDK documents
Change-Id: Ib66856fba84301834a81f0c361f5244bd152eeb3
Yin-Chia Yeh [Thu, 2 Jun 2016 18:12:21 +0000 (18:12 +0000)]
Merge "Camera: Add media/camera NDK documents" into nyc-dev
Pablo Ceballos [Thu, 2 Jun 2016 17:25:27 +0000 (17:25 +0000)]
Merge "SF: Re-enable fence tracker by default" into nyc-mr1-dev
am:
30689c9e4c
* commit '
30689c9e4c7cbcfb1f537f224ab1b50f5fe0efa6':
SF: Re-enable fence tracker by default
Change-Id: I503b5724f8362df99305f9ca9f622a61b329826d
Android Build Merger (Role) [Thu, 2 Jun 2016 17:23:11 +0000 (17:23 +0000)]
Merge "Merge "BQ: Don\'t return fences from dequeue in shared buffer mode" into nyc-dev am:
eb6377eb13 am:
217b5d19a6" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 2 Jun 2016 17:23:07 +0000 (17:23 +0000)]
Merge "Merge "Push empty sync transaction before taking screenshot in tests" into nyc-dev am:
08588dd760 am:
46e5b65075" into nyc-mr1-dev-plus-aosp
Pablo Ceballos [Thu, 2 Jun 2016 17:22:49 +0000 (17:22 +0000)]
Merge "BQ: Don\'t return fences from dequeue in shared buffer mode" into nyc-dev am:
eb6377eb13
am:
217b5d19a6
* commit '
217b5d19a6aa4e633214b5038ef5d74813ef336d':
BQ: Don't return fences from dequeue in shared buffer mode
Change-Id: I9aa88cb2264ad95ff9e12db011a7aa957617c705
Pablo Ceballos [Thu, 2 Jun 2016 17:22:49 +0000 (17:22 +0000)]
Merge "Push empty sync transaction before taking screenshot in tests" into nyc-dev am:
08588dd760
am:
46e5b65075
* commit '
46e5b6507587ef5223d3a108275a69a533abed64':
Push empty sync transaction before taking screenshot in tests
Change-Id: I84f9eb94abee0d693507682c949aaba6e8371d4b
Pablo Ceballos [Thu, 2 Jun 2016 17:22:44 +0000 (17:22 +0000)]
Merge "BQ: Don\'t return fences from dequeue in shared buffer mode" into nyc-dev am:
eb6377eb13
am:
907e94d3da
* commit '
907e94d3da1215328fe3a5020cd5005e42499eba':
BQ: Don't return fences from dequeue in shared buffer mode
Change-Id: I1a2dbf037ada7477838b3935d3084d1fea6bd09c
Pablo Ceballos [Thu, 2 Jun 2016 17:22:43 +0000 (17:22 +0000)]
Merge "Push empty sync transaction before taking screenshot in tests" into nyc-dev am:
08588dd760
am:
161a5bac18
* commit '
161a5bac18d7eca64b639f51cd9c78c51c2bf1a4':
Push empty sync transaction before taking screenshot in tests
Change-Id: Id8707fae4898b0108cf370949899aee4bf42fa97
Pablo Ceballos [Thu, 2 Jun 2016 17:21:42 +0000 (17:21 +0000)]
Merge "SF: Re-enable fence tracker by default" into nyc-mr1-dev
Pablo Ceballos [Thu, 2 Jun 2016 17:20:04 +0000 (17:20 +0000)]
Merge "BQ: Don\'t return fences from dequeue in shared buffer mode" into nyc-dev
am:
eb6377eb13
* commit '
eb6377eb133f902e737fab370df7679430a1d8d1':
BQ: Don't return fences from dequeue in shared buffer mode
Change-Id: Ie66de8e99600c6c69ad1c5bb62c8adaaf3d43a71
Pablo Ceballos [Thu, 2 Jun 2016 17:20:04 +0000 (17:20 +0000)]
Merge "Push empty sync transaction before taking screenshot in tests" into nyc-dev
am:
08588dd760
* commit '
08588dd76073a8635aa4175d5b98fc5db86afec4':
Push empty sync transaction before taking screenshot in tests
Change-Id: Iad404364ca17d6a23ceca928d342d3931b2418f2
Pablo Ceballos [Thu, 2 Jun 2016 17:20:04 +0000 (17:20 +0000)]
Merge "BQ: Don\'t return fences from dequeue in shared buffer mode" into nyc-dev
am:
eb6377eb13
* commit '
eb6377eb133f902e737fab370df7679430a1d8d1':
BQ: Don't return fences from dequeue in shared buffer mode
Change-Id: Ieb075d9598edcaec542ee06663aa292111968474
Pablo Ceballos [Thu, 2 Jun 2016 17:20:04 +0000 (17:20 +0000)]
Merge "Push empty sync transaction before taking screenshot in tests" into nyc-dev
am:
08588dd760
* commit '
08588dd76073a8635aa4175d5b98fc5db86afec4':
Push empty sync transaction before taking screenshot in tests
Change-Id: Id7648a55288f3f8962e6e314584c9690c3f27854
Pablo Ceballos [Thu, 2 Jun 2016 17:14:00 +0000 (17:14 +0000)]
Merge "BQ: Don't return fences from dequeue in shared buffer mode" into nyc-dev
Pablo Ceballos [Thu, 2 Jun 2016 17:10:06 +0000 (17:10 +0000)]
Merge "Push empty sync transaction before taking screenshot in tests" into nyc-dev
Calin Juravle [Thu, 2 Jun 2016 10:57:34 +0000 (10:57 +0000)]
Merge "Create primary profile file together with app data folders" into nyc-dev am:
d25aab3ce8
am:
11eff20096
* commit '
11eff20096c116fad518027d484af1e55a8aa6a9':
Change-Id: I87fd3dbdd02d119eea1e28fb346e8c22de155eba
Calin Juravle [Thu, 2 Jun 2016 10:36:56 +0000 (10:36 +0000)]
Merge "Create primary profile file together with app data folders" into nyc-dev am:
d25aab3ce8
am:
8b31d72e90
* commit '
8b31d72e90a63c9f3dcc8bb1da2507c2cd6b684e':
Create primary profile file together with app data folders
Change-Id: Ice0f13c56d98fab704516b8974521cfd4f7ff54f
Calin Juravle [Thu, 2 Jun 2016 10:21:30 +0000 (10:21 +0000)]
Merge "Create primary profile file together with app data folders" into nyc-dev
am:
d25aab3ce8
* commit '
d25aab3ce8aab1b95ac60922981c87c6963a0a6b':
Create primary profile file together with app data folders
Change-Id: I6f1febd72495ce95d657a79d0cf3454be50ccef5
Calin Juravle [Thu, 2 Jun 2016 10:21:26 +0000 (10:21 +0000)]
Merge "Create primary profile file together with app data folders" into nyc-dev
am:
d25aab3ce8
* commit '
d25aab3ce8aab1b95ac60922981c87c6963a0a6b':
Create primary profile file together with app data folders
Change-Id: Id186b701d0cc755be0093c704ccd2aa8e0899611
Calin Juravle [Thu, 2 Jun 2016 10:10:35 +0000 (10:10 +0000)]
Merge "Create primary profile file together with app data folders" into nyc-dev
Chia-I Wu [Thu, 2 Jun 2016 03:25:47 +0000 (11:25 +0800)]
vulkan: remove EnumerateDeviceLayerProperties internally
We never use it. Since it is also deprecated, we will never need it.
Bug:
27910383
Change-Id: If4e556bb69890153be2987b165482e43ab06a890
Pablo Ceballos [Thu, 2 Jun 2016 01:53:40 +0000 (18:53 -0700)]
Push empty sync transaction before taking screenshot in tests
Because of ag/
1043009 it's now necessary to push an empty sync
transaction before taking a screenshot to ensure that all transactions
have been applied.
Bug
29074285
Change-Id: I9f1b4a5b6b1f39e1ff26d536817aef6f40865177
David Sehr [Thu, 2 Jun 2016 00:11:51 +0000 (00:11 +0000)]
installd support for profman --dump-info-for am:
6727c2d0bf
am:
8e0965d0d4
* commit '
8e0965d0d465be5e711f92eab452cff75badfad6':
Change-Id: I7e7a560e8507d50af965be45659e23238cbcf951
Pablo Ceballos [Wed, 18 May 2016 00:52:08 +0000 (17:52 -0700)]
SF: Re-enable fence tracker by default
- Don't check whether the fences have completed or not unless the data
has been requested.
Bug
22431447
Change-Id: Id4cb8bfba38547884849ef23c9b6f42f0d4d0750
David Sehr [Wed, 1 Jun 2016 23:25:47 +0000 (23:25 +0000)]
installd support for profman --dump-info-for am:
6727c2d0bf
am:
eed4df8068
* commit '
eed4df806856e77d9d55d8209d7178e4b5c945e8':
installd support for profman --dump-info-for
Change-Id: I5b4a465e394b40370731d8350196d8d66f8e649a
David Sehr [Wed, 1 Jun 2016 23:09:26 +0000 (23:09 +0000)]
installd support for profman --dump-info-for
am:
6727c2d0bf
* commit '
6727c2d0bfc876c62d6ee60d8a05d26bef1d56ef':
installd support for profman --dump-info-for
Change-Id: I2289ea8e788f65deb158f422b1c3b4feb93b9477
David Sehr [Wed, 1 Jun 2016 23:09:19 +0000 (23:09 +0000)]
installd support for profman --dump-info-for
am:
6727c2d0bf
* commit '
6727c2d0bfc876c62d6ee60d8a05d26bef1d56ef':
installd support for profman --dump-info-for
Change-Id: I3df4eee3cb34f6c163e73351180b227b8d6864e8
Pablo Ceballos [Wed, 1 Jun 2016 22:03:21 +0000 (15:03 -0700)]
BQ: Don't return fences from dequeue in shared buffer mode
Bug
29007505
Change-Id: I112ae6bd64ddc9a923ad9080e85a71adb96146af
David Sehr [Tue, 17 May 2016 23:06:22 +0000 (16:06 -0700)]
installd support for profman --dump-info-for
Bug:
28748264
Change-Id: Idcd3ed86294c1d0c75c26ca938b88744a25e387a
Android Build Merger (Role) [Tue, 31 May 2016 20:03:02 +0000 (20:03 +0000)]
Merge "Merge "svcmgr: don\'t send reply to one-way txn (part deux)" into nyc-dev am:
e4ecdb66d5 am:
134ef03161" into nyc-mr1-dev-plus-aosp
Mark Salyzyn [Tue, 31 May 2016 20:02:52 +0000 (20:02 +0000)]
Merge "svcmgr: don\'t send reply to one-way txn (part deux)" into nyc-dev am:
e4ecdb66d5
am:
5e91795065
* commit '
5e91795065d3c7e42de3f3853919cbc9c730c78c':
svcmgr: don't send reply to one-way txn (part deux)
Change-Id: I7ac169f6b366b482554bb053092863fdfc660e91
Mark Salyzyn [Tue, 31 May 2016 20:02:52 +0000 (20:02 +0000)]
Merge "svcmgr: don\'t send reply to one-way txn (part deux)" into nyc-dev am:
e4ecdb66d5
am:
134ef03161
* commit '
134ef03161e51f7ba19c66f2dc823fb46189b4f3':
svcmgr: don't send reply to one-way txn (part deux)
Change-Id: I03076ba93ddfd612183afe2fcc8446796aeb4595
Mark Salyzyn [Tue, 31 May 2016 19:59:24 +0000 (19:59 +0000)]
Merge "svcmgr: don\'t send reply to one-way txn (part deux)" into nyc-dev
am:
e4ecdb66d5
* commit '
e4ecdb66d5c2eed64cbd5b267e0621cab7b8a63b':
svcmgr: don't send reply to one-way txn (part deux)
Change-Id: Id062b1b3998ab018654bc7830f275d1ac6d64f6d
Mark Salyzyn [Tue, 31 May 2016 19:59:23 +0000 (19:59 +0000)]
Merge "svcmgr: don\'t send reply to one-way txn (part deux)" into nyc-dev
am:
e4ecdb66d5
* commit '
e4ecdb66d5c2eed64cbd5b267e0621cab7b8a63b':
svcmgr: don't send reply to one-way txn (part deux)
Change-Id: I79d2d5ed2e742cf2923534e4f50a637b8edb1fff
Mark Salyzyn [Tue, 31 May 2016 19:44:18 +0000 (19:44 +0000)]
Merge "svcmgr: don't send reply to one-way txn (part deux)" into nyc-dev
Erik Kline [Tue, 31 May 2016 05:07:24 +0000 (05:07 +0000)]
Use explicit path for /vendor/xbin/wlutil am:
0816520c5c
am:
44d884b428
* commit '
44d884b428f3af89bdcac1950840fc94cd3b8af0':
Change-Id: Ic8ced92c2df57a8cb64547503ef8fba8f32f29d3
Erik Kline [Tue, 31 May 2016 04:52:39 +0000 (04:52 +0000)]
Use explicit path for /vendor/xbin/wlutil
am:
0816520c5c
* commit '
0816520c5cd60519d8e221ed92497aa5464e3039':
Use explicit path for /vendor/xbin/wlutil
Change-Id: I1122b59ba30a870b823c51796c758df6e8883b91
Erik Kline [Tue, 31 May 2016 03:43:31 +0000 (03:43 +0000)]
Use explicit path for /vendor/xbin/wlutil am:
0816520c5c
am:
61f0597f2b
* commit '
61f0597f2b572c8b7faa6c2c0b6576d9be51b18b':
Use explicit path for /vendor/xbin/wlutil
Change-Id: If1608f8bd727cd5179968bc42dc08fef283922aa
Erik Kline [Tue, 31 May 2016 03:38:26 +0000 (03:38 +0000)]
Use explicit path for /vendor/xbin/wlutil
am:
0816520c5c
* commit '
0816520c5cd60519d8e221ed92497aa5464e3039':
Use explicit path for /vendor/xbin/wlutil
Change-Id: I1fd9593c8d9c0b0e3dd87c9a70b6b2e81c9b100a
Erik Kline [Mon, 30 May 2016 02:55:44 +0000 (11:55 +0900)]
Use explicit path for /vendor/xbin/wlutil
At this time /vendor/xbin is not in root's path.
Bug:
28850734
Change-Id: Ib6c2b6f8b0285854670c843dcc437cfcc84484a8
Chih-Hung Hsieh [Fri, 27 May 2016 18:09:56 +0000 (18:09 +0000)]
Merge "Fix misc-macro-parentheses warnings in openmax." am:
cb68066d06 am:
408c240973
am:
a623d13673
* commit '
a623d136730c5f87d49030e521dc702901b5b6ea':
Fix misc-macro-parentheses warnings in openmax.
Change-Id: I0bbf353a6524f610af63491e88f8e41928e72760
Chih-hung Hsieh [Fri, 27 May 2016 17:58:01 +0000 (17:58 +0000)]
Merge "Fix misc-macro-parentheses warnings in openmax." am:
cb68066d06
am:
408c240973
* commit '
408c24097392d52c38bd0e26e3d9a3c76e4cc0a4':
Fix misc-macro-parentheses warnings in openmax.
Change-Id: I987a1c8cbd2b28becc7df69912cd0d88ed17c52d
Chih-Hung Hsieh [Fri, 27 May 2016 17:51:20 +0000 (17:51 +0000)]
Merge "Fix misc-macro-parentheses warnings in openmax."
am:
cb68066d06
* commit '
cb68066d06665beb1b14efa0393dc60d59fa860b':
Fix misc-macro-parentheses warnings in openmax.
Change-Id: If7ab868482330861222c3371d90957d25b1146eb
Chih-hung Hsieh [Fri, 27 May 2016 17:36:55 +0000 (17:36 +0000)]
Merge "Fix misc-macro-parentheses warnings in openmax."
Android Build Merger (Role) [Fri, 27 May 2016 08:32:54 +0000 (08:32 +0000)]
Merge "Merge "vulkan: fix crash when only non-global layers are enabled" into nyc-dev am:
a101f6a446 am:
ad442de7cf" into nyc-mr1-dev-plus-aosp
Chia-I Wu [Fri, 27 May 2016 08:32:43 +0000 (08:32 +0000)]
Merge "vulkan: fix crash when only non-global layers are enabled" into nyc-dev am:
a101f6a446
am:
95e76d6b82
* commit '
95e76d6b820adb487a22dc878a28f09bdffa5fa7':
vulkan: fix crash when only non-global layers are enabled
Change-Id: I36b3620c2c774c64aae8e695a2a9d47daad91f0f
Chia-I Wu [Fri, 27 May 2016 08:32:42 +0000 (08:32 +0000)]
Merge "vulkan: fix crash when only non-global layers are enabled" into nyc-dev am:
a101f6a446
am:
ad442de7cf
* commit '
ad442de7cf7af7f1cc933db26f6a1b83677fddad':
vulkan: fix crash when only non-global layers are enabled
Change-Id: Id0ad83f1674342e6bcc2fa1445e774bb2c8bb060
Chia-I Wu [Fri, 27 May 2016 08:28:58 +0000 (08:28 +0000)]
Merge "vulkan: fix crash when only non-global layers are enabled" into nyc-dev
am:
a101f6a446
* commit '
a101f6a446722697e0ed6afb128829937b90d60a':
vulkan: fix crash when only non-global layers are enabled
Change-Id: I65baa95e0b00f3fbc136d435c4481256a7e551bd
Chia-I Wu [Fri, 27 May 2016 08:28:58 +0000 (08:28 +0000)]
Merge "vulkan: fix crash when only non-global layers are enabled" into nyc-dev
am:
a101f6a446
* commit '
a101f6a446722697e0ed6afb128829937b90d60a':
vulkan: fix crash when only non-global layers are enabled
Change-Id: I9a43de7d9d7020d5a4c24de5bc5b1bde743780ca
Chia-I Wu [Fri, 27 May 2016 08:22:49 +0000 (08:22 +0000)]
Merge "vulkan: fix crash when only non-global layers are enabled" into nyc-dev
Yin-Chia Yeh [Fri, 27 May 2016 06:07:15 +0000 (23:07 -0700)]
Camera: Add media/camera NDK documents
Include media/camera ndk headers to codegen source.
Add docs/images directory for image links in generated documents.
Bug:
27102995
Change-Id: I9c75e2ceba3458c9962c26cf786e1402fd963696
Erik Kline [Fri, 27 May 2016 04:39:56 +0000 (04:39 +0000)]
Add "ip maddr" to dumpstate output for debugging. am:
f7f2b0fd05
am:
e3b9187982
* commit '
e3b9187982f730ddc2f7555e855c53b7154800ef':
Change-Id: I9d7e85a5e6ca0843d24aa4e884a1b1c6e5d19a9c
Erik Kline [Fri, 27 May 2016 04:18:55 +0000 (04:18 +0000)]
Add "ip maddr" to dumpstate output for debugging. am:
f7f2b0fd05
am:
139854c0ae
* commit '
139854c0aef413b63b4bd919243a79a8f5a10c55':
Add "ip maddr" to dumpstate output for debugging.
Change-Id: Ib7d1f231a5baa944ff26516ff49385705ba1ab25
Erik Kline [Fri, 27 May 2016 04:14:38 +0000 (04:14 +0000)]
Add "ip maddr" to dumpstate output for debugging.
am:
f7f2b0fd05
* commit '
f7f2b0fd059bc26e27c022f3fb446fc74eab6c88':
Add "ip maddr" to dumpstate output for debugging.
Change-Id: Ic3898db87bc7b726079d922ff24eaa1f8201f288
Erik Kline [Fri, 27 May 2016 04:02:28 +0000 (04:02 +0000)]
Add "ip maddr" to dumpstate output for debugging.
am:
f7f2b0fd05
* commit '
f7f2b0fd059bc26e27c022f3fb446fc74eab6c88':
Add "ip maddr" to dumpstate output for debugging.
Change-Id: I0f0e12abaf640f2d8d8378b526568921e125b188
Chia-I Wu [Fri, 27 May 2016 02:18:25 +0000 (10:18 +0800)]
vulkan: fix crash when only non-global layers are enabled
We fail to set up get_instance_proc_addr_ and get_device_proc_addr_ when
there are layers but only non-global ones.
Bug:
28990561
Change-Id: I82704f946deb5a76640f9dfb792e6fd118c78aa7
Erik Kline [Fri, 27 May 2016 02:29:19 +0000 (11:29 +0900)]
Add "ip maddr" to dumpstate output for debugging.
Bug:
28966611
Change-Id: I8fdab94fbd41448e52f2fed406e8f43edf7f18ad
Wei Liu [Thu, 26 May 2016 20:48:08 +0000 (20:48 +0000)]
Merge "Check the existence of raft dir." into nyc-mr1-dev
am:
bcd82a3859
* commit '
bcd82a38595ff8404f4cd509e2ccdb1aca391b43':
Check the existence of raft dir.
Change-Id: Ibe475170aea110e645588ca4a4eb262c3db86ed1
Wei Liu [Thu, 26 May 2016 20:40:35 +0000 (20:40 +0000)]
Merge "Check the existence of raft dir." into nyc-mr1-dev
Mark Salyzyn [Wed, 25 May 2016 20:14:10 +0000 (13:14 -0700)]
svcmgr: don't send reply to one-way txn (part deux)
Do not split transaction into two when sending synchronous responses.
Partially revert changes associated with binder_send_reply from
previous incantations in commit
51f592c7bad13d3d8e8f7cfec25edfef42901802
that resulted in a performance regression.
Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug:
27111612
Bug:
28696050
Bug:
28946245
Change-Id: I12edc10a2d1408a71507a7983afa7f17b5a6a81b
Android Build Merger (Role) [Thu, 26 May 2016 15:20:10 +0000 (15:20 +0000)]
Merge "Mark the multiwindow divider as a trusted overlay. am:
b9be0cf397 am:
46d9364246" into nyc-mr1-dev-plus-aosp
Michael Wright [Thu, 26 May 2016 15:19:57 +0000 (15:19 +0000)]
Mark the multiwindow divider as a trusted overlay. am:
b9be0cf397
am:
ddbe6c4e8e
* commit '
ddbe6c4e8e1dffa6a60fe167f867e7577308b09e':
Mark the multiwindow divider as a trusted overlay.
Change-Id: I43c22984bdbdab9e19cfb54cfa6c7514d349a0c1
Michael Wright [Thu, 26 May 2016 15:19:57 +0000 (15:19 +0000)]
Mark the multiwindow divider as a trusted overlay. am:
b9be0cf397
am:
46d9364246
* commit '
46d93642469afcdcd988429ba37962c3c7f98fb5':
Mark the multiwindow divider as a trusted overlay.
Change-Id: I5f117dd9689b905ed9623d83f0e5f8b6c4691560
Michael Wright [Thu, 26 May 2016 15:07:29 +0000 (15:07 +0000)]
Mark the multiwindow divider as a trusted overlay.
am:
b9be0cf397
* commit '
b9be0cf397eb6053fb5b472d91cf2d6a22c6693f':
Mark the multiwindow divider as a trusted overlay.
Change-Id: Ice0475f9db54920bbe5bff9bd8a2c56b5a48c43f
Michael Wright [Thu, 26 May 2016 15:07:23 +0000 (15:07 +0000)]
Mark the multiwindow divider as a trusted overlay.
am:
b9be0cf397
* commit '
b9be0cf397eb6053fb5b472d91cf2d6a22c6693f':
Mark the multiwindow divider as a trusted overlay.
Change-Id: I1906ca39ce35a436ba65c3815e0bdda8a3c00e9e
Michael Wright [Thu, 26 May 2016 12:49:53 +0000 (13:49 +0100)]
Mark the multiwindow divider as a trusted overlay.
Having it be untrusted breaks the permissions granting dialog in
multiwindow mode.
Bug:
28828041
Change-Id: I9193dbce7315ebaa205673edd4f406d0b72665c8
Calin Juravle [Tue, 24 May 2016 14:33:12 +0000 (15:33 +0100)]
Create primary profile file together with app data folders
Bug:
28785119
Bug:
28625993
Change-Id: I12c0de85bc3dc35199acf32c10fe69f93e76d7fc
Wei Liu [Wed, 25 May 2016 21:21:02 +0000 (14:21 -0700)]
Check the existence of raft dir.
b/
28430346
Change-Id: I6ceb54f60c766d7b73ae93daa81f57b5a229e291
Wei Liu [Wed, 25 May 2016 20:21:15 +0000 (20:21 +0000)]
Merge "Write compressed and encoded raft logs to stdout if not zip_writer" into nyc-mr1-dev
am:
c1350c4832
* commit '
c1350c48324dd7f51fbcc72f57ffc18efdcf3246':
Write compressed and encoded raft logs to stdout if not zip_writer
Change-Id: I0fc1359e10ac09aaa4e19a7a20834ef8fb9e81c8
Wei Liu [Wed, 25 May 2016 20:10:41 +0000 (20:10 +0000)]
Merge "Write compressed and encoded raft logs to stdout if not zip_writer" into nyc-mr1-dev
Dan Stoza [Wed, 25 May 2016 18:40:55 +0000 (18:40 +0000)]
Merge "BufferQueue/SF: Add OccupancyTracker" into nyc-mr1-dev
am:
faa71321b0
* commit '
faa71321b0862fac97ad1f7825860fb740cc8507':
BufferQueue/SF: Add OccupancyTracker
Change-Id: I868b56c8502033877b08146c1cffeaaa263acc64
Wei Liu [Wed, 25 May 2016 18:28:57 +0000 (11:28 -0700)]
Write compressed and encoded raft logs to stdout if not zip_writer
Change-Id: Ib9948bebf9d5e2ef823e08b48fb67c36e0079a45
Dan Stoza [Wed, 25 May 2016 17:37:59 +0000 (17:37 +0000)]
Merge "BufferQueue/SF: Add OccupancyTracker" into nyc-mr1-dev
Android Build Merger (Role) [Tue, 24 May 2016 23:26:18 +0000 (23:26 +0000)]
Merge "Merge "SF: Force empty sync transactions to apply anyway" into nyc-dev am:
7443c1f253 am:
424d8325fe" into nyc-mr1-dev-plus-aosp
Robert Carr [Tue, 24 May 2016 23:26:09 +0000 (23:26 +0000)]
Merge "SF: Force empty sync transactions to apply anyway" into nyc-dev am:
7443c1f253
am:
424d8325fe
* commit '
424d8325fe0b26665631782e2f47321d0ced8595':
SF: Force empty sync transactions to apply anyway
Change-Id: I919dfae1ca1c7277029580911406daeb2d482f70
Robert Carr [Tue, 24 May 2016 23:26:06 +0000 (23:26 +0000)]
Merge "SF: Force empty sync transactions to apply anyway" into nyc-dev am:
7443c1f253
am:
2d10b6df79
* commit '
2d10b6df7935022c3d1483e284adb6bcb03d0d2b':
SF: Force empty sync transactions to apply anyway
Change-Id: I3cb8c29467fd5d882a2bb1ff664cbb340cfb98be
Robert Carr [Tue, 24 May 2016 23:23:29 +0000 (23:23 +0000)]
Merge "SF: Force empty sync transactions to apply anyway" into nyc-dev
am:
7443c1f253
* commit '
7443c1f253008acd868af1e35449dd5eb3139c8d':
SF: Force empty sync transactions to apply anyway
Change-Id: Iaa91350ba6e499d145e7adfcc1874601fff33775
Robert Carr [Tue, 24 May 2016 23:22:41 +0000 (23:22 +0000)]
Merge "SF: Force empty sync transactions to apply anyway" into nyc-dev
am:
7443c1f253
* commit '
7443c1f253008acd868af1e35449dd5eb3139c8d':
SF: Force empty sync transactions to apply anyway
Change-Id: Ic5b1f24f75027800429641eb3c2879a5742e130d
TreeHugger Robot [Tue, 24 May 2016 23:15:00 +0000 (23:15 +0000)]
Merge "SF: Force empty sync transactions to apply anyway" into nyc-dev
Robert Carr [Tue, 24 May 2016 18:41:28 +0000 (11:41 -0700)]
SF: Force empty sync transactions to apply anyway
Following the change to not flush transactions in the screen shot
path, this enables the use of empty synchronous transactions as a
flush mechanism for previous asynchronous transactions.
Bug:
27098060
Change-Id: I282fdfffb72db148edcbf1ded65b15816fc714a2
Mark Salyzyn [Tue, 24 May 2016 20:17:53 +0000 (20:17 +0000)]
resolve merge conflicts of
1750081 to nyc-dev-plus-aosp
am:
261a733906
* commit '
261a733906981fc2390f0803effdc55c51842a5c':
dumpstate: sscanf requires an asciiz string
Change-Id: I1e4dbbfe6056023dedf954059422c321b3b80680
Mark Salyzyn [Tue, 24 May 2016 19:38:40 +0000 (12:38 -0700)]
resolve merge conflicts of
1750081 to nyc-dev-plus-aosp
Change-Id: If25f336cfc2fa02cba863987da6f55647636417e
Mark Salyzyn [Tue, 24 May 2016 19:01:48 +0000 (19:01 +0000)]
Merge "dumpstate: sscanf requires an asciiz string"
am:
8b10517602
* commit '
8b105176024f4349755300d5903ed1b074fd4b9a':
dumpstate: sscanf requires an asciiz string
Change-Id: Iad314a7bfcbfd29ca95a0c8a76e52f8b894d04e2
Treehugger Robot [Tue, 24 May 2016 18:54:40 +0000 (18:54 +0000)]
Merge "dumpstate: sscanf requires an asciiz string"
Dan Stoza [Tue, 24 May 2016 18:46:00 +0000 (18:46 +0000)]
Merge "SF: Remove forced transaction on screenshot" into nyc-dev am:
854071a38f
am:
c51e7ff96d
* commit '
c51e7ff96d97cdcdd420f54df2c3171c1016b14b':
Change-Id: If1b158d525e8d9367c3d1ddc408695a613175e71
Dan Stoza [Tue, 24 May 2016 18:30:59 +0000 (18:30 +0000)]
Merge "SF: Remove forced transaction on screenshot" into nyc-dev am:
854071a38f
am:
7c1e3865a9
* commit '
7c1e3865a90084ae2a3efc089e4499e73d3858e7':
SF: Remove forced transaction on screenshot
Change-Id: I5d38586de3bf2d0bb7236383cd27f04fdbf75ae1
Dan Stoza [Tue, 24 May 2016 18:18:16 +0000 (18:18 +0000)]
Merge "SF: Remove forced transaction on screenshot" into nyc-dev
am:
854071a38f
* commit '
854071a38f250bd0638f1dfdb99b9ccc0010e7d0':
SF: Remove forced transaction on screenshot
Change-Id: I79297918957661befdec24345bdfff2720433188
Dan Stoza [Tue, 24 May 2016 18:18:08 +0000 (18:18 +0000)]
Merge "SF: Remove forced transaction on screenshot" into nyc-dev
am:
854071a38f
* commit '
854071a38f250bd0638f1dfdb99b9ccc0010e7d0':
SF: Remove forced transaction on screenshot
Change-Id: I2a321e5ddef0fd8b4dd5b3cb3a1e409c6998cd5e
Chih-Hung Hsieh [Tue, 24 May 2016 18:01:44 +0000 (18:01 +0000)]
Merge "Fix misc-macro-parentheses warnings in libs/binder." am:
44d29d4d07 am:
26c812f077
am:
81ace2ff3e
* commit '
81ace2ff3eeace0c121a3c4e6cf097881cf551f4':
Fix misc-macro-parentheses warnings in libs/binder.
Change-Id: I2621206bc58fc0868f03cd88ce8f55718be15ec6
Dan Stoza [Tue, 24 May 2016 18:01:24 +0000 (18:01 +0000)]
Merge "SF: Remove forced transaction on screenshot" into nyc-dev
Chih-hung Hsieh [Tue, 24 May 2016 17:54:48 +0000 (17:54 +0000)]
Merge "Fix misc-macro-parentheses warnings in libs/binder." am:
44d29d4d07
am:
26c812f077
* commit '
26c812f0774e42d4ab0f90f5448412151bb33367':
Fix misc-macro-parentheses warnings in libs/binder.
Change-Id: I6e9aac1e7373a866b0a5e853d0012a928d9abaa0
Chih-Hung Hsieh [Tue, 24 May 2016 17:48:46 +0000 (17:48 +0000)]
Merge "Fix misc-macro-parentheses warnings in libs/binder."
am:
44d29d4d07
* commit '
44d29d4d07a1262afaf84374ef136e30f24f491d':
Fix misc-macro-parentheses warnings in libs/binder.
Change-Id: I4619aac41c494bd01dd5ffa8279853ecf8719709
OSDN Git Service
