OSDN Git Service
Julia Reynolds [Tue, 11 Jul 2017 14:39:58 +0000 (10:39 -0400)]
Send less ranking reconsiderations and updates
- NotificationIntrusivenessExtractor does not need to reconsider
ranking for non intrusive notifications
- All adjustments (by group helper and the assistant) have been moved to
extractors so we can selectively send ranking updates instead of always
sending them.
Fixes:
62827235
Test: runtest systemui-notification
Change-Id: I2ea746c3883049abac0752788a3f4c2fa50c8064
Julia Reynolds [Thu, 13 Jul 2017 18:35:17 +0000 (14:35 -0400)]
CATEGORY_SYSTEM should not bypass dnd
Test: code inspection
Change-Id: I857a88c2b992218ea2caace8bf5e6c05f14aec1b
Fixes:
31461162
Narayan Kamath [Fri, 14 Jul 2017 11:03:52 +0000 (11:03 +0000)]
Merge "DisplayPowerController: Disable color fade on low-ram devices."
Hugo Benichi [Fri, 14 Jul 2017 09:59:31 +0000 (09:59 +0000)]
Merge "CaptivePortalLogin ignores some ssl errors." into oc-dr1-dev-plus-aosp
am:
44d0cda8ef
Change-Id: I5bf2282984b9ed40d838cb6ae30c4ab694a8e160
TreeHugger Robot [Fri, 14 Jul 2017 09:50:59 +0000 (09:50 +0000)]
Merge "CaptivePortalLogin ignores some ssl errors." into oc-dr1-dev-plus-aosp
TreeHugger Robot [Fri, 14 Jul 2017 09:15:52 +0000 (09:15 +0000)]
Merge "Connectivity metrics: update ipconnectivity.proto"
Eino-Ville Talvala [Fri, 14 Jul 2017 05:55:35 +0000 (05:55 +0000)]
Merge "CameraManager: Handle camera service being disabled explicitly" into oc-dr1-dev am:
0c0fd0375c
am:
01d6fb2c9c
Change-Id: I7a2399498f7f234a09545107b0fdda3cade6ee30
Hugo Benichi [Sat, 17 Jun 2017 04:36:35 +0000 (13:36 +0900)]
CaptivePortalLogin ignores some ssl errors.
This patch changes the ssl error handler of the captive portal login
activity to ignore errors for resources coming from a different hostname
that the top-level page currently loading.
This allows logging into misconfigured portals that incorrectly bans ssl
to some hostnames necessary for loading their portal login pages.
Bug:
62332137
Test: manually tested with captive portal entwork.
(cherry pick from commit
22542ed48090e2e6e9474b658fdd368041a4060b which
was skipped from merging into oc-dr1-dev-plus-aosp because of previous
cherry picks and incorrect Merged-In annotations)
Change-Id: Idb6ffac2d97b15cfdbe524b91c84dd29ae0be00b
Eino-Ville Talvala [Fri, 14 Jul 2017 05:49:45 +0000 (05:49 +0000)]
Merge "CameraManager: Handle camera service being disabled explicitly" into oc-dr1-dev
am:
0c0fd0375c
Change-Id: I1d67c1f2cdaa28063110454592cf7306ecb7bcd2
TreeHugger Robot [Fri, 14 Jul 2017 05:41:34 +0000 (05:41 +0000)]
Merge "CameraManager: Handle camera service being disabled explicitly" into oc-dr1-dev
Hugo Benichi [Tue, 20 Jun 2017 02:15:14 +0000 (11:15 +0900)]
Connectivity metrics: update ipconnectivity.proto
Bug:
34901696
Test: $runtest frameworks-net
build, flashed, booted phone, $ adb shell dumpsys connmetrics list
Change-Id: I4cf5b95956df721aecd63fddfb026a7266c190b9
Naveen Kalla [Fri, 14 Jul 2017 04:03:10 +0000 (04:03 +0000)]
resolve merge conflicts of
b78661052c44 to oc-dr1-dev-plus-aosp
am:
7e15c58085 -s ours
Change-Id: I8beaabea919d72b47137234926b1d82507798109
Naveen Kalla [Fri, 14 Jul 2017 03:43:21 +0000 (20:43 -0700)]
resolve merge conflicts of
b78661052c44 to oc-dr1-dev-plus-aosp
Bug:
62933474
Test: Build
Change-Id: I5728fd9175cc23ec8ef62c0b645cbb3505fb76e3
Merged-In: If2b62b8148ba23840a4c018341e0fed24b41944b
Android Build Merger (Role) [Fri, 14 Jul 2017 03:02:47 +0000 (03:02 +0000)]
Merge "Merge "Clean up streaming API docs and organize errors" am:
d2c8dcfcfe am:
d98024a1f9 am:
f83fb827a7 am:
7b8d8578de"
TreeHugger Robot [Fri, 14 Jul 2017 03:01:36 +0000 (03:01 +0000)]
Merge "dump visiblity table in dumpsys accounts"
Hall Liu [Fri, 14 Jul 2017 03:01:09 +0000 (03:01 +0000)]
Merge "Clean up streaming API docs and organize errors" am:
d2c8dcfcfe am:
d98024a1f9 am:
f83fb827a7
am:
7b8d8578de
Change-Id: Iea8b54a10778494a0aee969ebf70fdc4e5e86cf7
TreeHugger Robot [Fri, 14 Jul 2017 02:54:59 +0000 (02:54 +0000)]
Merge "Convert CDMA caller ID codes while roaming on 3GPP networks" into oc-dr1-dev
Hall Liu [Fri, 14 Jul 2017 02:54:29 +0000 (02:54 +0000)]
Merge "Clean up streaming API docs and organize errors" am:
d2c8dcfcfe am:
d98024a1f9
am:
f83fb827a7
Change-Id: I90910fd62a74d7518d69c409eeb6cc8f4a7bb6f2
Hall Liu [Fri, 14 Jul 2017 02:48:17 +0000 (02:48 +0000)]
Merge "Clean up streaming API docs and organize errors" am:
d2c8dcfcfe
am:
d98024a1f9
Change-Id: I917a65a35bc607cdc9b820ac55a98d6bfab1b782
Hall Liu [Fri, 14 Jul 2017 02:43:10 +0000 (02:43 +0000)]
Merge "Clean up streaming API docs and organize errors"
am:
d2c8dcfcfe
Change-Id: I9d77d7dbc3c53baaa0ce4928de3bcbe353c1f6ab
Treehugger Robot [Fri, 14 Jul 2017 02:32:21 +0000 (02:32 +0000)]
Merge "Clean up streaming API docs and organize errors"
TreeHugger Robot [Fri, 14 Jul 2017 02:29:26 +0000 (02:29 +0000)]
Merge "Log sorted order instead of original order of selected apps."
Roozbeh Pournader [Fri, 14 Jul 2017 02:17:43 +0000 (02:17 +0000)]
Merge "Make strike-through respect kerning at boundaries"
TreeHugger Robot [Fri, 14 Jul 2017 01:50:16 +0000 (01:50 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Fri, 14 Jul 2017 01:33:05 +0000 (01:33 +0000)]
Merge "Import translations. DO NOT MERGE"
Lorenzo Colitti [Fri, 14 Jul 2017 01:06:56 +0000 (01:06 +0000)]
Merge changes Icc5aa605,If744f2e0,Ie1b5a5e4 into oc-dr1-dev am:
3756636ad6
am:
041111ff7e
Change-Id: I538f7faef85bbb13499dec2125e0f82b3175396f
Lorenzo Colitti [Fri, 14 Jul 2017 01:01:29 +0000 (01:01 +0000)]
Merge changes Icc5aa605,If744f2e0,Ie1b5a5e4 into oc-dr1-dev
am:
3756636ad6
Change-Id: Ic1e799c17b4bb0272cf85e03d5ad14981a55defa
Android Build Merger (Role) [Fri, 14 Jul 2017 00:59:05 +0000 (00:59 +0000)]
Merge "Merge "Merge "Make TextInputTimePickerView use localized input" into oc-dr1-dev am:
dd74c1a8cd" into oc-dr1-dev-plus-aosp am:
d792c31806"
TreeHugger Robot [Fri, 14 Jul 2017 00:58:21 +0000 (00:58 +0000)]
Merge "Import translations. DO NOT MERGE"
Roozbeh Pournader [Fri, 14 Jul 2017 00:57:59 +0000 (00:57 +0000)]
Merge "Merge "Make TextInputTimePickerView use localized input" into oc-dr1-dev am:
dd74c1a8cd" into oc-dr1-dev-plus-aosp
am:
d792c31806
Change-Id: I91e28ff9aa7b2bea64dcfe2371f8a734ea8cbb6e
Hugo Benichi [Fri, 14 Jul 2017 00:55:52 +0000 (00:55 +0000)]
resolve merge conflicts of
4f2a0fe213e5 to stage-aosp-master am:
a428392c1d am:
164ff8a2ed
am:
a30cb89dfa -s ours
Change-Id: Ie43a31dc8ccc156383c8ab24a255e0683a44622a
Lorenzo Colitti [Fri, 14 Jul 2017 00:51:56 +0000 (00:51 +0000)]
Merge changes Icc5aa605,If744f2e0,Ie1b5a5e4 into oc-dr1-dev
* changes:
Add code to dump OffloadController state.
Fetch tethering offload stats.
Allow more than one source of tethering statistics.
Kang Li [Thu, 13 Jul 2017 23:00:42 +0000 (16:00 -0700)]
Log sorted order instead of original order of selected apps.
Test: tested it with Tron logs to verify it works as expected.
Change-Id: I7b93fc57c1b72efbcb4f0dee429d7b22b47b6b0b
Android Build Merger (Role) [Fri, 14 Jul 2017 00:48:52 +0000 (00:48 +0000)]
Merge "Merge "Make TextInputTimePickerView use localized input" into oc-dr1-dev am:
dd74c1a8cd" into oc-dr1-dev-plus-aosp
Roozbeh Pournader [Fri, 14 Jul 2017 00:47:51 +0000 (00:47 +0000)]
Merge "Make TextInputTimePickerView use localized input" into oc-dr1-dev
am:
dd74c1a8cd
Change-Id: I23c2927e8281cb00f4d0fef8c83bcdebb2f682c7
Hugo Benichi [Fri, 14 Jul 2017 00:46:49 +0000 (00:46 +0000)]
resolve merge conflicts of
4f2a0fe213e5 to stage-aosp-master am:
a428392c1d
am:
164ff8a2ed
Change-Id: I08195e119f866acc9fe1795b892fe45cea3c7f47
TreeHugger Robot [Fri, 14 Jul 2017 00:43:53 +0000 (00:43 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Fri, 14 Jul 2017 00:40:08 +0000 (00:40 +0000)]
Merge "Import translations. DO NOT MERGE"
Hugo Benichi [Fri, 14 Jul 2017 00:37:20 +0000 (00:37 +0000)]
resolve merge conflicts of
4f2a0fe213e5 to stage-aosp-master
am:
a428392c1d
Change-Id: Ide67520d074330ec050ded71118bff0bc88be784
TreeHugger Robot [Fri, 14 Jul 2017 00:36:22 +0000 (00:36 +0000)]
Merge "Make TextInputTimePickerView use localized input" into oc-dr1-dev
TreeHugger Robot [Fri, 14 Jul 2017 00:31:29 +0000 (00:31 +0000)]
Merge "Convert CDMA caller ID codes while roaming on 3GPP networks"
Siqi Lin [Fri, 14 Jul 2017 00:12:49 +0000 (00:12 +0000)]
Merge "BootReceiver: Remove error log when last-header.txt is missing" into oc-dr1-dev am:
d0b2c3b28c
am:
0e01513293
Change-Id: I0bfb235c4046623a5ae81cf8f2555ab408c0689c
Siqi Lin [Fri, 14 Jul 2017 00:03:46 +0000 (00:03 +0000)]
Merge "BootReceiver: Remove error log when last-header.txt is missing" into oc-dr1-dev
am:
d0b2c3b28c
Change-Id: If06d96e09251c6de129c978f939f2206cbcda2d4
Siqi Lin [Thu, 13 Jul 2017 23:56:05 +0000 (23:56 +0000)]
Merge "BootReceiver: Remove error log when last-header.txt is missing" into oc-dr1-dev
David Lin [Thu, 13 Jul 2017 23:27:14 +0000 (23:27 +0000)]
Merge "Fix issue with double vibration trigger" into oc-dr1-dev am:
f34b4633bd
am:
d9f8a6bd9d
Change-Id: I496e6162949d0e12093e09f690d19a10e7132351
Arthur Ishiguro [Thu, 13 Jul 2017 23:23:26 +0000 (23:23 +0000)]
Merge "Fix default constructor for NanoApp"
David Lin [Thu, 13 Jul 2017 23:20:48 +0000 (23:20 +0000)]
Merge "Fix issue with double vibration trigger" into oc-dr1-dev
am:
f34b4633bd
Change-Id: Iaa872f5a6990f01dd832f48c88a3fc4625a89063
Peng Xu [Thu, 13 Jul 2017 23:19:16 +0000 (23:19 +0000)]
Merge "Add sensor HAL process into dump list" into oc-dr1-dev am:
2098c83afb
am:
15aef6c6cd
Change-Id: Icdaa9fd599a9d86657cebc97b468f08279bdccd0
TreeHugger Robot [Thu, 13 Jul 2017 23:14:31 +0000 (23:14 +0000)]
Merge "Fix issue with double vibration trigger" into oc-dr1-dev
TreeHugger Robot [Thu, 13 Jul 2017 23:11:47 +0000 (23:11 +0000)]
Merge "Switch file size formatters to use ICU's MeasureFormat"
Peng Xu [Thu, 13 Jul 2017 23:08:07 +0000 (23:08 +0000)]
Merge "Add sensor HAL process into dump list" into oc-dr1-dev
am:
2098c83afb
Change-Id: I4c46791379775c9fee08df41d38c9cfb0fa1775e
TreeHugger Robot [Thu, 13 Jul 2017 23:01:11 +0000 (23:01 +0000)]
Merge "Add sensor HAL process into dump list" into oc-dr1-dev
Naveen Kalla [Wed, 12 Jul 2017 03:03:58 +0000 (20:03 -0700)]
Convert CDMA caller ID codes while roaming on 3GPP networks
Convert CDMA CLIR MMI codes to 3GPP MMI codes when a CDMA
device is roaming on a 3GPP network. Use a Carrier Config
to control this feature.
Bug:
62933474
Test: Simulate Roaming scenario and ensure that the dial
string is converted as expected.
Change-Id: If2b62b8148ba23840a4c018341e0fed24b41944b
Hugo Benichi [Thu, 13 Jul 2017 22:25:51 +0000 (07:25 +0900)]
resolve merge conflicts of
4f2a0fe213e5 to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I61cfb2d4798350f28f1bb36aed67ee8f18895031
Roozbeh Pournader [Thu, 13 Jul 2017 22:19:45 +0000 (15:19 -0700)]
Make TextInputTimePickerView use localized input
Previously, TextInputTimePickerView used the default numeric IME, which
could result in cases where the digits displayed in the text fields were
native, but the IME showed ASCII digits resulting in a mix.
Now we use setImeHintLocales to hint that we need a localized IME.
Change-Id: Ic4041dcc65a31bd00741c6d96d8cbc5dac9d77c8
Fixes:
63650251
Test: Manual (tested under en-US and ar-BH locales)
Naveen Kalla [Wed, 12 Jul 2017 03:03:58 +0000 (20:03 -0700)]
Convert CDMA caller ID codes while roaming on 3GPP networks
Convert CDMA CLIR MMI codes to 3GPP MMI codes when a CDMA
device is roaming on a 3GPP network. Use a Carrier Config
to control this feature.
Bug:
62933474
Test: Simulate Roaming scenario and ensure that the dial
string is converted as expected.
Change-Id: If2b62b8148ba23840a4c018341e0fed24b41944b
Merged-In: If2b62b8148ba23840a4c018341e0fed24b41944b
Siqi Lin [Thu, 13 Jul 2017 21:04:13 +0000 (14:04 -0700)]
BootReceiver: Remove error log when last-header.txt is missing
It's normal for /data/system/last-header.txt to not exist on
the first boot after factory reset. The code already handles
this case properly so the Slog.e is just noise that shows up
in bugreports.
Bug:
37513804
Test: manual - boot after factory reset, check logcat
Change-Id: I1c8e3437cdbda5e04c0299764c7e4921bef67cb3
TreeHugger Robot [Thu, 13 Jul 2017 21:35:42 +0000 (21:35 +0000)]
Merge "Remove duplicate attrs."
Doris Ling [Thu, 13 Jul 2017 21:22:00 +0000 (21:22 +0000)]
Merge "Update the max height/width attribute of the TwoTargetPreference icon." into oc-dr1-dev am:
9f675cee28
am:
db0ec7d60f
Change-Id: I7ef8fb885ee70d05b9afee829f8278f4236c9eb0
Doris Ling [Thu, 13 Jul 2017 21:15:21 +0000 (21:15 +0000)]
Merge "Update the max height/width attribute of the TwoTargetPreference icon." into oc-dr1-dev
am:
9f675cee28
Change-Id: I32b19e453af7a28c990a28b9726487415fe5be6f
TreeHugger Robot [Thu, 13 Jul 2017 20:59:39 +0000 (20:59 +0000)]
Merge "Update the max height/width attribute of the TwoTargetPreference icon." into oc-dr1-dev
Tomasz Wasilczyk [Thu, 13 Jul 2017 20:50:10 +0000 (20:50 +0000)]
Merge "Publish new Broadcast Radio APIs."
Treehugger Robot [Thu, 13 Jul 2017 20:45:21 +0000 (20:45 +0000)]
Merge "IpManager: define InitialConfiguration"
David Lin [Thu, 13 Jul 2017 19:20:44 +0000 (12:20 -0700)]
Fix issue with double vibration trigger
This patch fixes an issue that cause duplicated calls to HAL even when
the first call succeeded.
Bug:
63667425
Test: manual test
Change-Id: I4c29e3c9872cc42ea143b3adda3a3defca728e71
Jorim Jaggi [Thu, 13 Jul 2017 20:32:47 +0000 (20:32 +0000)]
Merge "Also go to sleep when dozing" into oc-dr1-dev am:
be1577ae59
am:
efe90f8df1
Change-Id: I968bd2e3071f9f4024430b2718372339a57b6380
Arthur Ishiguro [Wed, 12 Jul 2017 23:24:09 +0000 (16:24 -0700)]
Fix default constructor for NanoApp
Bug:
37274363
Test: Compile and run CHQTS, verify warning not shown
Change-Id: I842f8571be31838b726fecfb138f329dea5f26fe
Roozbeh Pournader [Thu, 13 Jul 2017 19:45:20 +0000 (12:45 -0700)]
Make strike-through respect kerning at boundaries
Also clean up lower-level drawing of strike-through in Cavas.cpp.
We still cannot use the strike-through information from the font
since Skia doesn't provide it, so we are going with the default
values.
Test: Manual
Test: bit CtsTextTestCases:*
Test: adb shell am instrument -w -e package android.text com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Bug:
32907446
Change-Id: Iee6f8102a35eba0ff4127dbbef189529ab573e6d
Nikolas Bravo [Thu, 13 Jul 2017 20:20:57 +0000 (20:20 +0000)]
Merge "ProfileSelectDialog no longer removes caller activity from task." into oc-dr1-dev am:
479d915db5
am:
de93e6912f
Change-Id: I861c5f7d4527d297e8049fbd6fddb3a5f96248fc
Jorim Jaggi [Thu, 13 Jul 2017 20:20:27 +0000 (20:20 +0000)]
Merge "Also go to sleep when dozing" into oc-dr1-dev
am:
be1577ae59
Change-Id: If8fea9defc84fcd3f7f8f2c98dcb00f13f7ffffc
Jorim Jaggi [Thu, 13 Jul 2017 20:13:33 +0000 (20:13 +0000)]
Merge "Also go to sleep when dozing" into oc-dr1-dev
Christopher Ferris [Thu, 13 Jul 2017 20:10:47 +0000 (20:10 +0000)]
Merge "Implement dumpheap -m."
Android Build Merger (Role) [Thu, 13 Jul 2017 20:07:09 +0000 (20:07 +0000)]
Merge "Merge "Tear down agent after preflight rejection" into oc-dr1-dev am:
47303ec66b am:
19bb6c35ca"
Abodunrinwa Toki [Thu, 13 Jul 2017 20:06:12 +0000 (20:06 +0000)]
Merge "TextClassification.text is nullable"
Nikolas Bravo [Thu, 13 Jul 2017 20:05:55 +0000 (20:05 +0000)]
Merge "ProfileSelectDialog no longer removes caller activity from task." into oc-dr1-dev
am:
479d915db5
Change-Id: I3503c8306bb12da6ad1273ef207f550a37775b7b
Christopher Tate [Thu, 13 Jul 2017 20:05:40 +0000 (20:05 +0000)]
Merge "Tear down agent after preflight rejection" into oc-dr1-dev am:
47303ec66b
am:
19bb6c35ca
Change-Id: I17cbc0a91b65d755965ac4479d7656a7dbeef109
TreeHugger Robot [Thu, 13 Jul 2017 20:04:56 +0000 (20:04 +0000)]
Merge "Update JNI code in preparation for ICU 59 switching to C++11 char16_t."
TreeHugger Robot [Thu, 13 Jul 2017 20:03:11 +0000 (20:03 +0000)]
Merge "Remove AppCompat from TouchLatency test"
Seigo Nonaka [Thu, 13 Jul 2017 20:02:29 +0000 (20:02 +0000)]
Merge "Implement family fallback."
TreeHugger Robot [Thu, 13 Jul 2017 19:59:40 +0000 (19:59 +0000)]
Merge "ProfileSelectDialog no longer removes caller activity from task." into oc-dr1-dev
Lucas Dupin [Thu, 13 Jul 2017 19:57:40 +0000 (19:57 +0000)]
Merge changes Ie4fd89a3,Ica428dbc,Id3d1e935 into oc-dr1-dev am:
6a6d63be45
am:
b02198da14
Change-Id: I9b8ad92792978bb0eddca3ffe7688f366b95d7e9
Christopher Tate [Thu, 13 Jul 2017 19:56:56 +0000 (19:56 +0000)]
Merge "Tear down agent after preflight rejection" into oc-dr1-dev
am:
47303ec66b
Change-Id: Id831cef2f90ad39537975d31407f00b2f768d59e
Lucas Dupin [Thu, 13 Jul 2017 19:49:59 +0000 (19:49 +0000)]
Merge changes Ie4fd89a3,Ica428dbc,Id3d1e935 into oc-dr1-dev
am:
6a6d63be45
Change-Id: Ia0425e5333b437970786255b0a1e513fedfcf0bd
TreeHugger Robot [Thu, 13 Jul 2017 19:49:28 +0000 (19:49 +0000)]
Merge "Tear down agent after preflight rejection" into oc-dr1-dev
Lucas Dupin [Thu, 13 Jul 2017 19:41:32 +0000 (19:41 +0000)]
Merge changes Ie4fd89a3,Ica428dbc,Id3d1e935 into oc-dr1-dev
* changes:
Check mark color after successful auth
Ripple colors should match sysui theme.
Correct navbar colors after rebooting
Timur Iskhakov [Thu, 13 Jul 2017 19:39:36 +0000 (19:39 +0000)]
Merge "Add configureRpcThreadpool to java interface" am:
d8dab11547 am:
791a698a6a am:
9cdec3943c
am:
1cdcaa8cf3
Change-Id: Iea02cb61c0a77eb3d94b9ebe63687457b6a5032c
Timur Iskhakov [Thu, 13 Jul 2017 19:33:29 +0000 (19:33 +0000)]
Merge "Add configureRpcThreadpool to java interface" am:
d8dab11547 am:
791a698a6a
am:
9cdec3943c
Change-Id: Id3e2523a755e8ce207ac6bd85dbf6d5a69070207
Timur Iskhakov [Thu, 13 Jul 2017 19:27:37 +0000 (19:27 +0000)]
Merge "Add configureRpcThreadpool to java interface" am:
d8dab11547
am:
791a698a6a
Change-Id: I9b98013a894aa01268ed69a14c6b425e04771936
Hugo Benichi [Fri, 23 Jun 2017 01:07:08 +0000 (10:07 +0900)]
IpManager: define InitialConfiguration
This patch adds a InitialConfiguration class to IpManager for specifying
IP information in IpManager ProvisioningConfiguration at IpManager
startup.
At the moment this InitialConfiguration is not used, but is validated in
startProvsiioning if ProvisioningConfiguration includes one. It will be
integrated into IpManager IP provisioning logic in follow-up patches.
This patch also includes an example of data driven unit tests using a
table of test case. The highlights of this methodology are:
1) easy extensibility for new test case,
2) rich and informative error messages,
Unfortunately Java support for inlined data structure literals is poor
and some companion static methods for data generation are required for
enabling this methodology.
Bug:
62988545
Test: added new test in FrameworksNetTests,
$ runtest frameworks-net
$ runtest frameworks-wifi
Merged-In: I060b02603af7d73a6407df89344bf0c000574af2
(cherry pick of commit
2757fcf3a13b0addc4a168a12c72ac2fc418b012)
Change-Id: I48dbf89232d7758f1b07ed4d76ce93281e5c6b53
Eino-Ville Talvala [Thu, 13 Jul 2017 19:07:20 +0000 (12:07 -0700)]
CameraManager: Handle camera service being disabled explicitly
Previously, CameraManager handled a disabled camera service
implicitly, the same as it handles a temporarily-crashed camera
service.
However, the error reporting for the those cases isn't really the
same, so switch to being explicit - check for the disabled camera
service system property, and if it's set, short-circuit calls.
Test: Camera CTS continues to pass, Watch device with no camera
service also now passes camera CTS.
Bug:
62269118
Change-Id: I65a97f8c1b0f101999b2c04d4f1096b7f3aee858
Julia Reynolds [Thu, 13 Jul 2017 19:23:26 +0000 (19:23 +0000)]
Merge "Fix nomanservice notificationrecord leak" into oc-dr1-dev am:
bcc35f5ae6
am:
886d8b1c00
Change-Id: I232b0239d0af7d211cb91496a1b35646864a4032
Timur Iskhakov [Thu, 13 Jul 2017 19:21:42 +0000 (19:21 +0000)]
Merge "Add configureRpcThreadpool to java interface"
am:
d8dab11547
Change-Id: I958ef6fc2d667a691e39e9fadd07303085a499f9
Qingxi Li [Thu, 13 Jul 2017 19:17:03 +0000 (19:17 +0000)]
Merge "Fix the error that the broadcast receiver cannot be registered" into oc-dr1-dev am:
b7febbb727
am:
11ba1cb60a
Change-Id: Iebb4844baf119ae51749aab524184f35c208853d
Julia Reynolds [Thu, 13 Jul 2017 19:15:54 +0000 (19:15 +0000)]
Merge "Fix nomanservice notificationrecord leak" into oc-dr1-dev
am:
bcc35f5ae6
Change-Id: Ifb65c3b9aba091a30f6b895bd2c5f585802cf150
Treehugger Robot [Thu, 13 Jul 2017 19:11:39 +0000 (19:11 +0000)]
Merge "Add configureRpcThreadpool to java interface"
Qingxi Li [Thu, 13 Jul 2017 19:08:27 +0000 (19:08 +0000)]
Merge "Fix the error that the broadcast receiver cannot be registered" into oc-dr1-dev
am:
b7febbb727
Change-Id: Ia16b14971d474bdab739368a83b5b119faeaa381
Bill Yi [Thu, 13 Jul 2017 19:08:04 +0000 (19:08 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
e210bf7a40 -s ours
am:
e47cc86d69 -s ours
Change-Id: Ia57216e086b55fcf91d31c1b9f075d50e65a61f4
TreeHugger Robot [Thu, 13 Jul 2017 19:04:45 +0000 (19:04 +0000)]
Merge "Add metrics to log performance of different ranker services in ChooserActivity."
TreeHugger Robot [Thu, 13 Jul 2017 19:03:48 +0000 (19:03 +0000)]
Merge "Fix nomanservice notificationrecord leak" into oc-dr1-dev
Qingxi Li [Thu, 13 Jul 2017 19:02:24 +0000 (19:02 +0000)]
Merge "Fix the error that the broadcast receiver cannot be registered" into oc-dr1-dev
Bill Yi [Thu, 13 Jul 2017 19:00:21 +0000 (19:00 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
e210bf7a40 -s ours
Change-Id: I5ae2c4e17952f0f5ca5cea8255fa2d68647c6dab
OSDN Git Service
