OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "NetdEventListener: add rolling log of connect and dns stats" am: 64ef2a4d28
Hugo Benichi [Tue, 24 Oct 2017 00:25:11 +0000 (00:25 +0000)]
Merge "NetdEventListener: add rolling log of connect and dns stats" am: 64ef2a4d28
am: a3e7c1a3db

Change-Id: Iaad5f5b142209ce36f70249a438b3dd66fb92f07

6 years agoMerge "NetdEventListener: add rolling log of connect and dns stats"
Hugo Benichi [Tue, 24 Oct 2017 00:14:48 +0000 (00:14 +0000)]
Merge "NetdEventListener: add rolling log of connect and dns stats"
am: 64ef2a4d28

Change-Id: I7f25f4ed42f0aecea7a1bb09b8c65a5d2e4a84cd

6 years agoMerge "NetdEventListener: add rolling log of connect and dns stats"
Hugo Benichi [Mon, 23 Oct 2017 23:54:53 +0000 (23:54 +0000)]
Merge "NetdEventListener: add rolling log of connect and dns stats"

6 years agoMerge "Change Bluetooth HID Profile Name (1/6)" am: 8218b219f3
Hansong Zhang [Mon, 23 Oct 2017 22:46:31 +0000 (22:46 +0000)]
Merge "Change Bluetooth HID Profile Name (1/6)" am: 8218b219f3
am: c8a370aeba

Change-Id: I2c5da84f5b57496e2a0ef45fb17085670f7465a9

6 years agoMerge "Change Bluetooth HID Profile Name (1/6)"
Hansong Zhang [Mon, 23 Oct 2017 22:33:50 +0000 (22:33 +0000)]
Merge "Change Bluetooth HID Profile Name (1/6)"
am: 8218b219f3

Change-Id: Ic085deaa070b4008b34d03b507f81a5df220764a

6 years agoMerge "Change Bluetooth HID Profile Name (1/6)"
Treehugger Robot [Mon, 23 Oct 2017 22:22:41 +0000 (22:22 +0000)]
Merge "Change Bluetooth HID Profile Name (1/6)"

6 years agoChange Bluetooth HID Profile Name (1/6)
Hansong Zhang [Fri, 20 Oct 2017 22:55:59 +0000 (15:55 -0700)]
Change Bluetooth HID Profile Name (1/6)

Make the Bluetooth HID profile name consistent with the Bluetooth HID service
name.

BluetoothInputHost → BluetoothHidDevice
BluetoothInputDevice → BluetoothHidHost
IBluetoothInputHost → IBluetoothHidDevice
IBluetoothInputDevice → IBluetoothHidHost
BluetoothProfile.INPUT_HOST → BluetoothProfile.HID_DEVICE
BluetoothProfile.INPUT_DEVICE → BluetoothProfile.HID_HOST

(Cherry-picked from commit c26c76c63d933f8057f795d05624f91b811c8c71)
Merged-In: Iadb890a54dd3d6868b87514472bbac6bb0c6179f
Bug: 68055651
Test: make
Change-Id: Iadb890a54dd3d6868b87514472bbac6bb0c6179f

6 years agoMerge "Add config to display VM number as default number of CF" am: 3e26cb18fb
Jordan Liu [Mon, 23 Oct 2017 20:48:04 +0000 (20:48 +0000)]
Merge "Add config to display VM number as default number of CF" am: 3e26cb18fb
am: 9953542c3a

Change-Id: I93696ab322ca9a2edcbf03efeb33cbf9f6c6279a

6 years agoMerge "Add config to display VM number as default number of CF"
Jordan Liu [Mon, 23 Oct 2017 20:39:20 +0000 (20:39 +0000)]
Merge "Add config to display VM number as default number of CF"
am: 3e26cb18fb

Change-Id: Ie332a31b699b375d7a9ff56f314346546244010e

6 years agoMerge "Add config to display VM number as default number of CF"
Jordan Liu [Mon, 23 Oct 2017 20:27:28 +0000 (20:27 +0000)]
Merge "Add config to display VM number as default number of CF"

6 years agoMerge "Use final release of ASM 6.0" am: d5d697b023 am: a74b04cd70
Colin Cross [Sun, 22 Oct 2017 02:16:44 +0000 (02:16 +0000)]
Merge "Use final release of ASM 6.0" am: d5d697b023 am: a74b04cd70
am: baa428031a

Change-Id: I439fa4aa9f2fb22f372a6a76ab07676c0c51e429

6 years agoMerge "Use final release of ASM 6.0" am: d5d697b023
Colin Cross [Sun, 22 Oct 2017 02:04:59 +0000 (02:04 +0000)]
Merge "Use final release of ASM 6.0" am: d5d697b023
am: a74b04cd70

Change-Id: I6bd5af249d9d1db597139207e06d002956df89a6

6 years agoMerge "Use final release of ASM 6.0"
Colin Cross [Sun, 22 Oct 2017 01:46:39 +0000 (01:46 +0000)]
Merge "Use final release of ASM 6.0"
am: d5d697b023

Change-Id: I94524349eaa38c020d932f301fe36f99952862bc

6 years agoMerge "Use final release of ASM 6.0"
Colin Cross [Sun, 22 Oct 2017 01:37:11 +0000 (01:37 +0000)]
Merge "Use final release of ASM 6.0"

6 years agoNetdEventListener: add rolling log of connect and dns stats
Hugo Benichi [Wed, 27 Sep 2017 14:28:59 +0000 (23:28 +0900)]
NetdEventListener: add rolling log of connect and dns stats

This patch adds a rolling time order logs of basic statistics of
connect and dns, grouped by network id and including:
 - average error rate
 - average latency
 - max latency
 - total number of operations

The log is segmented in buckets of 5 minutes, and covers the last 4
hours.

Note that only blocking connect() calls latencies are recorded with the
current netd logging infrastructure.

Example of logs:
05:30:00.000: {netId=100, WIFI, dns avg=92ms max=525ms err=00.0% tot=37, connect avg=0ms max=23ms err=00.0% tot=25}
05:35:00.000: {netId=100, WIFI, dns avg=94ms max=537ms err=05.3% tot=57, connect avg=0ms max=0ms err=00.0% tot=69}
05:40:00.000: {netId=100, WIFI, dns avg=220ms max=350ms err=00.0% tot=4, connect avg=0ms max=0ms err=00.0% tot=2}
05:45:00.000: {netId=100, WIFI, dns avg=112ms max=113ms err=00.0% tot=1, connect avg=0ms max=0ms err=00.0% tot=1}
05:50:00.000: {netId=100, WIFI, dns avg=131ms max=269ms err=00.0% tot=2, connect avg=0ms max=0ms err=00.0% tot=1}

Bug: 65700460
Test: runtest frameworks-net
Change-Id: I54e76d18fbaaa92639fb675f93ea90b7615fd6bf

6 years agoMerge "Add Runnable mechanism to WakeupMessage" am: 5964b55654 am: d870cd33f5
Etan Cohen [Sat, 21 Oct 2017 02:35:29 +0000 (02:35 +0000)]
Merge "Add Runnable mechanism to WakeupMessage" am: 5964b55654 am: d870cd33f5
am: b4e455552f

Change-Id: Iff399d348193b8028e3927c1003d887c211470fb

6 years agoMerge "Add Runnable mechanism to WakeupMessage" am: 5964b55654
Etan Cohen [Sat, 21 Oct 2017 02:26:41 +0000 (02:26 +0000)]
Merge "Add Runnable mechanism to WakeupMessage" am: 5964b55654
am: d870cd33f5

Change-Id: I2d0f1dd85e97764159eda8239c344e95acd41ee9

6 years agoMerge "Add Runnable mechanism to WakeupMessage"
Etan Cohen [Sat, 21 Oct 2017 02:17:30 +0000 (02:17 +0000)]
Merge "Add Runnable mechanism to WakeupMessage"
am: 5964b55654

Change-Id: Iab0414f644223d69602e8e93a636eaa46137d873

6 years agoMerge "Add Runnable mechanism to WakeupMessage"
Etan Cohen [Sat, 21 Oct 2017 02:04:50 +0000 (02:04 +0000)]
Merge "Add Runnable mechanism to WakeupMessage"

6 years agoMerge "Check success before registering DeathRecipient" am: b6c4bc311a am: c336947da4
Hall Liu [Fri, 20 Oct 2017 23:43:54 +0000 (23:43 +0000)]
Merge "Check success before registering DeathRecipient" am: b6c4bc311a am: c336947da4
am: 8e055b131a

Change-Id: Ic98d58505c311250fad7220bec88fcd89846b14e

6 years agoMerge "Check success before registering DeathRecipient" am: b6c4bc311a
Hall Liu [Fri, 20 Oct 2017 23:32:24 +0000 (23:32 +0000)]
Merge "Check success before registering DeathRecipient" am: b6c4bc311a
am: c336947da4

Change-Id: Ib2b1d0919a974ebe1ce397f643454ae179c1241d

6 years agoMerge "Check success before registering DeathRecipient"
Hall Liu [Fri, 20 Oct 2017 23:22:13 +0000 (23:22 +0000)]
Merge "Check success before registering DeathRecipient"
am: b6c4bc311a

Change-Id: Ie4a8f3ea3374d30a6a4dd9d22d9d48df0075c560

6 years agoMerge "Check success before registering DeathRecipient"
Hall Liu [Fri, 20 Oct 2017 23:10:09 +0000 (23:10 +0000)]
Merge "Check success before registering DeathRecipient"

6 years agoMerge "Remove @Presubmit from SettingsBackupTest.Java" am: 3c48bd72aa am: 8138b8b3ed
Ben Schwartz [Fri, 20 Oct 2017 20:51:57 +0000 (20:51 +0000)]
Merge "Remove @Presubmit from SettingsBackupTest.Java" am: 3c48bd72aa am: 8138b8b3ed
am: 40177a615e

Change-Id: Ic394eb3a058bbcc84aec2e08728e19138ad794c3

6 years agoMerge "Remove @Presubmit from SettingsBackupTest.Java" am: 3c48bd72aa
Ben Schwartz [Fri, 20 Oct 2017 20:34:45 +0000 (20:34 +0000)]
Merge "Remove @Presubmit from SettingsBackupTest.Java" am: 3c48bd72aa
am: 8138b8b3ed

Change-Id: I622652209613f1bd113a90d22aa924f898ce6fe2

6 years agoAdd Runnable mechanism to WakeupMessage
Etan Cohen [Fri, 20 Oct 2017 04:12:34 +0000 (21:12 -0700)]
Add Runnable mechanism to WakeupMessage

The WakeupMessage object provides a mechanism to create an Alarm
which will wake-up the device and deliver a message to a Handler.

Add a Runnable mechanism as an alternative to the message.

Bug: 67276378
Test: unit test
Change-Id: Icf5f03b2b25a340273f9d3fcd09f182216ea6238

6 years agoMerge "Remove @Presubmit from SettingsBackupTest.Java"
Ben Schwartz [Fri, 20 Oct 2017 20:25:37 +0000 (20:25 +0000)]
Merge "Remove @Presubmit from SettingsBackupTest.Java"
am: 3c48bd72aa

Change-Id: I5a4f7c33ccb0a9ddff2778726055c7c059dfa281

6 years agoMerge "Remove @Presubmit from SettingsBackupTest.Java"
Treehugger Robot [Fri, 20 Oct 2017 20:14:43 +0000 (20:14 +0000)]
Merge "Remove @Presubmit from SettingsBackupTest.Java"

6 years agoRemove @Presubmit from SettingsBackupTest.Java
Ben Schwartz [Fri, 20 Oct 2017 17:41:12 +0000 (13:41 -0400)]
Remove @Presubmit from SettingsBackupTest.Java

It appears to be causing problems on some build bots.

Test: Problem can only be reproduced after merge...
Change-Id: I7c9c1c7a54f0e2981faecbf9793eef888f5c97d1

6 years agoUse final release of ASM 6.0
Colin Cross [Fri, 20 Oct 2017 19:57:56 +0000 (12:57 -0700)]
Use final release of ASM 6.0

Test: m checkbuild
Change-Id: I8b39c7887763a1a5efce2622421906f9b2e1994a

6 years agoMerge "Refactored area update info support" am: b1092bfd55 -s ours am: befb4f2ed4...
Jack Yu [Fri, 20 Oct 2017 19:52:13 +0000 (19:52 +0000)]
Merge "Refactored area update info support" am: b1092bfd55  -s ours am: befb4f2ed4  -s ours
am: 84f59db864  -s ours

Change-Id: I89bd02a64c96fd15838eeb60488042bc758a2219

6 years agoMerge "Refactored area update info support" am: b1092bfd55 -s ours
Jack Yu [Fri, 20 Oct 2017 19:40:43 +0000 (19:40 +0000)]
Merge "Refactored area update info support" am: b1092bfd55  -s ours
am: befb4f2ed4  -s ours

Change-Id: Ic978426f763d0c8be4381d0f836cec198153c031

6 years agoMerge "Refactored area update info support"
Jack Yu [Fri, 20 Oct 2017 19:30:02 +0000 (19:30 +0000)]
Merge "Refactored area update info support"
am: b1092bfd55  -s ours

Change-Id: Ib616989cf16ef67118145d59845c7db764dc5ee9

6 years agoMerge "Refactored area update info support"
Treehugger Robot [Fri, 20 Oct 2017 19:19:09 +0000 (19:19 +0000)]
Merge "Refactored area update info support"

6 years agoMerge "Add link_type for temp_layoutlib" am: d0b0e8cc86 -s ours am: 3130b4e146 ...
Dan Willemsen [Fri, 20 Oct 2017 18:45:25 +0000 (18:45 +0000)]
Merge "Add link_type for temp_layoutlib" am: d0b0e8cc86  -s ours am: 3130b4e146  -s ours
am: d857569fda  -s ours

Change-Id: Ide90033b38ba2d75a5fb08e3078310dda5fec9ac

6 years agoMerge "Add link_type for temp_layoutlib" am: d0b0e8cc86 -s ours
Dan Willemsen [Fri, 20 Oct 2017 18:36:10 +0000 (18:36 +0000)]
Merge "Add link_type for temp_layoutlib" am: d0b0e8cc86  -s ours
am: 3130b4e146  -s ours

Change-Id: I8c22645a4148dcbc80f30b6d54ccd4926d4194c1

6 years agoMerge "Add link_type for temp_layoutlib"
Dan Willemsen [Fri, 20 Oct 2017 18:27:58 +0000 (18:27 +0000)]
Merge "Add link_type for temp_layoutlib"
am: d0b0e8cc86  -s ours

Change-Id: Ic84faa1292e8e52abff9ce62e992e7d00b7cb5e2

6 years agoMerge "Add link_type for temp_layoutlib"
Dan Willemsen [Fri, 20 Oct 2017 18:14:56 +0000 (18:14 +0000)]
Merge "Add link_type for temp_layoutlib"

6 years agoMerge "Fix netlink group mismatch in fds used for offload" into oc-mr1-dev
Niranjan Pendharkar [Fri, 20 Oct 2017 17:58:30 +0000 (17:58 +0000)]
Merge "Fix netlink group mismatch in fds used for offload" into oc-mr1-dev
am: 6575d483cc  -s ours

Change-Id: I4988ab09ac45812352e8a9ef1738f1986427dc91

6 years agoMerge "Fix netlink group mismatch in fds used for offload" into oc-mr1-dev
TreeHugger Robot [Fri, 20 Oct 2017 17:44:58 +0000 (17:44 +0000)]
Merge "Fix netlink group mismatch in fds used for offload" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master am: f9cf2df461 ...
Bill Yi [Fri, 20 Oct 2017 17:03:11 +0000 (17:03 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: f9cf2df461  -s ours
am: 33b0f435de  -s ours

Change-Id: I9506048b61420c3bc9d353631b400200f5535e9a

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master am: 5d9bd82bd8 ...
Bill Yi [Fri, 20 Oct 2017 16:51:53 +0000 (16:51 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 5d9bd82bd8  -s ours
am: 0c1a48ed2e  -s ours

Change-Id: I4833544baa45feb1525a4ea1260d2c0441a2c13d

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master am: 65fb1c889a ...
Bill Yi [Fri, 20 Oct 2017 16:48:28 +0000 (16:48 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 65fb1c889a  -s ours
am: 0d729e292e  -s ours

Change-Id: I1d6c54f9c2ab8035115103772702e4d177a8c3b4

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master am: e948fe0769 ...
Bill Yi [Fri, 20 Oct 2017 16:44:48 +0000 (16:44 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: e948fe0769  -s ours
am: f6136af68f  -s ours

Change-Id: I990d05d007ffc2b9a42dcb760fa9d1ffd2ab3db2

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master am: 6a83510d9b ...
Bill Yi [Fri, 20 Oct 2017 16:41:49 +0000 (16:41 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 6a83510d9b  -s ours
am: 4ad0db127e  -s ours

Change-Id: I22bb3057e7e08bd94e05e028d22746be53698541

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master am: c0e7b25f08 ...
Bill Yi [Fri, 20 Oct 2017 16:37:50 +0000 (16:37 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: c0e7b25f08  -s ours
am: 86141467a3  -s ours

Change-Id: I6eec541005b9717cb6b79b6eb3acc42ea86a7b65

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master am: 9fe4ca37b9 ...
Bill Yi [Fri, 20 Oct 2017 16:34:35 +0000 (16:34 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 9fe4ca37b9  -s ours
am: ef30f73d5a  -s ours

Change-Id: Id60b39fadb55f2a8e38d5c803cb88df5e0def573

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 20 Oct 2017 16:29:47 +0000 (16:29 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: f9cf2df461  -s ours

Change-Id: I3a0085c58a6296891879dfa9e3db1a82633cd161

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master am: 1e829c7f7f ...
Bill Yi [Fri, 20 Oct 2017 16:26:37 +0000 (16:26 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 1e829c7f7f  -s ours
am: ea0e76bc47  -s ours

Change-Id: I04efb209a566cd13e1e06f4e9cc9270a7b886cbc

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 20 Oct 2017 16:25:39 +0000 (16:25 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 5d9bd82bd8  -s ours

Change-Id: Ic4735df4076debec8f0d9622d6bcf8658a9a0c54

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master am: beda9e81f4 ...
Bill Yi [Fri, 20 Oct 2017 16:23:17 +0000 (16:23 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: beda9e81f4  -s ours
am: f4c2ddf35f  -s ours

Change-Id: I4a31befc5708c063dfcee876db69476aa12157d2

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 20 Oct 2017 16:22:27 +0000 (16:22 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 65fb1c889a  -s ours

Change-Id: I9a432dd63e70c7a2d38784d99c521861f2193539

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 20 Oct 2017 16:18:33 +0000 (16:18 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: e948fe0769  -s ours

Change-Id: I9b23ed7b98821c73269e1f17421e2321c03c3025

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master am: 3f31cfa6cd ...
Bill Yi [Fri, 20 Oct 2017 16:17:24 +0000 (16:17 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 3f31cfa6cd  -s ours
am: 682e764e52  -s ours

Change-Id: Id501722fe47efcfdad4e7af5810e27ba132aab2d

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 20 Oct 2017 16:15:39 +0000 (16:15 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 6a83510d9b  -s ours

Change-Id: Ie37ad318e3dedd1082a6acc63ef155fa604fb0cf

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master am: 639ee5c778 ...
Bill Yi [Fri, 20 Oct 2017 16:11:51 +0000 (16:11 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 639ee5c778  -s ours
am: a8c5964576  -s ours

Change-Id: Ia2ddb89614a8fadf9f91276f883fbd09f44b2066

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 20 Oct 2017 16:10:57 +0000 (16:10 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: c0e7b25f08  -s ours

Change-Id: I70e7bf0f6b2a8ebc372ed3f45fc7ef4ef274cd1c

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 20 Oct 2017 16:05:43 +0000 (16:05 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 9fe4ca37b9  -s ours

Change-Id: I2f3c973b770186c297e612123ae5cd28997536ac

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master am: 422b17438b ...
Bill Yi [Fri, 20 Oct 2017 16:04:33 +0000 (16:04 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 422b17438b  -s ours
am: 49cc0fd2f8  -s ours

Change-Id: If6132f679d6bd5aa37a1e4645c4494523babda6f

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 20 Oct 2017 16:00:01 +0000 (16:00 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 20 Oct 2017 15:58:25 +0000 (15:58 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 1e829c7f7f  -s ours

Change-Id: I3d4c999516a0ae711703e68c48624e03128946e2

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 20 Oct 2017 15:55:23 +0000 (15:55 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: beda9e81f4  -s ours

Change-Id: I93c24453b6a5820754d048b671ce22cc304fce9b

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 20 Oct 2017 15:52:08 +0000 (15:52 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 3f31cfa6cd  -s ours

Change-Id: I8022a841defd381d9b67088271d088ad559d24e1

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master am: 5fdf106b8b ...
Bill Yi [Fri, 20 Oct 2017 15:50:09 +0000 (15:50 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 5fdf106b8b  -s ours
am: b823588836  -s ours

Change-Id: Ifa87ae57ef423c5ff56e2c59a28ff9fecee549c8

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 20 Oct 2017 15:48:36 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 639ee5c778  -s ours

Change-Id: Ic0ebba84ca5dfedd88b08c334de5e31de5cedc20

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master am: c035f28175 ...
Bill Yi [Fri, 20 Oct 2017 15:46:36 +0000 (15:46 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: c035f28175  -s ours
am: 770e4008b2  -s ours

Change-Id: I65c915a26923287d6097a374d48f7d34a892f992

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 20 Oct 2017 15:45:40 +0000 (15:45 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 422b17438b  -s ours

Change-Id: Icdd126fb90cdce54c2bf44e1ef924c8ea19951f0

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 20 Oct 2017 15:40:21 +0000 (15:40 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 5fdf106b8b  -s ours

Change-Id: I6da8e75d0ac5544d6524f8a180bc302896f5a93f

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 20 Oct 2017 15:39:37 +0000 (15:39 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 20 Oct 2017 15:37:34 +0000 (15:37 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 20 Oct 2017 15:36:20 +0000 (15:36 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 20 Oct 2017 15:35:38 +0000 (15:35 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
Bill Yi [Fri, 20 Oct 2017 15:35:36 +0000 (15:35 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: c035f28175  -s ours

Change-Id: Id153ec0566031b928d5087c04b03616141ab0568

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 20 Oct 2017 15:34:59 +0000 (15:34 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 20 Oct 2017 15:33:25 +0000 (15:33 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Add a global setting to disable DNS over TLS" am: 4a906c167b am: 3017ebec8c
Ben Schwartz [Fri, 20 Oct 2017 15:33:17 +0000 (15:33 +0000)]
Merge "Add a global setting to disable DNS over TLS" am: 4a906c167b am: 3017ebec8c
am: b84582fc96

Change-Id: Ia64a8318ad2f57aa3dc58a13d20274b877649fef

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 20 Oct 2017 15:32:39 +0000 (15:32 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 20 Oct 2017 15:31:30 +0000 (15:31 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 20 Oct 2017 15:31:01 +0000 (15:31 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 20 Oct 2017 15:29:19 +0000 (15:29 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 20 Oct 2017 15:28:04 +0000 (15:28 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 20 Oct 2017 15:27:19 +0000 (15:27 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Import translations. DO NOT MERGE" into stage-aosp-master
TreeHugger Robot [Fri, 20 Oct 2017 15:23:26 +0000 (15:23 +0000)]
Merge "Import translations. DO NOT MERGE" into stage-aosp-master

6 years agoMerge "Add a global setting to disable DNS over TLS" am: 4a906c167b
Ben Schwartz [Fri, 20 Oct 2017 15:18:38 +0000 (15:18 +0000)]
Merge "Add a global setting to disable DNS over TLS" am: 4a906c167b
am: 3017ebec8c

Change-Id: I94c2f2011bbe29e3d8a39904d19d2b5c606ae0be

6 years agoMerge "more O_CLOEXEC" am: 9f8ed6500a am: 7c27266544
Nick Kralevich [Fri, 20 Oct 2017 15:11:42 +0000 (15:11 +0000)]
Merge "more O_CLOEXEC" am: 9f8ed6500a am: 7c27266544
am: db61fce852

Change-Id: I9b53dd6984a3ae3e89b8279551367ac97e8ed7fa

6 years agoMerge "Add a global setting to disable DNS over TLS"
Ben Schwartz [Fri, 20 Oct 2017 15:08:55 +0000 (15:08 +0000)]
Merge "Add a global setting to disable DNS over TLS"
am: 4a906c167b

Change-Id: Ie0f5586342b32c9e7c745ab9697b44158a920233

6 years agoMerge "more O_CLOEXEC" am: 9f8ed6500a
Nick Kralevich [Fri, 20 Oct 2017 15:02:21 +0000 (15:02 +0000)]
Merge "more O_CLOEXEC" am: 9f8ed6500a
am: 7c27266544

Change-Id: I1b2c3f06bf02e2170f3ffa70d10d37d45da1a0c4

6 years agoMerge "Add a global setting to disable DNS over TLS"
Treehugger Robot [Fri, 20 Oct 2017 14:58:39 +0000 (14:58 +0000)]
Merge "Add a global setting to disable DNS over TLS"

6 years agoMerge "more O_CLOEXEC"
Nick Kralevich [Fri, 20 Oct 2017 14:53:14 +0000 (14:53 +0000)]
Merge "more O_CLOEXEC"
am: 9f8ed6500a

Change-Id: I7d07ad29cddeac5f44cc5a918e33b0a9068d29c0

6 years agoMerge "more O_CLOEXEC"
Treehugger Robot [Fri, 20 Oct 2017 14:44:26 +0000 (14:44 +0000)]
Merge "more O_CLOEXEC"

6 years agoFix netlink group mismatch in fds used for offload
Niranjan Pendharkar [Wed, 18 Oct 2017 23:58:25 +0000 (16:58 -0700)]
Fix netlink group mismatch in fds used for offload

Existing groups used for binding to netlink conntrack events don't
seem to work as expected. Fix this by using exact groups defined
in IOffloadConfig hal.

Test: as follows
      - Compiles and boots on walleye
      - Validated conntrack destroy events are received as expected.
      - Validated offload works as expected.

Bug:68018148
CRs-fixed:2126789

Merged-In: I2dcebec1c08bb7b067621331533d8a65dd7b5083
Merged-In: I96d6d5601aff009879f452975be91b6e7e40bb57
Change-Id: I76178fd7f109b82a4e4961347b8949937813d71d
(cherry picked from commit f10282b830af4c7ea56b2c64e73a7ffd3c006007)

6 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 20 Oct 2017 09:23:10 +0000 (02:23 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 68003463
Change-Id: I54b9c45224a393b5724a8964858817e3247ece54

6 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 20 Oct 2017 09:06:39 +0000 (02:06 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 68003463
Change-Id: I1786cdac7dae8737ba1f7ea7665a62dfcfc2d7f2

6 years agoMerge "Fix netlink group mismatch in fds used for offload" am: fb7c0e8c91 am: 6d36b2657f
Niranjan Pendharkar [Fri, 20 Oct 2017 08:44:05 +0000 (08:44 +0000)]
Merge "Fix netlink group mismatch in fds used for offload" am: fb7c0e8c91 am: 6d36b2657f
am: 9c2576fa9b

Change-Id: I2dcebec1c08bb7b067621331533d8a65dd7b5083

6 years agoMerge "Fix netlink group mismatch in fds used for offload" am: fb7c0e8c91
Niranjan Pendharkar [Fri, 20 Oct 2017 08:35:10 +0000 (08:35 +0000)]
Merge "Fix netlink group mismatch in fds used for offload" am: fb7c0e8c91
am: 6d36b2657f

Change-Id: I44aef861bdc3e3454127fefd024c84eb44d7301b

6 years agoMerge "Fix netlink group mismatch in fds used for offload"
Niranjan Pendharkar [Fri, 20 Oct 2017 08:25:19 +0000 (08:25 +0000)]
Merge "Fix netlink group mismatch in fds used for offload"
am: fb7c0e8c91

Change-Id: Iaca85d6b06dfc642ffce7c53bb87cd25dabe04c9

6 years agoMerge "Fix netlink group mismatch in fds used for offload"
Treehugger Robot [Fri, 20 Oct 2017 08:14:40 +0000 (08:14 +0000)]
Merge "Fix netlink group mismatch in fds used for offload"

6 years agoAdd config to display VM number as default number of CF
Qiong Liu [Mon, 16 Oct 2017 09:04:30 +0000 (17:04 +0800)]
Add config to display VM number as default number of CF

Add config to determine whether to display voicemail number when
call forwarding number is null. The default value is false.

Test: manual - checked the voicemail number shown as default
Bug: 67855679
Change-Id: Iffa7f9a31757e2df2535abf0269a768ff4e67e8c

6 years agoMerge "[framework] Fixed signal strength issue" am: 6d98743048 am: c671962c9a
Pengquan Meng [Fri, 20 Oct 2017 06:13:15 +0000 (06:13 +0000)]
Merge "[framework] Fixed signal strength issue" am: 6d98743048 am: c671962c9a
am: af9207272a

Change-Id: I86d83b0b51a5a9b73ddd181f4962ac1b9647bb1c

6 years agoMerge "[framework] Fixed signal strength issue" am: 6d98743048
Pengquan Meng [Fri, 20 Oct 2017 06:03:11 +0000 (06:03 +0000)]
Merge "[framework] Fixed signal strength issue" am: 6d98743048
am: c671962c9a

Change-Id: I3065d74ca69f49b97dd64d015d65260671ecf158