OSDN Git Service
jackqdyulei [Thu, 22 Jun 2017 19:07:08 +0000 (19:07 +0000)]
Merge "Add metric for anomaly action" into oc-dr1-dev am:
378965aee1
am:
4ba0f3ef07
Change-Id: I1606aec1a193ccfed5c1a7f0946c12d7e101f43d
Jason Monk [Thu, 22 Jun 2017 18:59:18 +0000 (18:59 +0000)]
Merge "Add test for StatusBar.dump" into oc-dr1-dev am:
4448d47ed2
am:
d7d1189826
Change-Id: I5a58420a7bca1758ea3b98896bae8ab95ec02f61
jackqdyulei [Thu, 22 Jun 2017 18:57:52 +0000 (18:57 +0000)]
Merge "Add metric for anomaly action" into oc-dr1-dev
am:
378965aee1
Change-Id: I6c4906702b9b4c7612cd4e75a427d424bfb75853
Jason Monk [Thu, 22 Jun 2017 18:51:21 +0000 (18:51 +0000)]
Merge "Add test for StatusBar.dump" into oc-dr1-dev
am:
4448d47ed2
Change-Id: I902114ceacb651690939851b9f2927d0f9bc0eaf
TreeHugger Robot [Thu, 22 Jun 2017 18:46:07 +0000 (18:46 +0000)]
Merge "Add metric for anomaly action" into oc-dr1-dev
TreeHugger Robot [Thu, 22 Jun 2017 18:41:57 +0000 (18:41 +0000)]
Merge "Add test for StatusBar.dump" into oc-dr1-dev
Lucas Dupin [Thu, 22 Jun 2017 18:18:04 +0000 (18:18 +0000)]
Merge "Merge "Ensure icon contrast on the shelf" into oc-dev am:
d0550a9b6c" into oc-dr1-dev am:
99613f8253
am:
de1008b580
Change-Id: I311cda385ad3662c8c4298b290a4367d39fc0836
Jason Monk [Thu, 22 Jun 2017 18:14:28 +0000 (18:14 +0000)]
Merge "Merge "Fix ConcurrentModificationException from LocationController" into oc-dev am:
6791bee744" into oc-dr1-dev am:
3072655374
am:
ff36065f1c
Change-Id: I50e6f1b614558d215dea79c0bfa526d9ffbe9e9a
Erik Kline [Thu, 22 Jun 2017 18:10:47 +0000 (18:10 +0000)]
Merge "Merge "Create a TetherInterfaceStateMachine when told the interface name." into oc-dev am:
be7657b038" into oc-dr1-dev am:
c4c5b6f806 -s ours
am:
e9154b5ec2 -s ours
Change-Id: Ie2b2667a0b3f8841b3f3879fc17a55a63c14d6e2
Narayan Kamath [Thu, 22 Jun 2017 18:04:24 +0000 (18:04 +0000)]
Merge "Merge "_exit(0) on clean shutdown, not _exit(1)" into oc-dev am:
31cf02742e" into oc-dr1-dev am:
04bd18fb30
am:
6da2b86237
Change-Id: I434678eb093574d96d356e90bcc8fdb5825f62a9
Lucas Dupin [Thu, 22 Jun 2017 18:01:12 +0000 (18:01 +0000)]
Merge "Merge "Ensure icon contrast on the shelf" into oc-dev am:
d0550a9b6c" into oc-dr1-dev
am:
99613f8253
Change-Id: I09f5a5351f9c71be3db9d85405a4244cf0e3ee5d
Jason Monk [Thu, 22 Jun 2017 18:00:24 +0000 (18:00 +0000)]
Merge "Add config to artificially inflate number of bars" into oc-dr1-dev am:
cfca96d28a
am:
17efbe25f8
Change-Id: I4304f12d3e6dc0b4091cd1fa4381f1f574c07c6c
Jason Monk [Thu, 22 Jun 2017 17:54:16 +0000 (17:54 +0000)]
Merge "Merge "Fix ConcurrentModificationException from LocationController" into oc-dev am:
6791bee744" into oc-dr1-dev
am:
3072655374
Change-Id: I9be0689c6ad9e6c25a1f51c6368e539a841afa0c
Erik Kline [Thu, 22 Jun 2017 17:51:13 +0000 (17:51 +0000)]
Merge "Merge "Create a TetherInterfaceStateMachine when told the interface name." into oc-dev am:
be7657b038" into oc-dr1-dev
am:
c4c5b6f806 -s ours
Change-Id: I3564c8dd49349802ede537f3c42c253376fba8b7
Erik Kline [Thu, 22 Jun 2017 17:49:51 +0000 (17:49 +0000)]
Merge "resolve merge conflicts of
c8b180116d42 to oc-dr1-dev" into oc-dr1-dev am:
8839b4c7ba -s ours
am:
173dddb9e0 -s ours
Change-Id: I53ae6be474faa2b80060b56601b043d592d8b9ba
Narayan Kamath [Thu, 22 Jun 2017 17:48:32 +0000 (17:48 +0000)]
Merge "Merge "_exit(0) on clean shutdown, not _exit(1)" into oc-dev am:
31cf02742e" into oc-dr1-dev
am:
04bd18fb30
Change-Id: I2cc9faee52a7daedbe13a499f80f4ef36e13d0e8
Jason Monk [Thu, 22 Jun 2017 17:45:32 +0000 (17:45 +0000)]
Merge "Add config to artificially inflate number of bars" into oc-dr1-dev
am:
cfca96d28a
Change-Id: Ib95407d2ea4c81e4b0e7284fe96a9dac0bc36897
TreeHugger Robot [Thu, 22 Jun 2017 17:44:33 +0000 (17:44 +0000)]
Merge "Flush out existing sessions when the Autofill service is changed."
Android Build Merger (Role) [Thu, 22 Jun 2017 17:40:42 +0000 (17:40 +0000)]
Merge "Merge "Ensure icon contrast on the shelf" into oc-dev am:
d0550a9b6c" into oc-dr1-dev
Lucas Dupin [Thu, 22 Jun 2017 17:39:24 +0000 (17:39 +0000)]
Merge "Ensure icon contrast on the shelf" into oc-dev
am:
d0550a9b6c
Change-Id: Ic82b4d1316d5232712a0e395b080262c314ecf68
Android Build Merger (Role) [Thu, 22 Jun 2017 17:38:53 +0000 (17:38 +0000)]
Merge "Merge "Fix ConcurrentModificationException from LocationController" into oc-dev am:
6791bee744" into oc-dr1-dev
Jason Monk [Thu, 22 Jun 2017 17:37:55 +0000 (17:37 +0000)]
Merge "Fix ConcurrentModificationException from LocationController" into oc-dev
am:
6791bee744
Change-Id: I2bd4481438c382c718d51c65fe3941e88c63b2c7
Android Build Merger (Role) [Thu, 22 Jun 2017 17:37:22 +0000 (17:37 +0000)]
Merge "Merge "Create a TetherInterfaceStateMachine when told the interface name." into oc-dev am:
be7657b038" into oc-dr1-dev
Erik Kline [Thu, 22 Jun 2017 17:36:51 +0000 (17:36 +0000)]
Merge "resolve merge conflicts of
c8b180116d42 to oc-dr1-dev" into oc-dr1-dev
am:
8839b4c7ba -s ours
Change-Id: Ife953e5775cbccacaeb3a325caa4b496f73f6458
Erik Kline [Thu, 22 Jun 2017 17:36:12 +0000 (17:36 +0000)]
Merge "Create a TetherInterfaceStateMachine when told the interface name." into oc-dev
am:
be7657b038
Change-Id: Ie34a3c7aa39c9b70602236f4d4a4d5548566dd51
Android Build Merger (Role) [Thu, 22 Jun 2017 17:35:25 +0000 (17:35 +0000)]
Merge "Merge "_exit(0) on clean shutdown, not _exit(1)" into oc-dev am:
31cf02742e" into oc-dr1-dev
TreeHugger Robot [Thu, 22 Jun 2017 17:34:09 +0000 (17:34 +0000)]
Merge "Add config to artificially inflate number of bars" into oc-dr1-dev
Narayan Kamath [Thu, 22 Jun 2017 17:34:12 +0000 (17:34 +0000)]
Merge "_exit(0) on clean shutdown, not _exit(1)" into oc-dev
am:
31cf02742e
Change-Id: Ie0d68df7a51c10bc82974680bdd16f1eab48e9fa
TreeHugger Robot [Thu, 22 Jun 2017 17:28:26 +0000 (17:28 +0000)]
Merge "resolve merge conflicts of
c8b180116d42 to oc-dr1-dev" into oc-dr1-dev
TreeHugger Robot [Thu, 22 Jun 2017 17:25:10 +0000 (17:25 +0000)]
Merge "Ensure icon contrast on the shelf" into oc-dev
Lucas Dupin [Thu, 22 Jun 2017 17:07:40 +0000 (17:07 +0000)]
Merge "Darker extracted gradients." into oc-dr1-dev am:
eaac5e2fe9
am:
df6048a1b6
Change-Id: I4553cc8cd5991756e96451b417a128f7b61f041f
Lucas Dupin [Thu, 22 Jun 2017 16:59:45 +0000 (16:59 +0000)]
Merge "Darker extracted gradients." into oc-dr1-dev
am:
eaac5e2fe9
Change-Id: I31d11041f6a11558620c1a17bd5a6a8d637394bc
TreeHugger Robot [Thu, 22 Jun 2017 16:57:25 +0000 (16:57 +0000)]
Merge "Add API to allow apps more control over instantiation"
TreeHugger Robot [Thu, 22 Jun 2017 16:54:36 +0000 (16:54 +0000)]
Merge "Darker extracted gradients." into oc-dr1-dev
Jason Monk [Thu, 22 Jun 2017 16:40:08 +0000 (16:40 +0000)]
Merge "Use id directly when extensions change fragments" into oc-dr1-dev am:
9aa0a8e1f4
am:
1865441acf
Change-Id: I2d6446eac0d36c32a4effa7111488b261f658a67
Jason Monk [Thu, 22 Jun 2017 16:32:05 +0000 (16:32 +0000)]
Merge "Use id directly when extensions change fragments" into oc-dr1-dev
am:
9aa0a8e1f4
Change-Id: I9e05dead59d49213f058e8c0efe17f329f49e1a9
TreeHugger Robot [Thu, 22 Jun 2017 16:25:48 +0000 (16:25 +0000)]
Merge "Use id directly when extensions change fragments" into oc-dr1-dev
Fyodor Kupolov [Thu, 22 Jun 2017 15:47:58 +0000 (15:47 +0000)]
Merge "Purge user data on ACTION_USER_REMOVED"
Jason Monk [Thu, 22 Jun 2017 15:41:08 +0000 (11:41 -0400)]
Add test for StatusBar.dump
and make it pass
Test: runtest systemui
Change-Id: I26cd913d8df468635b091d5fb3531c975e0ca848
Fixes:
62573356
TreeHugger Robot [Thu, 22 Jun 2017 15:39:22 +0000 (15:39 +0000)]
Merge "Fix ConcurrentModificationException from LocationController" into oc-dev
TreeHugger Robot [Thu, 22 Jun 2017 15:37:44 +0000 (15:37 +0000)]
Merge "Pass all locale information down to Minikin"
Jason Monk [Thu, 22 Jun 2017 15:20:04 +0000 (11:20 -0400)]
Add config to artificially inflate number of bars
Test: manual
Bug:
62664881
Change-Id: Id8797f4f6178af16051147d3021bb34074afbca9
Erik Kline [Thu, 22 Jun 2017 15:10:12 +0000 (00:10 +0900)]
resolve merge conflicts of
c8b180116d42 to oc-dr1-dev
Test: I solemnly swear I tested this conflict resolution.
Bug:
32163131
Bug:
62343300
Change-Id: I7f86e5f02c8b599aa71babbbb32bf4803cbd9a2f
Merged-In: I542e013aa19fefd3443588c9a81ee59cd669ab6f
Merged-In: I973bdc5b540cce66a9713cebfd5071ad4a4b0a08
Merged-In: I2104ecf8102c8f9541ee2d3ce6589b0081db4fe3
Juan Lang [Thu, 22 Jun 2017 14:35:41 +0000 (14:35 +0000)]
Merge "Add CustomDialogPreference and CustomEditTextPreference to SettingsLib." into oc-dr1-dev am:
f5d8628779
am:
1911226ba2 -s ours
Change-Id: I347d9a78fd5cc00b9f47b2331b7ecb750c38eeda
Erik Kline [Thu, 22 Jun 2017 14:32:55 +0000 (14:32 +0000)]
Merge "Refactor TISM add/remove code" into oc-dev am:
c0af382a25 -s ours am:
caafb1fbe3 -s ours
am:
09bd349962 -s ours
Change-Id: I3796c1f776101e6d2d236a13a2375a19bd7df158
Felipe Leme [Thu, 22 Jun 2017 14:30:10 +0000 (14:30 +0000)]
Merge "Autofill fixes for secondary users:" into oc-dev am:
6358cdcd28 am:
17911ae02b
am:
e7e3f0657b
Change-Id: I7792d514d44ebece52bf06f319a54181801afb29
Android Build Merger (Role) [Thu, 22 Jun 2017 14:23:01 +0000 (14:23 +0000)]
Merge "Merge "Merge "Clarify startScan API on how to get results" into oc-dev am:
78f3a0f722 am:
ef863368b4" into oc-dr1-dev-plus-aosp am:
e8ac390ae3"
Amith Yamasani [Thu, 22 Jun 2017 14:21:16 +0000 (14:21 +0000)]
Merge "Merge "Clarify startScan API on how to get results" into oc-dev am:
78f3a0f722 am:
ef863368b4" into oc-dr1-dev-plus-aosp
am:
e8ac390ae3
Change-Id: Id29bcd5ba1c41f724934232000f9acae96f722ca
Android Build Merger (Role) [Thu, 22 Jun 2017 14:20:39 +0000 (14:20 +0000)]
Merge "Merge "Merge "Provide content description for WorkLockActivity." into oc-dev am:
f044e0b87f am:
fcc7a55558" into oc-dr1-dev-plus-aosp am:
eec4ffbee6"
Pavel Grafov [Thu, 22 Jun 2017 14:19:20 +0000 (14:19 +0000)]
Merge "Merge "Provide content description for WorkLockActivity." into oc-dev am:
f044e0b87f am:
fcc7a55558" into oc-dr1-dev-plus-aosp
am:
eec4ffbee6
Change-Id: I4013274e2f00e16ab26b7d924233facec383b7db
Android Build Merger (Role) [Thu, 22 Jun 2017 14:18:36 +0000 (14:18 +0000)]
Merge "Merge "Merge "Create Splash Screen context with CONTEXT_RESTRICTED." into oc-dev am:
8bc0aa2559 am:
e155b7ca8e" into oc-dr1-dev-plus-aosp am:
6d0533da4e"
Tomasz Wasilczyk [Thu, 22 Jun 2017 14:17:54 +0000 (14:17 +0000)]
Merge "Adjust log messages emitted by RadioService."
Juan Lang [Thu, 22 Jun 2017 14:17:21 +0000 (14:17 +0000)]
Merge "Add CustomDialogPreference and CustomEditTextPreference to SettingsLib." into oc-dr1-dev
am:
f5d8628779
Change-Id: I7299706fbc31f17fb18a5225be0f6460dd04707e
Rob Carr [Thu, 22 Jun 2017 14:16:16 +0000 (14:16 +0000)]
Merge "Merge "Create Splash Screen context with CONTEXT_RESTRICTED." into oc-dev am:
8bc0aa2559 am:
e155b7ca8e" into oc-dr1-dev-plus-aosp
am:
6d0533da4e
Change-Id: Id75687f78928dc11adab77559f5d4fa562e5f3a7
Pavel Grafov [Thu, 22 Jun 2017 14:13:28 +0000 (14:13 +0000)]
Merge "Merge "Provide content description for WorkLockActivity." into oc-dev am:
f044e0b87f am:
f9a63d0457" into oc-dr1-dev-plus-aosp
am:
efaf14102f
Change-Id: I5120d979c04d792b1bd57ad0d731f0e2fbab3349
Rob Carr [Thu, 22 Jun 2017 14:10:15 +0000 (14:10 +0000)]
Merge "Merge "Create Splash Screen context with CONTEXT_RESTRICTED." into oc-dev am:
8bc0aa2559 am:
604c29006b" into oc-dr1-dev-plus-aosp
am:
6f6f9383b8
Change-Id: Ic021a5ed26b009b9feaab83ef8770d2740fd6099
Jason Monk [Thu, 22 Jun 2017 14:09:29 +0000 (10:09 -0400)]
Use id directly when extensions change fragments
This avoids a crash if the fragment hasn't been created yet.
Test: manual
Change-Id: I0799c50a3482c3c60fd0e27d486db5214e92f183
Fixes:
37855553
Bill Yi [Thu, 22 Jun 2017 14:07:19 +0000 (14:07 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
7c23c990f1 -s ours am:
1a588ec465 -s ours" into oc-dr1-dev-plus-aosp
am:
67a43ea494 -s ours
Change-Id: Ie84a3d3d574143fb5448f3e0380454c52cd93d59
Erik Kline [Thu, 22 Jun 2017 14:06:59 +0000 (14:06 +0000)]
Merge "Refactor TISM add/remove code" into oc-dev am:
c0af382a25 -s ours
am:
caafb1fbe3 -s ours
Change-Id: Ied5003b52d758618cdaa4900a9e36845cebf7e66
Juan Lang [Thu, 22 Jun 2017 14:05:53 +0000 (14:05 +0000)]
Merge "Add CustomDialogPreference and CustomEditTextPreference to SettingsLib." into oc-dr1-dev
Felipe Leme [Thu, 22 Jun 2017 14:04:27 +0000 (14:04 +0000)]
Merge "Autofill fixes for secondary users:" into oc-dev am:
6358cdcd28
am:
17911ae02b
Change-Id: I848c2f793706bb7223a05b989f55e4f77e31e343
Bill Yi [Thu, 22 Jun 2017 14:02:35 +0000 (14:02 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
7c23c990f1 -s ours am:
131ccb00a8 -s ours" into oc-dr1-dev-plus-aosp
am:
baa8af8d0d -s ours
Change-Id: I40f0e330a86e918e9712cfb4c405d8b18bf79a0f
Bill Yi [Thu, 22 Jun 2017 14:00:19 +0000 (14:00 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
242c3c497c -s ours am:
4b209f21b6 -s ours" into oc-dr1-dev-plus-aosp
am:
d772e224d7 -s ours
Change-Id: I5f5d80dc33aa7c379f16ca38e26064f835e2727c
Android Build Merger (Role) [Thu, 22 Jun 2017 13:59:17 +0000 (13:59 +0000)]
Merge "Merge "Clarify startScan API on how to get results" into oc-dev am:
78f3a0f722 am:
ef863368b4" into oc-dr1-dev-plus-aosp
Amith Yamasani [Thu, 22 Jun 2017 13:57:54 +0000 (13:57 +0000)]
Merge "Clarify startScan API on how to get results" into oc-dev am:
78f3a0f722
am:
ef863368b4
Change-Id: I0663ad4be0ae6b29ea0b2f5942af518a830632b3
Bill Yi [Thu, 22 Jun 2017 13:57:43 +0000 (13:57 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
242c3c497c -s ours am:
70c2a7b0d9 -s ours" into oc-dr1-dev-plus-aosp
am:
7a5ba9d901 -s ours
Change-Id: I0da65f2661d2902474fb3dcbb24b30580b3f9e3b
Android Build Merger (Role) [Thu, 22 Jun 2017 13:57:27 +0000 (13:57 +0000)]
Merge "Merge "Provide content description for WorkLockActivity." into oc-dev am:
f044e0b87f am:
fcc7a55558" into oc-dr1-dev-plus-aosp
Pavel Grafov [Thu, 22 Jun 2017 13:56:15 +0000 (13:56 +0000)]
Merge "Provide content description for WorkLockActivity." into oc-dev am:
f044e0b87f
am:
fcc7a55558
Change-Id: Ica390ce4fe72b205c89b269f7f3d050d1c27511d
Android Build Merger (Role) [Thu, 22 Jun 2017 13:55:48 +0000 (13:55 +0000)]
Merge "Merge "Create Splash Screen context with CONTEXT_RESTRICTED." into oc-dev am:
8bc0aa2559 am:
e155b7ca8e" into oc-dr1-dev-plus-aosp
Evan Laird [Thu, 22 Jun 2017 13:55:23 +0000 (13:55 +0000)]
Merge "Fix mobile signal icon when in airplane mode" into oc-dev am:
6a651f81b5 am:
024ba89606
am:
3370e44417
Change-Id: Ifa98d1d39503ab69dbd469cc1feb9bdb33c2cc84
Android Build Merger (Role) [Thu, 22 Jun 2017 13:54:41 +0000 (13:54 +0000)]
Merge "Merge "Provide content description for WorkLockActivity." into oc-dev am:
f044e0b87f am:
f9a63d0457" into oc-dr1-dev-plus-aosp
Erik Kline [Thu, 22 Jun 2017 13:54:27 +0000 (13:54 +0000)]
Merge "Refactor TISM add/remove code" into oc-dev
am:
c0af382a25 -s ours
Change-Id: I3b5e596034d8f5078dac107d754aec0f77d9ba89
Rob Carr [Thu, 22 Jun 2017 13:54:27 +0000 (13:54 +0000)]
Merge "Create Splash Screen context with CONTEXT_RESTRICTED." into oc-dev am:
8bc0aa2559
am:
e155b7ca8e
Change-Id: I917e8ef8d9aa83261bdbeb2200464549af9c7f70
Pavel Grafov [Thu, 22 Jun 2017 13:53:26 +0000 (13:53 +0000)]
Merge "Provide content description for WorkLockActivity." into oc-dev am:
f044e0b87f
am:
f9a63d0457
Change-Id: Iae48fe9599a680a55024c4b377f7583e7606c870
Android Build Merger (Role) [Thu, 22 Jun 2017 13:53:00 +0000 (13:53 +0000)]
Merge "Merge "Create Splash Screen context with CONTEXT_RESTRICTED." into oc-dev am:
8bc0aa2559 am:
604c29006b" into oc-dr1-dev-plus-aosp
Rob Carr [Thu, 22 Jun 2017 13:51:45 +0000 (13:51 +0000)]
Merge "Create Splash Screen context with CONTEXT_RESTRICTED." into oc-dev am:
8bc0aa2559
am:
604c29006b
Change-Id: Ieea08ba5d0462bd28b185a59ab077a5f31e320cf
Felipe Leme [Thu, 22 Jun 2017 13:51:25 +0000 (13:51 +0000)]
Merge "Autofill fixes for secondary users:" into oc-dev
am:
6358cdcd28
Change-Id: Ic42bd782988bec610281b651346a5809e912c823
Android Build Merger (Role) [Thu, 22 Jun 2017 13:51:19 +0000 (13:51 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
7c23c990f1 -s ours am:
1a588ec465 -s ours" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 22 Jun 2017 13:50:20 +0000 (13:50 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
7c23c990f1 -s ours am:
131ccb00a8 -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Thu, 22 Jun 2017 13:50:02 +0000 (13:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
7c23c990f1 -s ours
am:
1a588ec465 -s ours
Change-Id: Id6ea25f828e01b7e8aaf0b186718f830d111c797
Android Build Merger (Role) [Thu, 22 Jun 2017 13:49:33 +0000 (13:49 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
242c3c497c -s ours am:
4b209f21b6 -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Thu, 22 Jun 2017 13:49:27 +0000 (13:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
7c23c990f1 -s ours
am:
131ccb00a8 -s ours
Change-Id: I12baaccc938a1fcccdbc1ad97a18b802ffdee691
Android Build Merger (Role) [Thu, 22 Jun 2017 13:48:49 +0000 (13:48 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
242c3c497c -s ours am:
70c2a7b0d9 -s ours" into oc-dr1-dev-plus-aosp
Amith Yamasani [Thu, 22 Jun 2017 13:48:51 +0000 (13:48 +0000)]
Merge "Clarify startScan API on how to get results" into oc-dev
am:
78f3a0f722
Change-Id: Ibc04014f224ecbc666c8296a2b25d939fbfc9921
Bill Yi [Thu, 22 Jun 2017 13:47:47 +0000 (13:47 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
242c3c497c -s ours
am:
70c2a7b0d9 -s ours
Change-Id: I6559d4e1d46cd96e4c40a01c789b58cc41069b88
Bill Yi [Thu, 22 Jun 2017 13:47:15 +0000 (13:47 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
242c3c497c -s ours
am:
4b209f21b6 -s ours
Change-Id: I438f9ea34f83513db4d43b7c6bc0f46c13d8d712
Evan Laird [Thu, 22 Jun 2017 13:47:00 +0000 (13:47 +0000)]
Merge "Merge commit '
6a651f81b52dcdc6518f1fc138985365feae4bfb' into oc-dr1-dev" into oc-dr1-dev am:
ca35ed5cb9
am:
53988d9f8d
Change-Id: Id5ea4fd2244ccac41302d34982f0a26f5d198804
Pavel Grafov [Thu, 22 Jun 2017 13:45:52 +0000 (13:45 +0000)]
Merge "Provide content description for WorkLockActivity." into oc-dev
am:
f044e0b87f
Change-Id: I404ec7b0fa7fecb0e4945beca32c634358e0b33e
Evan Laird [Thu, 22 Jun 2017 13:44:31 +0000 (13:44 +0000)]
Merge "Fix mobile signal icon when in airplane mode" into oc-dev am:
6a651f81b5
am:
024ba89606
Change-Id: I330846d328be9e2e10631cd6ceb0296734308c23
Rob Carr [Thu, 22 Jun 2017 13:42:47 +0000 (13:42 +0000)]
Merge "Create Splash Screen context with CONTEXT_RESTRICTED." into oc-dev
am:
8bc0aa2559
Change-Id: I45a7ed913929eeb8d1b6eda6855fe7976fa64a14
Bill Yi [Thu, 22 Jun 2017 13:39:36 +0000 (13:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
7c23c990f1 -s ours
Change-Id: Ib192e1569074bcd19d38d8e67a8378f63ca99164
Evan Laird [Thu, 22 Jun 2017 13:39:34 +0000 (13:39 +0000)]
Merge "Merge commit '
6a651f81b52dcdc6518f1fc138985365feae4bfb' into oc-dr1-dev" into oc-dr1-dev
am:
ca35ed5cb9
Change-Id: I0d695cc7edaeddb7817a19ff6f7e33d55691d7e0
Bill Yi [Thu, 22 Jun 2017 13:35:55 +0000 (13:35 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
242c3c497c -s ours
Change-Id: Idbb294776a7400de5aebb99b9a45f7121c7415f6
Jason Monk [Thu, 22 Jun 2017 13:19:54 +0000 (09:19 -0400)]
Fix ConcurrentModificationException from LocationController
Test: runtest systemui
Change-Id: I0b7db7344217b3b7ad91f315100d1873e8167baf
Fixes:
62859544
TreeHugger Robot [Thu, 22 Jun 2017 13:31:40 +0000 (13:31 +0000)]
Merge "Merge commit '
6a651f81b52dcdc6518f1fc138985365feae4bfb' into oc-dr1-dev" into oc-dr1-dev
TreeHugger Robot [Thu, 22 Jun 2017 11:27:28 +0000 (11:27 +0000)]
Merge "Create a TetherInterfaceStateMachine when told the interface name." into oc-dev
Narayan Kamath [Thu, 22 Jun 2017 10:32:28 +0000 (10:32 +0000)]
Merge "_exit(0) on clean shutdown, not _exit(1)" into oc-dev
Erik Kline [Thu, 22 Jun 2017 09:42:43 +0000 (09:42 +0000)]
Merge "Only disable Wi-Fi IP serving on specific interface, if available" into oc-dr1-dev am:
e9b908c7a6 -s ours
am:
b408e40ce2 -s ours
Change-Id: I28858f9bacca97bcc6d70860c9d5b8c358b5e7d5
Erik Kline [Thu, 22 Jun 2017 09:35:45 +0000 (09:35 +0000)]
Merge "Only disable Wi-Fi IP serving on specific interface, if available" into oc-dr1-dev
am:
e9b908c7a6 -s ours
Change-Id: Ie2f3c211b7e0807db4e5d5bfcd158356fca9a0dd
Erik Kline [Tue, 20 Jun 2017 12:18:31 +0000 (21:18 +0900)]
Create a TetherInterfaceStateMachine when told the interface name.
Test: as follows
- built
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Bug:
62343300
Merged-In: I542e013aa19fefd3443588c9a81ee59cd669ab6f
Merged-In: I973bdc5b540cce66a9713cebfd5071ad4a4b0a08
Merged-In: I2104ecf8102c8f9541ee2d3ce6589b0081db4fe3
Change-Id: I2104ecf8102c8f9541ee2d3ce6589b0081db4fe3
(cherry picked from commit
b912c50b197cc0fc49bb7897130581dd02d2af01)
OSDN Git Service
