OSDN Git Service
Sudheer Shanka [Wed, 4 Oct 2017 07:03:28 +0000 (07:03 +0000)]
Merge "Update NPMS to inform NMS of the changes in fw rules synchronously." into oc-mr1-dev
am:
7a349d7288
Change-Id: Ie01c1ba49bd72a4690d2f29689bc94f9fd793cb8
Chih-hung Hsieh [Wed, 4 Oct 2017 06:56:55 +0000 (06:56 +0000)]
Merge "Revert work around clang-tidy segmentation fault." am:
a47e513464 am:
e640a8284d
am:
5105505efd
Change-Id: I9c8bbe4322542d02dc43253b23ff7b0932488142
Chih-hung Hsieh [Wed, 4 Oct 2017 06:47:41 +0000 (06:47 +0000)]
Merge "Revert work around clang-tidy segmentation fault." am:
a47e513464
am:
e640a8284d
Change-Id: Ia52f1419e49016748e5651b192ef2eba19008d8d
Sudheer Shanka [Wed, 4 Oct 2017 06:47:13 +0000 (06:47 +0000)]
Merge "Update NPMS to inform NMS of the changes in fw rules synchronously." into oc-mr1-dev
Chih-hung Hsieh [Wed, 4 Oct 2017 06:38:31 +0000 (06:38 +0000)]
Merge "Revert work around clang-tidy segmentation fault."
am:
a47e513464
Change-Id: Ie04d0d16a05c35a865776571f95078e63bc1bf47
Chih-hung Hsieh [Wed, 4 Oct 2017 06:26:42 +0000 (06:26 +0000)]
Merge "Revert work around clang-tidy segmentation fault."
Steven Moreland [Wed, 4 Oct 2017 04:29:26 +0000 (04:29 +0000)]
Merge "Convert java hwbinder mk -> bp." am:
53c945fb71 am:
7bebf15460
am:
e215488334
Change-Id: Ic24c9d2af58e58aa97e0ad1f8b2ff50f7db66007
Steven Moreland [Wed, 4 Oct 2017 04:20:08 +0000 (04:20 +0000)]
Merge "Convert java hwbinder mk -> bp." am:
53c945fb71
am:
7bebf15460
Change-Id: Ia799ca49151cdb20b6327d814f65822b46d8fb45
Steven Moreland [Wed, 4 Oct 2017 04:11:38 +0000 (04:11 +0000)]
Merge "Convert java hwbinder mk -> bp."
am:
53c945fb71
Change-Id: Ia1bde2b32e824f160dd4e768531b6b48179f7ba5
Treehugger Robot [Wed, 4 Oct 2017 04:00:03 +0000 (04:00 +0000)]
Merge "Convert java hwbinder mk -> bp."
Steven Moreland [Mon, 2 Oct 2017 23:58:41 +0000 (16:58 -0700)]
Convert java hwbinder mk -> bp.
This library is used to avoid a circular dependency
between frameworks.jar and HIDL hal definition libs.
It is not installed on the device.
Bug:
33420795
Test: m -j hwbinder and things it depends on
Change-Id: I44cc670383f80275026ea892151524599b713087
Chih-Hung Hsieh [Wed, 4 Oct 2017 03:14:21 +0000 (20:14 -0700)]
Revert work around clang-tidy segmentation fault.
Bug:
34740546
Test: build with WITH_TIDY=1 and
WITH_TIDY_CHECKS="*,-readability-*,-google-readability-*,-google-runtime-references"
Change-Id: If99c75cab6a2bec0c6b38aa17189668b4943478d
Matthew Ng [Wed, 4 Oct 2017 01:07:47 +0000 (01:07 +0000)]
Merge "Fixes rounded corners for clear all button on low ram devices" into oc-mr1-dev
am:
440240db5c
Change-Id: I5bfd0a633e96447c37f7b64c4fc8fc52b374f059
TreeHugger Robot [Wed, 4 Oct 2017 00:57:04 +0000 (00:57 +0000)]
Merge "Fixes rounded corners for clear all button on low ram devices" into oc-mr1-dev
Felipe Leme [Wed, 4 Oct 2017 00:36:02 +0000 (00:36 +0000)]
Merge "Fixed URL used on sample." into oc-mr1-dev
am:
6ba7019bb0
Change-Id: I124cbaecd5f8763ecd7f4b06070af48f6b1e0c1d
TreeHugger Robot [Wed, 4 Oct 2017 00:21:37 +0000 (00:21 +0000)]
Merge "Fixed URL used on sample." into oc-mr1-dev
Sudheer Shanka [Tue, 3 Oct 2017 16:43:20 +0000 (09:43 -0700)]
Update NPMS to inform NMS of the changes in fw rules synchronously.
Currently, NPMS informs NMS synchronously at some events and
asynchronously at some others. If these sync and async calls get
interleaved, then NMS will end up in an inconsistent state.
In N-MR1, NPMS was updated to inform NMS asynchronously to avoid some
lock contentions during screen unlock. This shouldn't be a problem any more
since NPMS no longer updates its internal state on ui thread and also
netd calls have been optimized from ~50ms to ~7ms since then.
Bug:
66015813
Test: cts-tradefed run singleCommand cts-dev -m CtsHostsideNetworkTests -t \
com.android.cts.net.HostsideRestrictBackgroundNetworkTests
Change-Id: I24ccb5819430f19014630e7b90cba1f0b993e430
Matthew Ng [Tue, 3 Oct 2017 22:17:16 +0000 (15:17 -0700)]
Fixes rounded corners for clear all button on low ram devices
Fixed rounded corners for clear all button by using a themed
background color on a shape with rounded corners instead of
programmatically changing the background color.
Change-Id: Iaaf4f0d94d417b0064c7e6bf4895b49d9fa6561f
Fixes:
67368134
Test: manual - go to recents and scroll up to show clear all button
Android Build Merger (Role) [Tue, 3 Oct 2017 22:04:09 +0000 (22:04 +0000)]
Merge "Merge "AAPT2: Fix R.java styleable + indices ordering" into oc-mr1-dev am:
b986ebce75" into oc-mr1-dev-plus-aosp
Adam Lesinski [Tue, 3 Oct 2017 22:02:20 +0000 (22:02 +0000)]
Merge "AAPT2: Fix R.java styleable + indices ordering" into oc-mr1-dev
am:
b986ebce75
Change-Id: I16382162fecf323074c13b376a23fccab1da092b
Selim Cinek [Tue, 3 Oct 2017 21:59:03 +0000 (21:59 +0000)]
Merge "Collapse Notification panel after tapping CLEAR ALL button" am:
ca8b270063 am:
d4b6e59cad
am:
3674a64029
Change-Id: Iaac0047f43ebfb721a1d632686e1c0afad44cb96
Adam Lesinski [Tue, 3 Oct 2017 21:51:09 +0000 (21:51 +0000)]
Merge "AAPT2: Preserve line numbers when deserializing from binary XML" into oc-mr1-dev
am:
9b581c7bc1
Change-Id: I55d8c73df0ce751472e58a9ae505c94edc90c68e
Felipe Leme [Tue, 3 Oct 2017 21:48:43 +0000 (14:48 -0700)]
Fixed URL used on sample.
Test: nope!
Bug:
66963249
Change-Id: Ieb46c00d97c8657a4e7498a8136c6da46760fbdd
Selim Cinek [Tue, 3 Oct 2017 21:45:55 +0000 (21:45 +0000)]
Merge "Collapse Notification panel after tapping CLEAR ALL button" am:
ca8b270063
am:
d4b6e59cad
Change-Id: Ib6f48bc7bf8f6cfae5f66adcdd7923891c320f99
Wonsik Kim [Tue, 3 Oct 2017 21:42:14 +0000 (21:42 +0000)]
Merge "fix AmrInputStream.read() hang" am:
5b6a02eb8b am:
4c2bbbf552
am:
b7079d6381
Change-Id: Ia0627f67855e56487818043b974953a33baf701f
Wonsik Kim [Tue, 3 Oct 2017 21:30:17 +0000 (21:30 +0000)]
Merge "fix AmrInputStream.read() hang" am:
5b6a02eb8b
am:
4c2bbbf552
Change-Id: I6764a29474ec9da78109e93c6a4f85ac3f8c2c1a
Selim Cinek [Tue, 3 Oct 2017 21:30:14 +0000 (21:30 +0000)]
Merge "Collapse Notification panel after tapping CLEAR ALL button"
am:
ca8b270063
Change-Id: I3ce745ab3546fa93aa0cafa7874b8449e6d2cfc9
TreeHugger Robot [Tue, 3 Oct 2017 21:24:48 +0000 (21:24 +0000)]
Merge "AAPT2: Fix R.java styleable + indices ordering" into oc-mr1-dev
TreeHugger Robot [Tue, 3 Oct 2017 21:24:16 +0000 (21:24 +0000)]
Merge "AAPT2: Preserve line numbers when deserializing from binary XML" into oc-mr1-dev
Brad Ebinger [Tue, 3 Oct 2017 21:23:01 +0000 (21:23 +0000)]
Merge "Adds a filtering bitmask to DownloadStateCallback" am:
177bd65211 am:
387b90aa97
am:
6ed82dc67b
Change-Id: Iab96a457f45f759267b9a5a41df533c9988ede94
Wonsik Kim [Tue, 3 Oct 2017 21:18:10 +0000 (21:18 +0000)]
Merge "fix AmrInputStream.read() hang"
am:
5b6a02eb8b
Change-Id: I7aff9043ec95d2f41e5d3301b01707f5dff4bef2
Brad Ebinger [Tue, 3 Oct 2017 21:13:34 +0000 (21:13 +0000)]
Merge "Adds a filtering bitmask to DownloadStateCallback" am:
177bd65211
am:
387b90aa97
Change-Id: I4332a7f839aec731acaafbb9fa6213f2ada39857
Selim Cinek [Tue, 3 Oct 2017 21:07:57 +0000 (21:07 +0000)]
Merge "Collapse Notification panel after tapping CLEAR ALL button"
Brad Ebinger [Tue, 3 Oct 2017 20:55:50 +0000 (20:55 +0000)]
Merge "Adds a filtering bitmask to DownloadStateCallback"
am:
177bd65211
Change-Id: I64950a42e8079a41105d90ea6c584ca6f940a64e
Julia Reynolds [Tue, 3 Oct 2017 20:53:31 +0000 (20:53 +0000)]
Merge "Foreground service notis must be correctly formed." into oc-mr1-dev
am:
f2c00946e0
Change-Id: Idf833e388c4c2959f56ffa00befdda4e4a71001e
Chris Wren [Tue, 3 Oct 2017 20:40:55 +0000 (20:40 +0000)]
Merge "measure snooze UI use more precisely" into oc-mr1-dev
am:
72826c99fa
Change-Id: I1304ace99258426667059dd98c51ea7d4e10b00c
Treehugger Robot [Tue, 3 Oct 2017 20:37:36 +0000 (20:37 +0000)]
Merge "fix AmrInputStream.read() hang"
Daniel Nishi [Tue, 3 Oct 2017 20:31:09 +0000 (20:31 +0000)]
Merge "Fix a cache calculation regression." into oc-mr1-dev
am:
fcd9565ec5
Change-Id: If0d8f5a0e54a71899c2f878c61747223579bf24a
TreeHugger Robot [Tue, 3 Oct 2017 20:23:32 +0000 (20:23 +0000)]
Merge "Foreground service notis must be correctly formed." into oc-mr1-dev
Brad Ebinger [Tue, 3 Oct 2017 20:23:00 +0000 (20:23 +0000)]
Merge "Adds a filtering bitmask to DownloadStateCallback"
Chris Wren [Tue, 3 Oct 2017 20:16:58 +0000 (20:16 +0000)]
Merge "measure snooze UI use more precisely" into oc-mr1-dev
Daniel Nishi [Tue, 3 Oct 2017 20:11:26 +0000 (20:11 +0000)]
Merge "Fix a cache calculation regression." into oc-mr1-dev
Brad Ebinger [Tue, 3 Oct 2017 19:16:08 +0000 (19:16 +0000)]
Merge "Remove verification for DownloadReceiver when failure" am:
f78beae681 am:
354eed7bac
am:
91c55f189c
Change-Id: I9ce32afc0c6e99b0a61e05a2d2b65855f054abd9
Brad Ebinger [Tue, 3 Oct 2017 19:07:46 +0000 (19:07 +0000)]
Merge "Decouple Content Name Locale from Content Language Locale" am:
a830e83028 am:
768b6c5e4a
am:
4b76f8420f
Change-Id: If87094f15e3a1dfe36d37745ed3d2cf79cc441f1
Brad Ebinger [Tue, 3 Oct 2017 19:05:26 +0000 (19:05 +0000)]
Merge "Remove verification for DownloadReceiver when failure" am:
f78beae681
am:
354eed7bac
Change-Id: I33894a72def642bd8977e41bec21140fdb738716
Brad Ebinger [Tue, 3 Oct 2017 18:58:11 +0000 (18:58 +0000)]
Merge "Decouple Content Name Locale from Content Language Locale" am:
a830e83028
am:
768b6c5e4a
Change-Id: Ibb2d70b40c0a439ad37deb911eb6b08ccde4bbfe
Brad Ebinger [Tue, 3 Oct 2017 18:51:32 +0000 (18:51 +0000)]
Merge "Remove verification for DownloadReceiver when failure"
am:
f78beae681
Change-Id: I02bc76b2162234c2f063e3dd7f143449a091f012
Brad Ebinger [Tue, 3 Oct 2017 18:45:43 +0000 (18:45 +0000)]
Merge "Decouple Content Name Locale from Content Language Locale"
am:
a830e83028
Change-Id: I225e8b71f53d584e1c8a6325dc2bb57421617dc4
Brad Ebinger [Tue, 3 Oct 2017 18:32:04 +0000 (18:32 +0000)]
Merge "Remove verification for DownloadReceiver when failure"
Brad Ebinger [Tue, 3 Oct 2017 18:31:49 +0000 (18:31 +0000)]
Merge "Decouple Content Name Locale from Content Language Locale"
Daniel Nishi [Mon, 2 Oct 2017 18:15:46 +0000 (11:15 -0700)]
Fix a cache calculation regression.
Cache size was being double-counted for apps in their drilldown.
Change-Id: I44ec03470050dfbce392348c3336dd5e9bb54c36
Fixes:
67028136
Test: SettingsLib integ tests
Chris Wren [Mon, 2 Oct 2017 21:44:53 +0000 (17:44 -0400)]
measure snooze UI use more precisely
Bug:
67003813
Test: runtest systemui
Change-Id: Id7ba68c8308e911cd506943f84c034ade21d1514
Brad Ebinger [Fri, 29 Sep 2017 22:12:08 +0000 (15:12 -0700)]
Adds a filtering bitmask to DownloadStateCallback
Adds the ability for an EMBMS app to specify a filtering
bitmask to DownloadStateCallback, which is used to filter
out callbacks that the EMBMS app doesn't need to listen
to.
Test: Testapps
Change-Id: Id7f26ba3c3606c644b0ca3376df1107f5834facb
Eric Laurent [Tue, 3 Oct 2017 15:44:59 +0000 (15:44 +0000)]
Merge "AudioService: do not unmute media on headset plug in total silence mode" into oc-mr1-dev
am:
0f6e9b5a79
Change-Id: I2594a1abb5f3deb66ab26b8b6d277a589ffecf4a
Eric Laurent [Tue, 3 Oct 2017 15:32:56 +0000 (15:32 +0000)]
Merge "AudioService: do not unmute media on headset plug in total silence mode" into oc-mr1-dev
Orion Hodson [Tue, 3 Oct 2017 08:24:07 +0000 (08:24 +0000)]
Merge "Update dalvik.bytecode package" am:
537d63fe1a am:
7e806c2942
am:
a17b99f75f
Change-Id: I4d15c973ed09593e9c91f4bd40f8efa65b1d516c
Orion Hodson [Tue, 3 Oct 2017 08:15:45 +0000 (08:15 +0000)]
Merge "Update dalvik.bytecode package" am:
537d63fe1a
am:
7e806c2942
Change-Id: I1fb0eebc7b345d9b21b10a4b9511d91e61a45046
Orion Hodson [Tue, 3 Oct 2017 08:06:57 +0000 (08:06 +0000)]
Merge "Update dalvik.bytecode package"
am:
537d63fe1a
Change-Id: I41ed71812f67136cbf456bfbdbc5b3a245c93f18
Orion Hodson [Tue, 3 Oct 2017 07:57:14 +0000 (07:57 +0000)]
Merge "Update dalvik.bytecode package"
Yunlian Jiang [Tue, 3 Oct 2017 04:38:07 +0000 (04:38 +0000)]
Merge "Replace strcpy with memcpy." am:
bb115bac41 am:
16951dcb54
am:
23f6dca5fd
Change-Id: I446973c3b96f253e3c3fc2dfda7647cd3e625916
Yunlian Jiang [Tue, 3 Oct 2017 04:27:42 +0000 (04:27 +0000)]
Merge "Replace strcpy with memcpy." am:
bb115bac41
am:
16951dcb54
Change-Id: I72b660c6c0b56afa4f713ee2a1d17c53d9efd98a
Yunlian Jiang [Tue, 3 Oct 2017 04:20:17 +0000 (04:20 +0000)]
Merge "Replace strcpy with memcpy."
am:
bb115bac41
Change-Id: I28c118a609d999fe1ef6bd126557e63076f452c6
Treehugger Robot [Tue, 3 Oct 2017 04:09:48 +0000 (04:09 +0000)]
Merge "Replace strcpy with memcpy."
Reifu Sato [Thu, 28 Sep 2017 06:10:09 +0000 (15:10 +0900)]
Collapse Notification panel after tapping CLEAR ALL button
Usually, notification panel is automatically collapsed
after tapping "CLEAR ALL" button but is not collapsed
if all dismissable notifications are scrolled out.
In this case, dismissed notification is still displayed
until notification panel is once collapsed.
And that "dismissed" notification causes several issues.
To avoid this, collapse notification panel automatically
after tapping "CLEAR ALL" button even when all dismissable
notifications are scrolled out.
Fixes:
67246876
Test: manual - post ongoing and dismissable notifications,
and tap CLEAR ALL button.
Change-Id: I048255cde6fdb4cedd2c3472e345ff63c744af68
Colin Cross [Tue, 3 Oct 2017 01:51:39 +0000 (01:51 +0000)]
Merge "Delete jack support" am:
1704df64ce -s ours am:
b8fb4e35ba
am:
a2a6f9eee6
Change-Id: I1cc272a62cc67158dc24c0cbb3564f068ccc7dad
Colin Cross [Tue, 3 Oct 2017 01:41:41 +0000 (01:41 +0000)]
Merge "Delete jack support" am:
1704df64ce -s ours
am:
b8fb4e35ba
Change-Id: If710d83dae6ca05a024862b7f176a130aab8a3da
Colin Cross [Tue, 3 Oct 2017 01:31:05 +0000 (01:31 +0000)]
Merge "Delete jack support"
am:
1704df64ce -s ours
Change-Id: I185bb57219e86d9ef41ebcf5e3f03daaf4946529
Treehugger Robot [Tue, 3 Oct 2017 01:17:25 +0000 (01:17 +0000)]
Merge "Delete jack support"
Wonsik Kim [Mon, 2 Oct 2017 23:16:34 +0000 (16:16 -0700)]
fix AmrInputStream.read() hang
Test: AmrInputStream.read() no longer hangs
Change-Id: I5b3e1c7667891ce250e447c32213511077c5b5df
Hansong Zhang [Tue, 3 Oct 2017 00:40:12 +0000 (00:40 +0000)]
Merge "DO NOT MERGE ANYWHERE: Revert "Merge "Bluetooth HID Device: Fix a typo" am:
d30e47ecfc am:
849805b804"" into oc-dr1-dev-plus-aosp
am:
684bead629 -s ours
Change-Id: Ib70696d6a11d9054a5ad6a6241809cfc7ba97908
Jerry Zhang [Tue, 3 Oct 2017 00:33:02 +0000 (00:33 +0000)]
Merge "Add moveObject method to change object's path and parent." am:
33a200e572 am:
0f09ac317d
am:
f9696617bd
Change-Id: Ia6ba6d0cf89879914894d35a0dbf110d905966ac
TreeHugger Robot [Tue, 3 Oct 2017 00:28:16 +0000 (00:28 +0000)]
Merge "DO NOT MERGE ANYWHERE: Revert "Merge "Bluetooth HID Device: Fix a typo" am:
d30e47ecfc am:
849805b804"" into oc-dr1-dev-plus-aosp
TreeHugger Robot [Tue, 3 Oct 2017 00:27:10 +0000 (00:27 +0000)]
Merge "DO NOT MERGE ANYWHERE: Revert "Merge "Bluetooth HID Device: Fix a typo" am:
d30e47ecfc am:
849805b804 am:
45f17f4533"" into oc-mr1-dev-plus-aosp
Chris Wren [Tue, 3 Oct 2017 00:19:02 +0000 (00:19 +0000)]
Merge "Enable experimentation on notification snooze options" into oc-mr1-dev
am:
9cb14a0c95
Change-Id: Ia54ca5b12479f22c9bef54b1f488bcb74e15423f
Jerry Zhang [Tue, 3 Oct 2017 00:13:50 +0000 (00:13 +0000)]
Merge "Add moveObject method to change object's path and parent." am:
33a200e572
am:
0f09ac317d
Change-Id: Ie2c742826fb4b7cb21e15f4d4777145ebbbd0923
Jerry Zhang [Tue, 3 Oct 2017 00:04:03 +0000 (00:04 +0000)]
Merge "Add moveObject method to change object's path and parent."
am:
33a200e572
Change-Id: Iabb8c9989ad35140ab1c752fb70741f52e56c04d
TreeHugger Robot [Tue, 3 Oct 2017 00:02:08 +0000 (00:02 +0000)]
Merge "Enable experimentation on notification snooze options" into oc-mr1-dev
Adam Lesinski [Mon, 2 Oct 2017 23:37:20 +0000 (16:37 -0700)]
AAPT2: Preserve line numbers when deserializing from binary XML
Bug:
65827146
Test: make aapt2_tests
Change-Id: Idbfea640eb8727fe209ebc6eb072296845d9f282
Treehugger Robot [Mon, 2 Oct 2017 23:53:56 +0000 (23:53 +0000)]
Merge "Add moveObject method to change object's path and parent."
Christopher Tate [Mon, 2 Oct 2017 22:55:44 +0000 (22:55 +0000)]
Merge "Reduce lock interactions in backup transport management" into oc-mr1-dev
am:
96b9ddbcb2
Change-Id: I40b489172034036d112d367c183110ae9d9408db
TreeHugger Robot [Mon, 2 Oct 2017 22:43:48 +0000 (22:43 +0000)]
Merge "Reduce lock interactions in backup transport management" into oc-mr1-dev
Adam Lesinski [Fri, 29 Sep 2017 18:15:17 +0000 (11:15 -0700)]
AAPT2: Fix R.java styleable + indices ordering
Make sure that Styleables are directly followed by their indices.
If not, Robolectric breaks. This is not strictly incorrect to have
an arbitrary ordering in R.java, but its easier to just support
Robolectric in this case.
Bug:
65837293
Merged-In: Ia59ba58427ade386d075ca9fc9eb5b53e35beca0
Test: make aapt2_tests
(cherry picked from commit
af85c4deb667843a227d62275fe6992005f4c38d)
Change-Id: Ia59ba58427ade386d075ca9fc9eb5b53e35beca0
Hansong Zhang [Mon, 2 Oct 2017 22:20:13 +0000 (22:20 +0000)]
DO NOT MERGE ANYWHERE: Revert "Merge "Bluetooth HID Device: Fix a typo" am:
d30e47ecfc am:
849805b804"
This reverts commit
45f17f453342accf5478e0b3a2a80e9e8a4ce8e8.
Merged-In: I06ffc536f5912d53319b4d325f77991d65ab04f2
Change-Id: I74271f26bbe28b02117d688a6aa0bf83f0be3780
Hansong Zhang [Mon, 2 Oct 2017 22:19:38 +0000 (22:19 +0000)]
DO NOT MERGE ANYWHERE: Revert "Merge "Bluetooth HID Device: Fix a typo" am:
d30e47ecfc am:
849805b804 am:
45f17f4533"
This reverts commit
7c55e52d5193c6baa0c6ca45a9c080240df2cac4.
Merged-In: I06ffc536f5912d53319b4d325f77991d65ab04f2
Change-Id: Ib83d5de0dbc0c98c6cf0b4c5f7381cb0f70a5da5
Eino-Ville Talvala [Mon, 2 Oct 2017 21:47:36 +0000 (21:47 +0000)]
Merge "ImageFormat: Document units/coordinate system for DEPTH_POINT_CLOUD" into oc-mr1-dev
am:
56afee3c1f
Change-Id: I07f2205daf1d751e08a67381048a93ccbd3af86d
Adam Powell [Mon, 2 Oct 2017 21:40:30 +0000 (21:40 +0000)]
Merge "Lower watchdog timeout for ChooserTargetService responses" into oc-mr1-dev
am:
cbe8754184
Change-Id: I96573018654de3cfccdae1be6ce01ae7749c5ffe
Chris Wren [Mon, 2 Oct 2017 21:29:46 +0000 (17:29 -0400)]
Enable experimentation on notification snooze options
Bug:
67003813
Test: runtest systemui
Change-Id: Id46ef3938e2edc633f64cec7b66e10d80c9a0bff
George Mount [Mon, 2 Oct 2017 21:23:15 +0000 (21:23 +0000)]
Merge "Fix Transition test failure." into oc-mr1-dev
am:
dbd11d6c8b
Change-Id: I5ae4bde02a4ee2a6d053529ebed0b6aa3dc596c5
TreeHugger Robot [Mon, 2 Oct 2017 21:22:57 +0000 (21:22 +0000)]
Merge "ImageFormat: Document units/coordinate system for DEPTH_POINT_CLOUD" into oc-mr1-dev
TreeHugger Robot [Mon, 2 Oct 2017 20:40:37 +0000 (20:40 +0000)]
Merge "Lower watchdog timeout for ChooserTargetService responses" into oc-mr1-dev
TreeHugger Robot [Mon, 2 Oct 2017 20:36:06 +0000 (20:36 +0000)]
Merge "Fix Transition test failure." into oc-mr1-dev
Christopher Tate [Wed, 27 Sep 2017 22:39:54 +0000 (15:39 -0700)]
Reduce lock interactions in backup transport management
1. process package update broadcasts on our background thread rather
than on the main looper thread
2. don't synchronize unnecessarily around access to simple
transport metadata
We mustn't block the main looper thread for anything that might wind
up interlocked with calls to the transport, because those might take
arbitrary amounts of time. We were previously entering such an
implicitly interlocked code path during package-changed broadcast
handling, and in pathological cases were causing the watchdog to
restart the system. This situation is addressed in a couple of ways:
first, by no longer performing package-update work on the main looper
thread at all; and second, by eliminating lock reliance entirely from
data-access paths that don't actually need it.
Bug:
65438129
Bug:
64133971
Test: manual + CTS
Change-Id: I361ad4a0729f319db7339bd341a6d33aa3b64fed
Merged-In: I361ad4a0729f319db7339bd341a6d33aa3b64fed
Colin Cross [Mon, 2 Oct 2017 20:03:49 +0000 (20:03 +0000)]
Delete jack support am:
72ad4a04ee
am:
9519197497
Change-Id: I1602c75659c5f5fb9362444b639f020c5d7ed319
Colin Cross [Mon, 2 Oct 2017 19:51:03 +0000 (19:51 +0000)]
Delete jack support
am:
72ad4a04ee
Change-Id: I58d8bfced33df174b48b797c62d8010233285fca
Felipe Leme [Mon, 2 Oct 2017 19:00:58 +0000 (19:00 +0000)]
Merge "FIxed typo." into oc-mr1-dev
am:
683064f605
Change-Id: I445af6174e7f9b0d35e26a6b33feb925e3bc3f66
Jerry Zhang [Wed, 27 Sep 2017 00:49:52 +0000 (17:49 -0700)]
Add moveObject method to change object's path and parent.
This is needed to implement the MTP MOVE_OBJECT operation.
Bug:
66679910
Test: Move objects and folders, verify mediastore is consistent
Change-Id: I2f4f0c43134fb3ff82745166c051712cc1736b7f
TreeHugger Robot [Mon, 2 Oct 2017 18:46:30 +0000 (18:46 +0000)]
Merge "FIxed typo." into oc-mr1-dev
Eino-Ville Talvala [Mon, 2 Oct 2017 18:39:41 +0000 (11:39 -0700)]
ImageFormat: Document units/coordinate system for DEPTH_POINT_CLOUD
For camera devices, DEPTH_POINT_CLOUD coordinates are in meters and
are in the camera's local coordinate system.
Test: Built docs, manually verified output.
Bug:
67308479
Change-Id: I028e13a2fb79688a7ce440f905fa82826fc38a03
Karthik Ravi Shankar [Mon, 2 Oct 2017 18:32:28 +0000 (18:32 +0000)]
Merge "Fix launch of activities into VR Virtual display" into oc-mr1-dev
am:
488665d9e3
Change-Id: Ia6d5cfffb8dddf2603a73ae88212fc7353948d67
Colin Cross [Wed, 27 Sep 2017 21:43:27 +0000 (14:43 -0700)]
Delete jack support
Remove references to jack makefiles that no longer exist.
Bug:
65302138
Test: m -j checkbuild
Change-Id: I9fbee7db0167300edf59a85badeff87b4b25f846
Merged-In: I9fbee7db0167300edf59a85badeff87b4b25f846
(cherry picked from commit
c6fbe4ef07faaee070f96c380682c5392386be6a)
OSDN Git Service
