OSDN Git Service
Jakub Pawlowski [Thu, 27 Apr 2017 23:24:51 +0000 (23:24 +0000)]
Merge "Merge "Bluetooth: Add constants to ScanResult" am:
369a94496c" into stage-aosp-master am:
c6c9508f8a am:
90e8cc8f26
am:
acef1562d2
Change-Id: I393cba74f15a842144974859064a677444a2200e
Jakub Pawlowski [Thu, 27 Apr 2017 23:22:44 +0000 (23:22 +0000)]
Merge "Bluetooth: Add constants to ScanResult" am:
369a94496c am:
b6656f07e7 am:
493ae0da60
am:
ebaa44db58
Change-Id: I1dc8ede0ad9a503c74b52c5dfdc1d88084044d6e
Bryce Lee [Thu, 27 Apr 2017 23:01:51 +0000 (23:01 +0000)]
Merge "Merge "Don't call adjustFocusedActivityStackLocked on finished activity." into oc-dev am:
d08c064976" into oc-dev-plus-aosp
am:
85d2e85f12
Change-Id: I1e397b1b030d1b88ca5873af9288ac4738af2a1c
Bryce Lee [Thu, 27 Apr 2017 22:59:41 +0000 (22:59 +0000)]
Merge "Don't call adjustFocusedActivityStackLocked on finished activity." into oc-dev am:
d08c064976
am:
1dc8ba03e8
Change-Id: I8acdc359a04065943c62c8d5f3b2399da544d3f8
Sudheer Shanka [Thu, 27 Apr 2017 22:57:31 +0000 (22:57 +0000)]
Merge "Update VIMS internal state when a packge is modified." into oc-dev am:
8dd177c4e8
am:
28d8e89578
Change-Id: I33e657f6383a6350040af54e1852344e2f107220
Jakub Pawlowski [Thu, 27 Apr 2017 22:55:06 +0000 (22:55 +0000)]
Merge "Merge "Bluetooth: Add constants to ScanResult" am:
369a94496c" into stage-aosp-master am:
c6c9508f8a
am:
90e8cc8f26
Change-Id: I7bda67787c3d874f7016ae3aa7e4563a03f38c0c
Tima Vaisburd [Thu, 27 Apr 2017 22:55:03 +0000 (22:55 +0000)]
Merge "Hide getTextClassifier and setTextClassifier for WebView" into oc-dev am:
9c14b91aa9
am:
04f97ee8a6
Change-Id: I9329ecdc3ec3b9d34ff551f686ea9a9a88974d88
Jakub Pawlowski [Thu, 27 Apr 2017 22:52:34 +0000 (22:52 +0000)]
Merge "Bluetooth: Add constants to ScanResult" am:
369a94496c am:
b6656f07e7
am:
493ae0da60
Change-Id: Ib7c7f3f71e6e49d06091effb99ac09dae605822e
Android Build Merger (Role) [Thu, 27 Apr 2017 22:50:57 +0000 (22:50 +0000)]
Merge "Merge "Don't call adjustFocusedActivityStackLocked on finished activity." into oc-dev am:
d08c064976" into oc-dev-plus-aosp
Bryce Lee [Thu, 27 Apr 2017 22:46:52 +0000 (22:46 +0000)]
Merge "Don't call adjustFocusedActivityStackLocked on finished activity." into oc-dev
am:
d08c064976
Change-Id: I16b6bd1905880f96b6a2d47915556b9775a3689a
Jakub Pawlowski [Thu, 27 Apr 2017 22:42:18 +0000 (22:42 +0000)]
Merge "Merge "Bluetooth: Add constants to ScanResult" am:
369a94496c" into stage-aosp-master
am:
c6c9508f8a
Change-Id: I8876af2e00e6a52629a47c1ef7c26f4c674e5de8
Android Build Merger (Role) [Thu, 27 Apr 2017 22:38:39 +0000 (22:38 +0000)]
Merge "Merge "Bluetooth: Add constants to ScanResult" am:
369a94496c" into stage-aosp-master
Jakub Pawlowski [Thu, 27 Apr 2017 22:35:15 +0000 (22:35 +0000)]
Merge "Bluetooth: Add constants to ScanResult"
am:
369a94496c
Change-Id: I6fbd113aa163a0941e95b6517f3819d1d68a3342
Jakub Pawlowski [Thu, 27 Apr 2017 22:33:14 +0000 (22:33 +0000)]
Merge "Bluetooth: Add constants to ScanResult" am:
369a94496c
am:
b6656f07e7
Change-Id: I29f06e5c612e29ae25bde0e3e8854bf88213b65d
Bryce Lee [Thu, 27 Apr 2017 22:27:50 +0000 (22:27 +0000)]
Merge "Don't call adjustFocusedActivityStackLocked on finished activity." into oc-dev
am:
d08c064976
Change-Id: I5b636585e52c25280c4f30fe9da33510bcf0f52d
Jakub Pawlowski [Thu, 27 Apr 2017 22:26:27 +0000 (22:26 +0000)]
Merge "Bluetooth: Add constants to ScanResult"
am:
369a94496c
Change-Id: I9de3466936fd66afd973aa84003202c96aebec32
Sudheer Shanka [Thu, 27 Apr 2017 22:25:14 +0000 (22:25 +0000)]
Merge "Update VIMS internal state when a packge is modified." into oc-dev
am:
8dd177c4e8
Change-Id: Ibf0daf62f79608cf6616226762d959f0aac20d3b
TreeHugger Robot [Thu, 27 Apr 2017 22:20:00 +0000 (22:20 +0000)]
Merge "Remove use of SkBitmap::copyTo()"
Tima Vaisburd [Thu, 27 Apr 2017 22:17:54 +0000 (22:17 +0000)]
Merge "Hide getTextClassifier and setTextClassifier for WebView" into oc-dev
am:
9c14b91aa9
Change-Id: Ifaa89f3fd18fff60e8d702b2352e39b9e3dba744
Jakub Pawlowski [Thu, 27 Apr 2017 22:12:57 +0000 (22:12 +0000)]
Merge "Bluetooth: Add constants to ScanResult"
Ying Xu [Thu, 27 Apr 2017 22:11:21 +0000 (22:11 +0000)]
Merge "Add API to support async network scans."
Lucas Dupin [Thu, 27 Apr 2017 22:08:09 +0000 (22:08 +0000)]
Merge "Wallpaper color extraction"
Android Build Merger (Role) [Thu, 27 Apr 2017 21:36:44 +0000 (21:36 +0000)]
Merge "Merge "Fix NPE when accessing mCallback in BluetoothGatt" am:
1be8fb23eb am:
28f182aa87 am:
3657c398e1 am:
7918ff08dd"
Jakub Pawlowski [Thu, 27 Apr 2017 21:36:04 +0000 (21:36 +0000)]
Merge "Fix NPE when accessing mCallback in BluetoothGatt" am:
1be8fb23eb am:
28f182aa87 am:
3657c398e1
am:
7918ff08dd
Change-Id: Ib6cf04ce72b06df4ba98b3a43536500165d38d01
Android Build Merger (Role) [Thu, 27 Apr 2017 21:35:34 +0000 (21:35 +0000)]
Merge "Merge "Rename getDataEnabled() to isDataEnabled()." am:
4898b704de am:
0b79745dd1 am:
f026342263 -s ours am:
c2f309cd39"
Jeff Davidson [Thu, 27 Apr 2017 21:34:54 +0000 (21:34 +0000)]
Merge "Rename getDataEnabled() to isDataEnabled()." am:
4898b704de am:
0b79745dd1 am:
f026342263 -s ours
am:
c2f309cd39
Change-Id: Idc666bd9d62bf689ec3b3acd1bbe6870acd4e6ce
Android Build Merger (Role) [Thu, 27 Apr 2017 21:34:26 +0000 (21:34 +0000)]
Merge "Merge "Add getVisualVoicemailPackageName()" am:
998eb212bd am:
2eae7bfc03 am:
36b80785a6 -s ours am:
e9a088ad97"
Selim Cinek [Thu, 27 Apr 2017 21:33:24 +0000 (21:33 +0000)]
Merge changes from topic 'media_colorization_master'
* changes:
Make music notifications not dimmable
Implementing gradual image fade for the media template
Extracting the notification colors based on the album art
Moved notification builder creation to the background
Chen Xu [Thu, 27 Apr 2017 21:32:10 +0000 (21:32 +0000)]
Merge "Add getVisualVoicemailPackageName()" am:
998eb212bd am:
2eae7bfc03 am:
36b80785a6 -s ours
am:
e9a088ad97
Change-Id: I298002baa954520ba1ee62340a6ad9a9a4ed56e7
Jakub Pawlowski [Thu, 27 Apr 2017 21:24:35 +0000 (21:24 +0000)]
Merge "Fix NPE when accessing mCallback in BluetoothGatt" am:
1be8fb23eb am:
28f182aa87
am:
3657c398e1
Change-Id: I9425efce8de6376c0e3c74401d74da39e8037b98
Jeff Davidson [Thu, 27 Apr 2017 21:22:23 +0000 (21:22 +0000)]
Merge "Rename getDataEnabled() to isDataEnabled()." am:
4898b704de am:
0b79745dd1
am:
f026342263 -s ours
Change-Id: I991af9483fa932479f5a1af5809596ce067a69a8
Pankaj Kanwar [Thu, 27 Apr 2017 21:22:19 +0000 (21:22 +0000)]
Merge "resolve merge conflicts of
8814befacdf5 to oc-dev-plus-aosp" into oc-dev-plus-aosp
am:
c1c9579764 -s ours
Change-Id: I71972313e4c0b2436b32179fe88e4f444e7fe050
Chen Xu [Thu, 27 Apr 2017 21:17:09 +0000 (21:17 +0000)]
Merge "Add getVisualVoicemailPackageName()" am:
998eb212bd am:
2eae7bfc03
am:
36b80785a6 -s ours
Change-Id: I4915bc05c136f87ed79d8f77f101c0b439a01488
Pankaj Kanwar [Thu, 27 Apr 2017 21:14:07 +0000 (21:14 +0000)]
Merge "resolve merge conflicts of
8814befacdf5 to oc-dev-plus-aosp" into oc-dev-plus-aosp
Jakub Pawlowski [Thu, 27 Apr 2017 15:37:04 +0000 (08:37 -0700)]
Bluetooth: Add constants to ScanResult
Add TX_POWER_NOT_PRESENT and PERIODIC_INTERVAL_NOT_PRESENT
Test: none
Bug:
37536707
Change-Id: Ia48a30f44a961c6e0babd17ecaed0eb93c98ecad
TreeHugger Robot [Thu, 27 Apr 2017 20:55:16 +0000 (20:55 +0000)]
Merge "Updating docs for RemoteInput non-textual inputs per API review request."
Amith Yamasani [Thu, 27 Apr 2017 20:51:01 +0000 (20:51 +0000)]
Merge "Improve docs for AssistStructure#isHomeActivity" into oc-dev am:
3a4987bbe7
am:
73bdb10bc8
Change-Id: I3161578f7ffd31916e7f072f8a71d0367d402170
Adrian Roos [Thu, 27 Apr 2017 20:48:53 +0000 (20:48 +0000)]
Merge "SysUI A11y: Fix keyguard time utterance" into oc-dev am:
898b0cb39a
am:
a27631dade
Change-Id: I710f5e48b490c419f32e0a4a8d9ec9cbda47073a
Matt Sarett [Thu, 27 Apr 2017 20:47:10 +0000 (16:47 -0400)]
Remove use of SkBitmap::copyTo()
This API is deprecated in Skia.
Test: Refactor. Flashed device.
Change-Id: I590de3b8280729182442ec52a4fc4538d11e78d8
Bryce Lee [Thu, 27 Apr 2017 20:41:32 +0000 (20:41 +0000)]
Merge "Don't call adjustFocusedActivityStackLocked on finished activity." into oc-dev
Amith Yamasani [Thu, 27 Apr 2017 20:35:44 +0000 (20:35 +0000)]
Merge "Improve docs for AssistStructure#isHomeActivity" into oc-dev
am:
3a4987bbe7
Change-Id: If3007f9a939cb17be63fe148d68178c9fabfea48
Adrian Roos [Thu, 27 Apr 2017 20:33:47 +0000 (20:33 +0000)]
Merge "SysUI A11y: Fix keyguard time utterance" into oc-dev
am:
898b0cb39a
Change-Id: Ifdc2b56ce9b59ea9c3f185fb6fac8850842bbb67
Makoto Onuki [Thu, 27 Apr 2017 20:32:27 +0000 (20:32 +0000)]
Merge "Change IMPORTANCE_PERCEPTIBLE_DEPRECATED to IMPORTANCE_PERCEPTIBLE_PRE_26" into oc-dev am:
301663a61b
am:
27521581fb
Change-Id: I8b0443ccf4a876b4de0d6de6d1af7909a4dee00e
Sudheer Shanka [Thu, 27 Apr 2017 20:31:04 +0000 (20:31 +0000)]
Merge "Update VIMS internal state when a packge is modified." into oc-dev
Makoto Onuki [Thu, 27 Apr 2017 20:25:57 +0000 (20:25 +0000)]
Merge "Change IMPORTANCE_PERCEPTIBLE_DEPRECATED to IMPORTANCE_PERCEPTIBLE_PRE_26" into oc-dev
am:
301663a61b
Change-Id: I93d38d5255975a211723b41eacaec5ab882a7621
Android Build Merger (Role) [Thu, 27 Apr 2017 20:25:43 +0000 (20:25 +0000)]
Merge "Merge "Use InetAddress instead of String in network events." into oc-dev am:
54e534d6e7 am:
c3ae946f66"
TreeHugger Robot [Thu, 27 Apr 2017 20:25:37 +0000 (20:25 +0000)]
Merge "Clear Gatekeeper state before a new enrollment"
Pavel Grafov [Thu, 27 Apr 2017 20:24:11 +0000 (20:24 +0000)]
Merge "Use InetAddress instead of String in network events." into oc-dev am:
54e534d6e7
am:
c3ae946f66
Change-Id: If08ae7a4eed5d56c02c0d67a3d3fcffe46f982b5
TreeHugger Robot [Thu, 27 Apr 2017 20:22:23 +0000 (20:22 +0000)]
Merge "Import translations. DO NOT MERGE"
Tima Vaisburd [Thu, 27 Apr 2017 20:22:09 +0000 (20:22 +0000)]
Merge "Hide getTextClassifier and setTextClassifier for WebView" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 20:21:44 +0000 (20:21 +0000)]
Merge "Improve docs for AssistStructure#isHomeActivity" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 20:17:00 +0000 (20:17 +0000)]
Merge "Import translations. DO NOT MERGE"
Pavel Grafov [Thu, 27 Apr 2017 20:12:22 +0000 (20:12 +0000)]
Merge "Use InetAddress instead of String in network events." into oc-dev
am:
54e534d6e7
Change-Id: I27f51d0183f0e28e2d17f41c69f35aee6a6785a7
TreeHugger Robot [Thu, 27 Apr 2017 20:10:49 +0000 (20:10 +0000)]
Merge "SysUI A11y: Fix keyguard time utterance" into oc-dev
Makoto Onuki [Thu, 27 Apr 2017 20:03:16 +0000 (20:03 +0000)]
Merge "Change IMPORTANCE_PERCEPTIBLE_DEPRECATED to IMPORTANCE_PERCEPTIBLE_PRE_26" into oc-dev
TreeHugger Robot [Thu, 27 Apr 2017 20:00:03 +0000 (20:00 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 27 Apr 2017 19:59:01 +0000 (19:59 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 27 Apr 2017 19:57:47 +0000 (19:57 +0000)]
Merge "Import translations. DO NOT MERGE"
Jakub Pawlowski [Thu, 27 Apr 2017 19:56:09 +0000 (19:56 +0000)]
Merge "Fix NPE when accessing mCallback in BluetoothGatt" am:
1be8fb23eb
am:
28f182aa87
Change-Id: I85f4847b7c530bded24dcb27faa851ed9b5ba653
TreeHugger Robot [Thu, 27 Apr 2017 19:55:47 +0000 (19:55 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 27 Apr 2017 19:53:48 +0000 (19:53 +0000)]
Merge "Use InetAddress instead of String in network events." into oc-dev
Chad Brubaker [Thu, 27 Apr 2017 19:51:45 +0000 (19:51 +0000)]
Merge "Allow apps to provide the Instant App installer extra information" into oc-dev am:
a9d0e6b205
am:
f4488dabd5
Change-Id: I6310b54fc3f5e11feb926fe904d33c4cf67db669
TreeHugger Robot [Thu, 27 Apr 2017 19:47:31 +0000 (19:47 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 27 Apr 2017 19:46:40 +0000 (19:46 +0000)]
Merge "Import translations. DO NOT MERGE"
Jakub Pawlowski [Thu, 27 Apr 2017 19:46:06 +0000 (19:46 +0000)]
Merge "Fix NPE when accessing mCallback in BluetoothGatt"
am:
1be8fb23eb
Change-Id: I764b7a169e5acabef07fafc43367040d8d493d7b
TreeHugger Robot [Thu, 27 Apr 2017 19:42:56 +0000 (19:42 +0000)]
Merge "Forward OemLockManager call to correct service method."
Chad Brubaker [Thu, 27 Apr 2017 19:41:06 +0000 (19:41 +0000)]
Merge "Allow apps to provide the Instant App installer extra information" into oc-dev
am:
a9d0e6b205
Change-Id: I6edd3a615c1c276b6d7842af471dc928281f1f6f
Selim Cinek [Tue, 25 Apr 2017 05:18:48 +0000 (22:18 -0700)]
Make music notifications not dimmable
For contrast requirements and for the image effect
to work properly, music notifications should not be
dimmable.
Test: add music notification, look at lockscreen
Fixes:
36561228
Change-Id: I58313e1828c64d34737390ad03e1deef078a7059
Selim Cinek [Tue, 25 Apr 2017 02:48:29 +0000 (19:48 -0700)]
Implementing gradual image fade for the media template
Test: play music
Change-Id: I525513ce1da1237c4edad32c0ed31e79d5eacd32
Fixes:
36561228
Treehugger Robot [Thu, 27 Apr 2017 19:37:53 +0000 (19:37 +0000)]
Merge "Fix NPE when accessing mCallback in BluetoothGatt"
Jakub Pawlowski [Thu, 27 Apr 2017 14:04:15 +0000 (07:04 -0700)]
Fix NPE when accessing mCallback in BluetoothGatt
This issue was introduced in commit
4eab49652e48159fd37f827d30b822f2f187551e.
Bug:
37710354
Test: none
Change-Id: I2d985ce97c44d4e096713e156e57437f44ea3ddb
Selim Cinek [Thu, 20 Apr 2017 23:55:38 +0000 (16:55 -0700)]
Extracting the notification colors based on the album art
Media notifications are now extracting the background and
foreground colors from the album art.
Test: manual, play different songs
Bug:
36561228
Change-Id: I9c3c962fa59eb70ef9b2d4893b939be6e1ee1ab0
Selim Cinek [Thu, 20 Apr 2017 22:16:10 +0000 (15:16 -0700)]
Moved notification builder creation to the background
In preparation of future colorization work, the creation
of the notification builder is moved to the background.
Test: manual, add notifications, update them etc.
Test: runtest systemui
Bug:
36561228
Change-Id: Iaec5febf4d8d9da348d77e0d4f6f61b9746fae16
pkanwar [Thu, 27 Apr 2017 19:31:39 +0000 (12:31 -0700)]
resolve merge conflicts of
8814befacdf5 to oc-dev-plus-aosp
Test: manual
BUG:
35606429
Change-Id: I0e9c5edaaa3e0ddf7719ebbffd650b8bdd88faa1
Chad Brubaker [Thu, 27 Apr 2017 19:30:50 +0000 (19:30 +0000)]
Merge "Allow apps to provide the Instant App installer extra information" into oc-dev
Michal Karpinski [Thu, 27 Apr 2017 19:26:04 +0000 (19:26 +0000)]
Merge "Reenable presubmit runs for BackupSettingsTest now that it's fixed" into oc-dev am:
38439169bd
am:
8588c09a08
Change-Id: Iba20ae26bba68ca989d104344909c881fd03ecb2
Michal Karpinski [Thu, 27 Apr 2017 19:16:09 +0000 (19:16 +0000)]
Merge "Reenable presubmit runs for BackupSettingsTest now that it's fixed" into oc-dev
am:
38439169bd
Change-Id: I3220ae4b0c2da8438ffd034649dd8fc950b20b36
TreeHugger Robot [Thu, 27 Apr 2017 19:03:18 +0000 (19:03 +0000)]
Merge "Reenable presubmit runs for BackupSettingsTest now that it's fixed" into oc-dev
Andrii Kulian [Thu, 27 Apr 2017 18:46:31 +0000 (18:46 +0000)]
Merge "Report correct display id in stack info" into oc-dev am:
0dca566677
am:
7642a80e60
Change-Id: I2130c7d07b9a60a9c81186567811e4f2fe1d70a6
Ajay Panicker [Thu, 27 Apr 2017 18:36:32 +0000 (18:36 +0000)]
Merge "Merge "Limit btsnoop file size (3/8)" am:
37cad12cb1 am:
e429211064 am:
c1da2a0341 -s ours" into oc-dev-plus-aosp
am:
5d9dce507f
Change-Id: I26dc0b97860f1001c7abdc30b7f983f55bff7eb0
Andrii Kulian [Thu, 27 Apr 2017 18:32:00 +0000 (18:32 +0000)]
Merge "Report correct display id in stack info" into oc-dev
am:
0dca566677
Change-Id: Ieebfe01fb98d066be46aea23ca0206d17dd92b67
Andrii Kulian [Thu, 27 Apr 2017 18:29:00 +0000 (18:29 +0000)]
Merge "Hide onMovedToDisplay callback" into oc-dev am:
bfe5aa23e8
am:
a63c3863a3
Change-Id: I4aadf1db9fbdb692776f517532e760d3e49e58a1
Jeff Davidson [Thu, 27 Apr 2017 18:27:00 +0000 (18:27 +0000)]
Merge "Rename getDataEnabled() to isDataEnabled()." am:
4898b704de
am:
0b79745dd1
Change-Id: Id9d1f415a386238e6357f5952f78e395ee034bd2
Android Build Merger (Role) [Thu, 27 Apr 2017 18:23:19 +0000 (18:23 +0000)]
Merge "Merge "Limit btsnoop file size (3/8)" am:
37cad12cb1 am:
e429211064 am:
c1da2a0341 -s ours" into oc-dev-plus-aosp
Ajay Panicker [Thu, 27 Apr 2017 18:20:40 +0000 (18:20 +0000)]
Merge "Limit btsnoop file size (3/8)" am:
37cad12cb1 am:
e429211064
am:
c1da2a0341 -s ours
Change-Id: I91b79208a1afea91ab83bfe9b687710945f66742
Andrii Kulian [Thu, 27 Apr 2017 18:19:32 +0000 (18:19 +0000)]
Merge "Hide onMovedToDisplay callback" into oc-dev
am:
bfe5aa23e8
Change-Id: I457340e86ffcfb9256960c554d8041a208d7cdad
Andrii Kulian [Thu, 27 Apr 2017 18:18:29 +0000 (18:18 +0000)]
Merge "Report correct display id in stack info" into oc-dev
Jeff Davidson [Thu, 27 Apr 2017 18:17:28 +0000 (18:17 +0000)]
Merge "Rename getDataEnabled() to isDataEnabled()."
am:
4898b704de
Change-Id: Ic11d6568aac8cdad151c61fa32d4535ccea9f53b
Andrii Kulian [Thu, 27 Apr 2017 18:09:13 +0000 (18:09 +0000)]
Merge "Hide onMovedToDisplay callback" into oc-dev
Chen Xu [Thu, 27 Apr 2017 18:07:30 +0000 (18:07 +0000)]
Merge "Add getVisualVoicemailPackageName()" am:
998eb212bd
am:
2eae7bfc03
Change-Id: I86cec4ba1f4cbc86fa84dc9d036542bebcc93100
Jeff Davidson [Thu, 27 Apr 2017 18:03:31 +0000 (18:03 +0000)]
Merge "Rename getDataEnabled() to isDataEnabled()."
Pankaj Kanwar [Thu, 27 Apr 2017 17:58:16 +0000 (17:58 +0000)]
Merge "RIL changes to allow the modem to query the framework for the key." am:
0c83ef2c72
am:
1dec74b78f
Change-Id: I6b15e49763d8e0cfa23238834a8056288de77176
Chen Xu [Thu, 27 Apr 2017 17:57:36 +0000 (17:57 +0000)]
Merge "Add getVisualVoicemailPackageName()"
am:
998eb212bd
Change-Id: I482cd62e9f2330624e688b8d65aa9353500b1d79
Seigo Nonaka [Thu, 27 Apr 2017 17:56:53 +0000 (17:56 +0000)]
Merge "Merge "Revise method comment on setFontVariationSettings" into oc-dev am:
e6746726bc" into oc-dev-plus-aosp
am:
af77018f5a
Change-Id: I4d1ebb95729eaad4f59d4ae7590d47665e927aa6
David Farrow [Thu, 27 Apr 2017 17:54:49 +0000 (17:54 +0000)]
Merge "Merge "documentation fixes" into nyc-mr1-dev am:
14826e5489 am:
b1e3d9ab26 am:
4ea763ad8a am:
6986e8a1ba" into oc-dev-plus-aosp
am:
ce126185c9
Change-Id: I87c2d3b6a849234906281116c5ac0841f7941642
Pavel Grafov [Thu, 27 Apr 2017 13:22:26 +0000 (14:22 +0100)]
Use InetAddress instead of String in network events.
This is a conservative change that converts strings to
InetAddress on the fly just before givint it to the client.
Also renamed getIpAddressesCount to getTotalResolvedAddressCount
to make it 1) harder to misuse it as getInetAddresses().length
2) more descriptive.
Bug:
37625453
Test: runtest --path frameworks/base/services/tests/servicestests/src/com/android/server/devicepolicy/NetworkEventTest.java
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.DeviceOwnerTest#testNetworkLoggingWithSingleUser
Change-Id: I2a31dddd6874f1a629895e4dff105cf41984a775
Rubin Xu [Thu, 27 Apr 2017 17:52:13 +0000 (17:52 +0000)]
Merge "Merge "Reduce scrypt time in synthetic password flow" into oc-dev am:
71e0fcbf2f" into oc-dev-plus-aosp
am:
f415298764
Change-Id: I64fa2758635e64e053f9ab98c3092b851d88ee41
David Farrow [Thu, 27 Apr 2017 17:50:23 +0000 (17:50 +0000)]
Merge "Merge "documentation fixes" into nyc-mr1-dev am:
14826e5489 am:
b1e3d9ab26 am:
4ea763ad8a am:
393f0c185a" into oc-dev-plus-aosp
am:
ff93a475a9
Change-Id: Iec79324767e1a44c86b00fc86662b6fb7d37bc17
Pankaj Kanwar [Thu, 27 Apr 2017 17:49:09 +0000 (17:49 +0000)]
Merge "RIL changes to allow the modem to query the framework for the key."
am:
0c83ef2c72
Change-Id: I8a326ac926e880d8095330638e54d56ad8c98485
Ajay Panicker [Thu, 27 Apr 2017 17:48:58 +0000 (17:48 +0000)]
Merge "Limit btsnoop file size (3/8)" am:
37cad12cb1
am:
e429211064
Change-Id: I9ce4924aba66c45425789dd16e477dfa99e6b74a
OSDN Git Service
