OSDN Git Service
Alan Viverette [Tue, 13 Mar 2018 00:32:45 +0000 (00:32 +0000)]
Merge "Migrate multidex to androidx" into pi-dev
am:
b5837d14c2
Change-Id: I9d1193b1387c6160daa57fd1f4c2812b3bf63824
Chen Xu [Tue, 13 Mar 2018 00:20:17 +0000 (00:20 +0000)]
Merge "Carrier id api rename" into pi-dev
am:
f78767d2f9
Change-Id: If619579e7c3bba865754b07909bc8864efd6c78b
Adrian Roos [Mon, 12 Mar 2018 23:45:20 +0000 (23:45 +0000)]
Merge "DisplayCutout: Support more than one cutout" into pi-dev
am:
5d92e72482
Change-Id: Iadeec00a6863e307f061763d6ba7fdffb12d225d
Marco Nelissen [Mon, 12 Mar 2018 23:39:16 +0000 (23:39 +0000)]
[automerger] Rework thumbnail cleanup am:
82a2a87474 am:
97eb9d056a skipped:
cb9dd5d0e6 am:
ddfcb07714 -s ours am:
7e7681f7c3 -s ours am:
36f77be954 -s ours
am:
661ab62146 -s ours
Change-Id: I80b3ca2629301622de4857e9ddf56e297ff4eec4
Beverly Tai [Mon, 12 Mar 2018 23:28:58 +0000 (23:28 +0000)]
Merge "Using zen duration preference" into pi-dev
am:
75431913ef
Change-Id: Ic50e017f72e520da141580227648a7e639cc8cea
Abodunrinwa Toki [Mon, 12 Mar 2018 23:20:56 +0000 (23:20 +0000)]
Merge "TextClassifierService.onSelectionEvent" into pi-dev
am:
197ea9e3a5
Change-Id: I2dc4e4b43ca55d45ae97f852a93458b5a2b7dbb9
David Brazdil [Mon, 12 Mar 2018 23:16:24 +0000 (23:16 +0000)]
Merge "Add more APIs on hidden API light greylist" into pi-dev
am:
34cc187561
Change-Id: I242e26f3bedff68c2e2f54ff2e1ebaf745454102
Alan Viverette [Mon, 12 Mar 2018 23:15:51 +0000 (23:15 +0000)]
Merge "Migrate multidex to androidx" into pi-dev
Android Build Merger (Role) [Mon, 12 Mar 2018 23:07:52 +0000 (23:07 +0000)]
Merge "Merge "Remove getDefaultSim hidden api" am:
fdf4dd7928 am:
083986303a" into pi-dev-plus-aosp
Jordan Liu [Mon, 12 Mar 2018 23:07:23 +0000 (23:07 +0000)]
Merge "Remove getDefaultSim hidden api" am:
fdf4dd7928
am:
083986303a
Change-Id: Ib638d1a7002e24f53150c505aee359cf062ddfdd
Julia Reynolds [Mon, 12 Mar 2018 23:05:40 +0000 (23:05 +0000)]
Merge "Log interruptive notifications" into pi-dev
am:
dcf12d4a39
Change-Id: Id22e93e6777b956721425a434adb3c270ddc8b57
Jordan Liu [Mon, 12 Mar 2018 22:57:21 +0000 (22:57 +0000)]
Merge "Remove getDefaultSim hidden api"
am:
fdf4dd7928
Change-Id: Iddf30f8b24ec3de2497af050674a0d4d64cb7686
Felipe Leme [Mon, 12 Mar 2018 22:54:09 +0000 (22:54 +0000)]
Merge "Add default URL bar resource id for autofill compat mode." into pi-dev
am:
c2ecfd9754
Change-Id: I26402bc6a7f4cce95601d1653efc299c3c271888
Chen Xu [Mon, 12 Mar 2018 22:49:21 +0000 (22:49 +0000)]
Merge "Carrier id api rename" into pi-dev
TreeHugger Robot [Mon, 12 Mar 2018 22:45:34 +0000 (22:45 +0000)]
Merge "DisplayCutout: Support more than one cutout" into pi-dev
Marco Nelissen [Mon, 12 Mar 2018 22:23:20 +0000 (22:23 +0000)]
[automerger] Rework thumbnail cleanup am:
82a2a87474 am:
97eb9d056a skipped:
cb9dd5d0e6 am:
ddfcb07714 -s ours am:
7e7681f7c3 -s ours
am:
36f77be954 -s ours
Change-Id: I3aed2cd01667f1befe5bb401cef41922f3133da7
Marco Nelissen [Mon, 12 Mar 2018 22:09:28 +0000 (22:09 +0000)]
[automerger] Rework thumbnail cleanup am:
82a2a87474 am:
97eb9d056a skipped:
cb9dd5d0e6 am:
ddfcb07714 -s ours
am:
7e7681f7c3 -s ours
Change-Id: Ic1dc057f8e32e2ef4ab09892f1d46a9f2bf89186
Marco Nelissen [Mon, 12 Mar 2018 22:00:25 +0000 (22:00 +0000)]
Rework thumbnail cleanup -- DO NOT MERGE am:
338438b389 am:
dfd8732488 -s ours am:
afa1ac1c45 -s ours
am:
cb956d256e -s ours
Change-Id: I9f29983908e7b3ddd7053da7fbf6ce3d9e80ff97
Marco Nelissen [Mon, 12 Mar 2018 21:58:49 +0000 (21:58 +0000)]
[automerger] Rework thumbnail cleanup am:
82a2a87474 am:
97eb9d056a skipped:
cb9dd5d0e6
am:
ddfcb07714 -s ours
Change-Id: I9f21bbc8a7e4feac60a233fb7c79c587b0bc1a82
Felipe Leme [Mon, 12 Mar 2018 21:52:13 +0000 (21:52 +0000)]
Merge "Implemented WebView.isVisibleToUserForAutofill()" into pi-dev
am:
ec174b28c4
Change-Id: I472cbdae966778e46fd4d05c0455cc352cdc63b5
Winson Chung [Mon, 12 Mar 2018 21:47:35 +0000 (21:47 +0000)]
Merge "Expose whether a snapshot is a real snapshot" into pi-dev
am:
4aee38fd01
Change-Id: Ib94f0ca6e741bbb8495c33803516ffb94227ae2b
Pirama Arumuga Nainar [Mon, 12 Mar 2018 21:42:56 +0000 (21:42 +0000)]
Merge "Revert "Disable LTO temporarily for hwui"" into pi-dev
am:
6964e7548f
Change-Id: I8858a18ec131cf6d75df4ddb9850de8e573c3674
Beverly Tai [Mon, 12 Mar 2018 21:39:18 +0000 (21:39 +0000)]
Merge "Using zen duration preference" into pi-dev
Mohamed Abdalkader [Mon, 12 Mar 2018 21:38:00 +0000 (21:38 +0000)]
Merge "Unhide ImsCallProfileConstructor." into pi-dev
am:
7333793eaa
Change-Id: I9133d9a2bca538fd3b099ff5132b8e7460e50074
TreeHugger Robot [Mon, 12 Mar 2018 21:35:25 +0000 (21:35 +0000)]
Merge "TextClassifierService.onSelectionEvent" into pi-dev
Jakub Pawlowski [Mon, 12 Mar 2018 21:33:15 +0000 (21:33 +0000)]
Merge "AudioService: Hearing Aid output management" into pi-dev
am:
228f8f877a
Change-Id: Id15e31b1d405d004b4e9f1099f478e5b222a3656
TreeHugger Robot [Mon, 12 Mar 2018 21:30:55 +0000 (21:30 +0000)]
Merge "Add more APIs on hidden API light greylist" into pi-dev
Andrew Grieve [Mon, 12 Mar 2018 21:25:28 +0000 (21:25 +0000)]
Merge "Add Application.getProcessName()" into pi-dev
am:
44662a157e
Change-Id: I90a6d1dce5b504e578161e365f9efa74935779c6
Jordan Liu [Mon, 12 Mar 2018 21:17:43 +0000 (21:17 +0000)]
Merge "Remove getDefaultSim hidden api"
Chong Zhang [Mon, 12 Mar 2018 21:12:48 +0000 (21:12 +0000)]
Merge "heif: add definition for HEVC Main Still Picture profile" into pi-dev
am:
f78a08c2d9
Change-Id: I5744f14be7cf4a0086f987227558c74974f2532b
Julia Reynolds [Mon, 12 Mar 2018 21:10:59 +0000 (21:10 +0000)]
Merge "Log interruptive notifications" into pi-dev
TreeHugger Robot [Mon, 12 Mar 2018 21:05:59 +0000 (21:05 +0000)]
Merge "Add default URL bar resource id for autofill compat mode." into pi-dev
Bryce Lee [Mon, 12 Mar 2018 20:50:19 +0000 (20:50 +0000)]
Merge "Update documentation for Activity#onCreate." into pi-dev
am:
2b9620cc71
Change-Id: Ida3fd0947d97a6e26547d4182691ae8c66f5705c
Marco Nelissen [Mon, 12 Mar 2018 20:39:16 +0000 (20:39 +0000)]
Rework thumbnail cleanup -- DO NOT MERGE am:
338438b389 am:
dfd8732488 -s ours
am:
afa1ac1c45 -s ours
Change-Id: I25e440aa943e7eae1315f2d14f9aa5a69ec84d6d
TreeHugger Robot [Mon, 12 Mar 2018 20:35:53 +0000 (20:35 +0000)]
Merge "Implemented WebView.isVisibleToUserForAutofill()" into pi-dev
Winson Chung [Mon, 12 Mar 2018 20:34:07 +0000 (20:34 +0000)]
Merge "Expose whether a snapshot is a real snapshot" into pi-dev
Marco Nelissen [Mon, 12 Mar 2018 20:30:31 +0000 (20:30 +0000)]
Rework thumbnail cleanup -- DO NOT MERGE am:
338438b389
am:
dfd8732488 -s ours
Change-Id: I55fc68fb627fa472cb7609c0d66e5679c03203fd
Felipe Leme [Mon, 12 Mar 2018 20:19:10 +0000 (20:19 +0000)]
Merge "Moved urlBarResourceId from autofill service manifest to whitelist settings." into pi-dev
am:
9e56800b6e
Change-Id: I521d7b979b343cf89db14864b63a10b29396694e
Marco Nelissen [Mon, 12 Mar 2018 20:18:40 +0000 (20:18 +0000)]
Rework thumbnail cleanup -- DO NOT MERGE
am:
338438b389
Change-Id: Ie70f916db23cfed4138812cc10a0c708ef1d45a4
Pirama Arumuga Nainar [Mon, 12 Mar 2018 20:16:01 +0000 (20:16 +0000)]
Merge "Revert "Disable LTO temporarily for hwui"" into pi-dev
Rubin Xu [Mon, 12 Mar 2018 20:12:18 +0000 (20:12 +0000)]
Merge "Move escrow APIs into LockSettingsInternal" into pi-dev
am:
e40dcabbc8
Change-Id: I0e6a1c4355243cf8ae0074672bb26f8669343c49
Kevin Chyn [Mon, 12 Mar 2018 20:02:59 +0000 (20:02 +0000)]
Merge "Polish FingerprintDialog" into pi-dev
am:
7b97503caa
Change-Id: I39ffd837d75c40ca0cb33c96d7cb501045ef457f
Mohamed Abdalkader [Mon, 12 Mar 2018 19:54:40 +0000 (19:54 +0000)]
Merge "Unhide ImsCallProfileConstructor." into pi-dev
Android Build Merger (Role) [Mon, 12 Mar 2018 19:54:22 +0000 (19:54 +0000)]
[automerger] Rework thumbnail cleanup am:
82a2a87474 am:
97eb9d056a skipped:
cb9dd5d0e6
Change-Id: Id9b936c4829603ea09fcc631a56755805ffc2b83
Bookatz [Mon, 12 Mar 2018 19:49:31 +0000 (19:49 +0000)]
Merge "Statsd BroadcastSubscribers can receive 'cookies'" into pi-dev
am:
81cacb274c
Change-Id: I4a74e97d84db573c98d4fbb3645ad0662c153aea
TreeHugger Robot [Mon, 12 Mar 2018 19:46:33 +0000 (19:46 +0000)]
Merge "AudioService: Hearing Aid output management" into pi-dev
TreeHugger Robot [Mon, 12 Mar 2018 19:43:22 +0000 (19:43 +0000)]
Merge "Add Application.getProcessName()" into pi-dev
Chong Zhang [Mon, 12 Mar 2018 19:40:00 +0000 (19:40 +0000)]
Merge "heif: add definition for HEVC Main Still Picture profile" into pi-dev
Chenjie Yu [Mon, 12 Mar 2018 19:36:58 +0000 (19:36 +0000)]
Merge "Remove kPullerCooldownMap from code" into pi-dev
am:
9722ec74e0
Change-Id: I729a7169fbc579adfb72652e1123fbb932ad811b
David Brazdil [Mon, 12 Mar 2018 15:16:14 +0000 (15:16 +0000)]
Add more APIs on hidden API light greylist
Seen in use by apps.
Bug:
71501570
Test: make
Change-Id: Ia639444acb36d2124d6c9c5fed32827d6c9edcae
Abodunrinwa Toki [Tue, 6 Feb 2018 23:32:41 +0000 (23:32 +0000)]
TextClassifierService.onSelectionEvent
Bug:
74466564
Bug:
67609167
Test: bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest
Test: bit FrameworksCoreTests:android.view.textclassifier.logging.SelectionEventTest
Merged-In: Ib5af1ec80a38432d1201fbc913acdc3597d6ba82
Change-Id: Ib5af1ec80a38432d1201fbc913acdc3597d6ba82
Vadim Tryshev [Mon, 12 Mar 2018 19:32:02 +0000 (19:32 +0000)]
Merge "Adding generation of ACTION_TOGGLE_RECENTS to shared lib" into pi-dev
am:
82bc5baeb5
Change-Id: Ice9e85805b27139bbeec98f0c1736e0265d95309
Bryce Lee [Mon, 12 Mar 2018 19:18:36 +0000 (19:18 +0000)]
Merge "Update documentation for Activity#onCreate." into pi-dev
Abodunrinwa Toki [Mon, 12 Mar 2018 19:15:37 +0000 (19:15 +0000)]
Allow TextClassifierServices to get a hold of a local TextClassifer.
am:
e6d974a567
Change-Id: I4f2b63e01ce93186857641616c4eea3aae039bc8
Android Build Merger (Role) [Mon, 12 Mar 2018 18:54:01 +0000 (18:54 +0000)]
Merge "Merge "Make TelephonyManager#{set/get}{Voice/Date}ActivationState SystemApis" am:
d82b356685 am:
30663935e4 -s ours" into pi-dev-plus-aosp
Gil O'Neil [Mon, 12 Mar 2018 18:53:32 +0000 (18:53 +0000)]
Merge "Make TelephonyManager#{set/get}{Voice/Date}ActivationState SystemApis" am:
d82b356685
am:
30663935e4 -s ours
Change-Id: I954f586f115e822d96e60526125f7791390ae0c3
TreeHugger Robot [Mon, 12 Mar 2018 18:53:10 +0000 (18:53 +0000)]
Merge "Moved urlBarResourceId from autofill service manifest to whitelist settings." into pi-dev
TreeHugger Robot [Mon, 12 Mar 2018 18:51:28 +0000 (18:51 +0000)]
Merge "Move escrow APIs into LockSettingsInternal" into pi-dev
Chris Tate [Mon, 12 Mar 2018 18:51:16 +0000 (18:51 +0000)]
Merge "Defer deleting a http cache" into pi-dev
am:
15e91e6f3a -s ours
Change-Id: I603138ee257f6f6c7d5d77a5720149cb09225682
Gil O'Neil [Mon, 12 Mar 2018 18:40:35 +0000 (18:40 +0000)]
Merge "Make TelephonyManager#{set/get}{Voice/Date}ActivationState SystemApis"
am:
d82b356685
Change-Id: I2c1cd1512450401c89d5603d75dcd9ad358544b8
Ivan Podogov [Mon, 12 Mar 2018 18:37:31 +0000 (18:37 +0000)]
Merge "Avoid changing display power state on draw wake lock" into pi-dev
am:
a71712dfa8
Change-Id: Idabd29b48e2450974f44a982fe2fd95086af8005
Kevin Chyn [Mon, 12 Mar 2018 18:35:05 +0000 (18:35 +0000)]
Merge "Polish FingerprintDialog" into pi-dev
TreeHugger Robot [Mon, 12 Mar 2018 18:27:02 +0000 (18:27 +0000)]
Merge "Statsd BroadcastSubscribers can receive 'cookies'" into pi-dev
TreeHugger Robot [Mon, 12 Mar 2018 18:25:00 +0000 (18:25 +0000)]
Merge "Remove kPullerCooldownMap from code" into pi-dev
Wonsik Kim [Mon, 12 Mar 2018 18:15:45 +0000 (18:15 +0000)]
Merge "Implement CodecProfileLevel.{equals|hashCode}" into pi-dev
am:
89a2b6c560
Change-Id: I95389e92c7d0b9cae098997e6c6e7b9aa27a149e
TreeHugger Robot [Mon, 12 Mar 2018 18:13:16 +0000 (18:13 +0000)]
Merge "Adding generation of ACTION_TOGGLE_RECENTS to shared lib" into pi-dev
Abodunrinwa Toki [Tue, 6 Mar 2018 18:18:30 +0000 (18:18 +0000)]
Allow TextClassifierServices to get a hold of a local TextClassifer.
Test: builds
Bug:
74466564
Bug:
72747726
Merged-In: Idb108f2b3d95393a051f9f19b0c04fc4e3ed2b33
Change-Id: Idb108f2b3d95393a051f9f19b0c04fc4e3ed2b33
Chris Tate [Mon, 12 Mar 2018 18:00:05 +0000 (18:00 +0000)]
Merge "Defer deleting a http cache" into pi-dev
Hidehiko Tsuchiya [Thu, 18 Jan 2018 04:50:55 +0000 (13:50 +0900)]
Defer deleting a http cache
Symptom:
StatementService was crashed due to the exception;
"java.lang.IllegalStateException: cache is closed"
Root cause:
The http cache is deleted at DirectStatementService#onDestroy
in main thread. If a worker thread is still alive and it tries to
access the cache, it fails with IllegalStateException.
Solution:
The request of deleting a cache was moved from the main thread to
worker. Now, the cache can be deleted safely.
Cherrypick from AOSP master.
Bug:
73911877
Test: manual
Change-Id: I61f4e62b00e35f4a272ef983758e61ef3bf2d180
Merged-In: I61f4e62b00e35f4a272ef983758e61ef3bf2d180
TreeHugger Robot [Mon, 12 Mar 2018 17:58:55 +0000 (17:58 +0000)]
Merge "Avoid changing display power state on draw wake lock" into pi-dev
Tej Singh [Mon, 12 Mar 2018 17:54:00 +0000 (17:54 +0000)]
Merge "Logging in StatsCompanionService" into pi-dev
am:
fe00a37b8f
Change-Id: If44d77b5dc85e340d5e2cd5542540a2cf85ea36e
TreeHugger Robot [Mon, 12 Mar 2018 17:45:57 +0000 (17:45 +0000)]
Merge "Implement CodecProfileLevel.{equals|hashCode}" into pi-dev
TreeHugger Robot [Mon, 12 Mar 2018 17:37:11 +0000 (17:37 +0000)]
Merge "Logging in StatsCompanionService" into pi-dev
Felipe Leme [Mon, 12 Mar 2018 17:28:42 +0000 (10:28 -0700)]
Add default URL bar resource id for autofill compat mode.
These ids used to be defined at the manifest but now are defined on settings,
so we need to provide default values until the settings are fixed.
Test: atest FrameworksServicesTests:AutofillManagerServiceTest
Bug:
74445943
Change-Id: I050a96d73cb9e008179865381c6abc3041e82844
Gil O'Neil [Mon, 12 Mar 2018 17:28:47 +0000 (17:28 +0000)]
Merge "Make TelephonyManager#{set/get}{Voice/Date}ActivationState SystemApis"
Rohan Shah [Mon, 12 Mar 2018 17:28:44 +0000 (17:28 +0000)]
Merge "Nit cleanup: Update TileLayout.onLayout" into pi-dev
am:
71120e1b20
Change-Id: I87ac4893c28360bba7cb088bfaaa652619196bfc
Adrian Roos [Mon, 5 Mar 2018 18:50:16 +0000 (19:50 +0100)]
DisplayCutout: Support more than one cutout
Also makes API more restrictive. Also moves window manager specific
logic out of the framework. Also fixes SystemUI such that it can properly
deal with more than one cutout.
Bug:
74195186
Test: atest DisplayCutoutTest WmDisplayCutoutTest DisplayContentTests WindowFrameTests
Change-Id: Ib7b89e119ce2d3961687579bb81eadce1159a600
Rohan Shah [Mon, 12 Mar 2018 17:20:43 +0000 (17:20 +0000)]
Merge "[QS] Fix alarm text in QS header" into pi-dev
am:
df59556a9e
Change-Id: If0c7c6b4669f51d81bc7b84adc39442ce06b2850
Rohan Shah [Mon, 12 Mar 2018 17:12:25 +0000 (17:12 +0000)]
Merge "[QS] Update hotspot tile secondary text (data saver)" into pi-dev
am:
0cee663bf6
Change-Id: Ie902f041a2dfb678803556426507a323192f2411
Felipe Leme [Fri, 9 Mar 2018 22:13:18 +0000 (14:13 -0800)]
Moved urlBarResourceId from autofill service manifest to whitelist settings.
The manifest attribute is still public as it might have been used by autofill
services deployed against P DP1; it will be removed after the next developer
previs is branched out. We also need to assumie a default value for the buttons
if not specified by settings, but that will be done in a separate change so it
can be easily reverted.
Also implemented support for multiple buttons, and added unit tests.
Test: atest CtsAutoFillServiceTestCases:VirtualContainerActivityCompatModeTest \
CtsAutoFillServiceTestCases:VirtualContainerActivityTest \
FrameworksServicesTests:AutofillManagerServiceTest
Bug:
74445943
Bug:
72811561
Fixes:
73786629
Change-Id: I066ecf40fde2c5318dd8633a659fca8b7af8aecd
Bryce Lee [Mon, 12 Mar 2018 17:06:23 +0000 (10:06 -0700)]
Update documentation for Activity#onCreate.
The current description incorrectly states #onDestroy will be called
immediately when invoking #finish during #onCreate.
Change-Id: I816a54457d7aca0b40feac9a5656d94f7e712c76
Fixes:
69144863
Test: comment update.
Phil Weaver [Mon, 12 Mar 2018 17:04:20 +0000 (17:04 +0000)]
Merge "Don't let non-touchable windows retain a11y focus" into pi-dev
am:
8bbc30955a
Change-Id: Ia611497edd3721ea3ff88cf93087c45894b18656
Rohan Shah [Mon, 12 Mar 2018 16:53:56 +0000 (16:53 +0000)]
Merge "Nit cleanup: Update TileLayout.onLayout" into pi-dev
TreeHugger Robot [Mon, 12 Mar 2018 16:53:13 +0000 (16:53 +0000)]
Merge "[QS] Fix alarm text in QS header" into pi-dev
Artem Iglikov [Mon, 12 Mar 2018 16:51:33 +0000 (16:51 +0000)]
Merge "Whitelist UsbManager and UsbPortStatus apis" into pi-dev
am:
aad361480b
Change-Id: I76c655fc7d717c95291cc8cd3237a1b6c6e18dea
TreeHugger Robot [Mon, 12 Mar 2018 16:46:18 +0000 (16:46 +0000)]
Merge "[QS] Update hotspot tile secondary text (data saver)" into pi-dev
Phil Weaver [Mon, 12 Mar 2018 16:42:10 +0000 (16:42 +0000)]
Merge "Don't let non-touchable windows retain a11y focus" into pi-dev
Alan Viverette [Mon, 12 Mar 2018 16:38:41 +0000 (16:38 +0000)]
Merge "Fix resource directory references" into pi-dev
am:
c82bcf4d3c
Change-Id: I7e92f5b46c7809273dc7b41918df9839df41dfd7
Jakub Pawlowski [Thu, 22 Feb 2018 01:15:12 +0000 (17:15 -0800)]
AudioService: Hearing Aid output management
This patch makes Hearing Aid output active/inactive when the connection
state, reported from Bluetooth stack is changed.
Bug:
64038649
Test: mm
Change-Id: Iaeee39febab3c340a77e02afe3e0a573fb9736f9
Artem Iglikov [Mon, 12 Mar 2018 16:28:46 +0000 (16:28 +0000)]
Merge "Whitelist UsbManager and UsbPortStatus apis" into pi-dev
TreeHugger Robot [Mon, 12 Mar 2018 16:23:29 +0000 (16:23 +0000)]
Merge "Fix resource directory references" into pi-dev
Abodunrinwa Toki [Mon, 12 Mar 2018 15:49:43 +0000 (15:49 +0000)]
Merge "Merge textclassifier/logging/ into textclassifier/" into pi-dev
am:
9554dd94ec
Change-Id: Ic4f3b315e6afb94cdeea6b057af2fc84379f2b07
Tyler Gunn [Mon, 12 Mar 2018 15:31:15 +0000 (15:31 +0000)]
Merge "Support enhanced call blocking function" into pi-dev
am:
dd72cb529f
Change-Id: Ic13cea460351ca7a39f14aac26af58e127a05eb5
Abodunrinwa Toki [Mon, 12 Mar 2018 15:16:53 +0000 (15:16 +0000)]
Merge "Merge textclassifier/logging/ into textclassifier/" into pi-dev
Tyler Gunn [Mon, 12 Mar 2018 15:16:04 +0000 (15:16 +0000)]
Merge "Support enhanced call blocking function" into pi-dev
Emilian Peev [Mon, 12 Mar 2018 15:11:43 +0000 (15:11 +0000)]
Merge "Camera: SessionConfiguration should use Executors" into pi-dev
am:
9d3d6b4076
Change-Id: I906fd922753497dc150e8fe2d68d7af72152a316
TreeHugger Robot [Mon, 12 Mar 2018 14:55:34 +0000 (14:55 +0000)]
Merge "Camera: SessionConfiguration should use Executors" into pi-dev
Bernardo Rufino [Mon, 12 Mar 2018 14:54:22 +0000 (14:54 +0000)]
Merge "Add measurements for TransportClient connections" into pi-dev
am:
4bc0f39b4c
Change-Id: I1280327ce46033c6e1215d8562cdab94fbc30f69
Alan Viverette [Mon, 12 Mar 2018 14:32:22 +0000 (10:32 -0400)]
Fix resource directory references
Fixes:
74514647
Test: make
Change-Id: I47d65e56f7cdd3faa80c14d18e2e7767ca293ee4
TreeHugger Robot [Mon, 12 Mar 2018 14:32:59 +0000 (14:32 +0000)]
Merge "Add measurements for TransportClient connections" into pi-dev
OSDN Git Service
