OSDN Git Service
Android Build Merger (Role) [Thu, 22 Jun 2017 20:16:55 +0000 (20:16 +0000)]
Merge "Merge "Ensure that android.test tests pass" am:
156775fea8 am:
34dc5a58b3 am:
e211119fea" into oc-dr1-dev-plus-aosp
Paul Duffin [Thu, 22 Jun 2017 20:15:27 +0000 (20:15 +0000)]
Merge "Ensure that android.test tests pass" am:
156775fea8 am:
34dc5a58b3
am:
e211119fea
Change-Id: I4692f9a86dae8bb2c5476eb477924230034cdd6b
Android Build Merger (Role) [Thu, 22 Jun 2017 20:14:25 +0000 (20:14 +0000)]
Merge "Merge "Create a TetherInterfaceStateMachine when told the interface name." into oc-dev am:
be7657b038 -s ours am:
78def25969 -s ours" into oc-dr1-dev-plus-aosp
Erik Kline [Thu, 22 Jun 2017 20:12:59 +0000 (20:12 +0000)]
Merge "Create a TetherInterfaceStateMachine when told the interface name." into oc-dev am:
be7657b038 -s ours
am:
78def25969 -s ours
Change-Id: I73ca21bc6efe5b8d015e10cf562a0e48c5144b21
Android Build Merger (Role) [Thu, 22 Jun 2017 20:12:37 +0000 (20:12 +0000)]
Merge "Merge "Better merge fix for empty state signal drawable" into oc-dr1-dev am:
8ac5a94c01" into oc-dr1-dev-plus-aosp
Evan Laird [Thu, 22 Jun 2017 20:11:23 +0000 (20:11 +0000)]
Merge "Better merge fix for empty state signal drawable" into oc-dr1-dev
am:
8ac5a94c01
Change-Id: I4ada7c21457a3222274998269d565a9bf03fdc46
Narayan Kamath [Thu, 22 Jun 2017 20:09:25 +0000 (20:09 +0000)]
Merge "_exit(0) on clean shutdown, not _exit(1)" into oc-dev am:
31cf02742e
am:
8bc86321ff
Change-Id: Id6edece20054d7725ca206bfa1d6c6b270bcef97
Erik Kline [Thu, 22 Jun 2017 20:02:45 +0000 (20:02 +0000)]
Only disable Wi-Fi IP serving on specific interface, if available am:
c8b180116d -s ours
am:
8fac8d8904 -s ours
Change-Id: Ia09a0a082c7f6e69c33e0426b7e8566fe7c9f3f8
TreeHugger Robot [Thu, 22 Jun 2017 20:00:23 +0000 (20:00 +0000)]
Merge "Better merge fix for empty state signal drawable" into oc-dr1-dev
Wale Ogunwale [Thu, 22 Jun 2017 19:52:20 +0000 (19:52 +0000)]
Merge "Added more systrace points to window manager" into oc-dev am:
182d5ec2d2
am:
a9c161bc28
Change-Id: I5e0a99a9b56bd0cb649fbd345e8fa0f6d6fe146e
Android Build Merger (Role) [Thu, 22 Jun 2017 19:48:06 +0000 (19:48 +0000)]
Merge "Merge "ConnectivityManager: fix style issue" am:
e74f3adba5 am:
ec54a40339 am:
ec7447b291" into oc-dr1-dev-plus-aosp
Hugo Benichi [Thu, 22 Jun 2017 19:46:28 +0000 (19:46 +0000)]
Merge "ConnectivityManager: fix style issue" am:
e74f3adba5 am:
ec54a40339
am:
ec7447b291
Change-Id: Iecf5399d77ae742cc66ac7a3cab4570464c4e95f
Wale Ogunwale [Thu, 22 Jun 2017 19:45:21 +0000 (19:45 +0000)]
Merge "Added more systrace points to window manager" into oc-dev
am:
182d5ec2d2
Change-Id: I6a1ac4ceee2ba943965382fc5cb7c782249b19a2
Jason Monk [Thu, 22 Jun 2017 19:45:06 +0000 (19:45 +0000)]
Merge "Add API to allow apps more control over instantiation" into oc-dr1-dev
am:
cc9ff706a4
Change-Id: I9852ed8eeeb32aff7150b367c1ba2a6861eddb43
Joel Scherpelz [Thu, 22 Jun 2017 19:38:18 +0000 (19:38 +0000)]
Merge "Use RFC 7217 stable privacy addresses" am:
a88b12ce5e am:
4c4d5477d4
am:
8a4667b911
Change-Id: I60e9d4e630ffb6f6ff6870102d4620c5c4c81c47
Erik Kline [Thu, 22 Jun 2017 19:35:47 +0000 (19:35 +0000)]
Merge "Refactor TISM add/remove code" into oc-dev am:
c0af382a25 -s ours
am:
0ba9285c7d -s ours
Change-Id: Id02582c55ed51dfbe007967a74bcacc1d3b76c42
TreeHugger Robot [Thu, 22 Jun 2017 19:30:40 +0000 (19:30 +0000)]
Merge "Added more systrace points to window manager" into oc-dev
Felipe Leme [Thu, 22 Jun 2017 19:30:32 +0000 (19:30 +0000)]
Merge "Autofill fixes for secondary users:" into oc-dev am:
6358cdcd28
am:
95e074dab3
Change-Id: I03fbf818566f8c7601176dfd776edd24c126e27d
TreeHugger Robot [Thu, 22 Jun 2017 19:29:58 +0000 (19:29 +0000)]
Merge "Add API to allow apps more control over instantiation" into oc-dr1-dev
Amith Yamasani [Thu, 22 Jun 2017 19:27:46 +0000 (19:27 +0000)]
Merge "Clarify startScan API on how to get results" into oc-dev am:
78f3a0f722
am:
5d45ac6e68
Change-Id: I9058c3a0140102c324e0c7c8e5ec88f40a3e126a
Chen Xu [Thu, 22 Jun 2017 19:23:19 +0000 (19:23 +0000)]
Merge "resolve merge conflicts of
187fe9d5cf3c to oc-dr1-dev-plus-aosp" into oc-dr1-dev-plus-aosp
fionaxu [Thu, 22 Jun 2017 19:11:02 +0000 (12:11 -0700)]
resolve merge conflicts of
187fe9d5cf3c to oc-dr1-dev-plus-aosp
Change-Id: I2cbfdd9b0fcf024509dbda84678ef067add014f9
Jason Monk [Thu, 22 Jun 2017 19:01:00 +0000 (19:01 +0000)]
Merge "Bring back transparency for QS" into oc-dr1-dev
am:
d037c6ac36
Change-Id: I8313648e66b97401ce81f9188823ddb9488dcb9f
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
TreeHugger Robot [Thu, 22 Jun 2017 18:52:45 +0000 (18:52 +0000)]
Merge "Bring back transparency for QS" into oc-dr1-dev
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
Evan Laird [Thu, 22 Jun 2017 18:01:31 +0000 (14:01 -0400)]
Better merge fix for empty state signal drawable
The cutout for drawing STATE_EMPTY picked up a fudge factor in the merge
due to the rounded edges changing the size of the triangle. This change
parameterizes the drawing of the cutout based on the placement of the
rounded edges.
Test: visual
Bug:
62905681
Change-Id: Iba2bc0aa240f6bdfb285c2c6535b656bcacbd579
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 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
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
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
Wale Ogunwale [Thu, 22 Jun 2017 16:08:14 +0000 (09:08 -0700)]
Added more systrace points to window manager
To help debug performance issues
Test: external/chromium-trace/systrace.py -t 3
Bug:
62796190
Change-Id: Ie6012a895174053c4732fb58b9365546fdb979de
TreeHugger Robot [Thu, 22 Jun 2017 17:25:10 +0000 (17:25 +0000)]
Merge "Ensure icon contrast on the shelf" into oc-dev
Jason Monk [Tue, 6 Jun 2017 22:01:31 +0000 (18:01 -0400)]
Add API to allow apps more control over instantiation
Let them control construction of standard manifest elements (like
activities) through Application. This will allow for things like
dependency injection and class loader magic.
Test: manual
Bug:
62534409
Change-Id: I5fc2a7ec52bb0e232966704d16f94a192d033267
Merged-In: Iaa2215b225c3b97f4e9ac809dfe499f98c7ad5f1
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:54:36 +0000 (16:54 +0000)]
Merge "Darker extracted gradients." into oc-dr1-dev
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
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
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
Jason Monk [Thu, 22 Jun 2017 15:05:58 +0000 (11:05 -0400)]
Bring back transparency for QS
It was accidentally removed
Test: visual
Change-Id: I569f582d2f81fb3ac8175249857bee507972b9fe
Fixes:
62580741
Paul Duffin [Thu, 22 Jun 2017 14:39:08 +0000 (14:39 +0000)]
Merge "Ensure that android.test tests pass" am:
156775fea8
am:
34dc5a58b3
Change-Id: I546ea542d0781f825e131eb94bc54e22adadfc4e
Paul Duffin [Thu, 22 Jun 2017 14:29:01 +0000 (14:29 +0000)]
Merge "Ensure that android.test tests pass"
am:
156775fea8
Change-Id: I7fe4f45bd98acea016e02b44a4df38f0e907c0e4
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
Treehugger Robot [Thu, 22 Jun 2017 14:17:16 +0000 (14:17 +0000)]
Merge "Ensure that android.test tests pass"
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
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
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
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
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
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
Paul Duffin [Thu, 22 Jun 2017 11:52:18 +0000 (12:52 +0100)]
Ensure that android.test tests pass
It looks as though the tests in test-runner/tests have not actually been
run successfully for over 7 years. As a result they have degraded. This
change fixes the tests so that they will pass and provides instructions
on how to run them.
TestCaseUtilTest.testGetTestCaseNamesForTestSuiteWithSuiteMethod
This fails because it expected 2 names to be returned but only
returns 0. The reason for that is although TwoTestsInTestSuite has a
Test suite() method that does create a TestSuite with two tests the
TestCaseUtil method does not actually call suite(). Instead, because
TwoTestsInTestSuite is a TestSuite it just calls the tests() method
on it which returns an empty Enumeration because TwoTestsInTestSuite
is empty.
The support for "static Test suite() {}" is broken but fixing this
will affect the behavior of InstrumentationTestRunner which is used
in thousands of different places both in and outside Google and so
could cause untold problems.
TestSuiteBuilderTest.testIncludeAllPackagesUnderHere
Reformat the list, one per line and then add missing name
"testPublicConstructor".
ErrorTest/FailingTest
These tests are not meant to be run on their own, only as part of a
separate test. The RunAsPartOfSeparateTest annotation was added to
allow these to be excluded using notAnnotation as shown in the
instructions for running the tests.
Bug:
30188076
Test: followed new instructions in test-runner/tests/Android.mk
Change-Id: I60e7bee9cd08a9ab7777a2578fc58da772de5c1f
Erik Kline [Thu, 22 Jun 2017 11:34:29 +0000 (11:34 +0000)]
Merge "Create a TetherInterfaceStateMachine when told the interface name." into oc-dev
am:
be7657b038 -s ours
Change-Id: I1e1df0a71687c7156adcb2dd38016e07bb908713
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:37:47 +0000 (10:37 +0000)]
Merge "_exit(0) on clean shutdown, not _exit(1)" into oc-dev
am:
31cf02742e
Change-Id: I8314fcf2fc2fab8f8b4db84cec89efbc6c08660e
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:46:13 +0000 (09:46 +0000)]
Only disable Wi-Fi IP serving on specific interface, if available
am:
c8b180116d -s ours
Change-Id: If6064345828691ffcad1f1498a0d7940eff5486d
OSDN Git Service
