OSDN Git Service
Kenny Guy [Thu, 3 Aug 2017 17:19:41 +0000 (17:19 +0000)]
Merge "Update colour to match toasts." into oc-mr1-dev am:
1da2877b9a
am:
97541b704f
Change-Id: I92a48a4d4f3b4ef7ff43fe6641644cc44957b15d
Tomasz Wasilczyk [Thu, 3 Aug 2017 17:15:04 +0000 (17:15 +0000)]
Merge "Address Broadcast Radio HAL review notes." into oc-mr1-dev am:
36ea87b075
am:
4da1bf10b7
Change-Id: Ibe87cf6b4037175e66a34ef1efb84209dcae341f
Kenny Guy [Thu, 3 Aug 2017 17:05:58 +0000 (17:05 +0000)]
Merge "Update colour to match toasts." into oc-mr1-dev
am:
1da2877b9a
Change-Id: I71c697d116a44845f517aad8b5f05152b917c65c
Tomasz Wasilczyk [Thu, 3 Aug 2017 17:02:52 +0000 (17:02 +0000)]
Merge "Address Broadcast Radio HAL review notes." into oc-mr1-dev
am:
36ea87b075
Change-Id: I8802ac38c0167f0f2705bfaaf174d30743045a07
TreeHugger Robot [Thu, 3 Aug 2017 16:54:41 +0000 (16:54 +0000)]
Merge "Update colour to match toasts." into oc-mr1-dev
Tomasz Wasilczyk [Thu, 3 Aug 2017 16:52:31 +0000 (16:52 +0000)]
Merge "Address Broadcast Radio HAL review notes." into oc-mr1-dev
Lucas Dupin [Thu, 3 Aug 2017 16:46:16 +0000 (16:46 +0000)]
Merge "Multi-user and WallpaperColors" into oc-mr1-dev am:
22b418448b
am:
430d7450ed
Change-Id: I65ff692f77886bfed6f64ec71f0bab569a6354c0
Lucas Dupin [Thu, 3 Aug 2017 16:35:36 +0000 (16:35 +0000)]
Merge "Multi-user and WallpaperColors" into oc-mr1-dev
am:
22b418448b
Change-Id: I366a0968883a57499392edafcc95c53416268329
Lucas Dupin [Thu, 3 Aug 2017 16:23:41 +0000 (16:23 +0000)]
Merge "Multi-user and WallpaperColors" into oc-mr1-dev
Alexandru-andrei Rotaru [Thu, 3 Aug 2017 15:54:49 +0000 (15:54 +0000)]
Merge "Notify the user and turn off tethering when the service is disallowed." into stage-aosp-master am:
b9295c7de0 -s ours am:
7b3fd55c30 -s ours am:
3668323bd7 -s ours
am:
ca48fcd256 -s ours
Change-Id: I67af2c1b8561937ddffafd434220c7769d8c4cdf
Alexandru-andrei Rotaru [Thu, 3 Aug 2017 15:39:09 +0000 (15:39 +0000)]
Merge "Notify the user and turn off tethering when the service is disallowed." into stage-aosp-master am:
b9295c7de0 -s ours am:
7b3fd55c30 -s ours
am:
3668323bd7 -s ours
Change-Id: I8204085069cd64e881192c054e60dbc11133f07d
Adrian Roos [Thu, 3 Aug 2017 15:28:25 +0000 (15:28 +0000)]
Merge "Merge "AOD: Unregister touchscreen sensors while pulsing" into oc-dr1-dev am:
a957c56da0 am:
49cbe41a2b" into oc-mr1-dev-plus-aosp
am:
37bcab378b
Change-Id: I83f1cc70904e65ba71931fe614ecb14d74a10e4f
Alexandru-andrei Rotaru [Thu, 3 Aug 2017 15:27:15 +0000 (15:27 +0000)]
Merge "Notify the user and turn off tethering when the service is disallowed." into stage-aosp-master am:
b9295c7de0 -s ours
am:
7b3fd55c30 -s ours
Change-Id: Ieab87f4b422168e3bcf8250e405ec91ee67d0e27
Adrian Roos [Thu, 3 Aug 2017 15:26:17 +0000 (15:26 +0000)]
Merge "Merge "Assist: Only call lockscreenShown when it is actually shown" into oc-dr1-dev am:
bc3c1d0170 am:
2674ad2e9a" into oc-mr1-dev-plus-aosp
am:
248673e94f
Change-Id: I550c0b28dfcd9f9a34bb02f666d88dbd5882f200
Adrian Roos [Thu, 3 Aug 2017 15:23:57 +0000 (15:23 +0000)]
Merge "AOD: Unregister touchscreen sensors while pulsing" into oc-dr1-dev am:
a957c56da0 am:
14acc52213
am:
8b62151c50
Change-Id: I670928a685a8b3777aa4e193498e1e46acd6ec45
Adrian Roos [Thu, 3 Aug 2017 15:21:45 +0000 (15:21 +0000)]
Merge "Assist: Only call lockscreenShown when it is actually shown" into oc-dr1-dev am:
bc3c1d0170 am:
1a9c0c37aa
am:
e4f542fabf
Change-Id: Ia932db1b7a924c954e38890fe36da66071f72c10
Alexandru-andrei Rotaru [Thu, 3 Aug 2017 15:19:11 +0000 (15:19 +0000)]
Merge "Notify the user and turn off tethering when the service is disallowed." into stage-aosp-master
am:
b9295c7de0 -s ours
Change-Id: I86c4d74187f71a91c4532d055e5e28858ee208ca
Android Build Merger (Role) [Thu, 3 Aug 2017 15:17:09 +0000 (15:17 +0000)]
Merge "Merge "AOD: Unregister touchscreen sensors while pulsing" into oc-dr1-dev am:
a957c56da0 am:
49cbe41a2b" into oc-mr1-dev-plus-aosp
Adrian Roos [Thu, 3 Aug 2017 15:15:40 +0000 (15:15 +0000)]
Merge "AOD: Unregister touchscreen sensors while pulsing" into oc-dr1-dev am:
a957c56da0
am:
49cbe41a2b
Change-Id: I9932c8175ad0e7dd46cfa15fc0c6a037023259b9
Android Build Merger (Role) [Thu, 3 Aug 2017 15:15:18 +0000 (15:15 +0000)]
Merge "Merge "Assist: Only call lockscreenShown when it is actually shown" into oc-dr1-dev am:
bc3c1d0170 am:
2674ad2e9a" into oc-mr1-dev-plus-aosp
Adrian Roos [Thu, 3 Aug 2017 15:13:27 +0000 (15:13 +0000)]
Merge "Assist: Only call lockscreenShown when it is actually shown" into oc-dr1-dev am:
bc3c1d0170
am:
2674ad2e9a
Change-Id: I7089df088a5c7f684af50ede67dbd11df984fc5d
Adrian Roos [Thu, 3 Aug 2017 15:13:12 +0000 (15:13 +0000)]
Merge "AOD: Unregister touchscreen sensors while pulsing" into oc-dr1-dev am:
a957c56da0
am:
14acc52213
Change-Id: I36772d64f0343a8a2155e992a924c89c904acdbe
Adrian Roos [Thu, 3 Aug 2017 15:10:36 +0000 (15:10 +0000)]
Merge "Assist: Only call lockscreenShown when it is actually shown" into oc-dr1-dev am:
bc3c1d0170
am:
1a9c0c37aa
Change-Id: I0af701dfcab068695c3cfcf746b4e23694c20f60
Alexandru-andrei Rotaru [Thu, 3 Aug 2017 15:07:29 +0000 (15:07 +0000)]
Merge "Notify the user and turn off tethering when the service is disallowed." into stage-aosp-master
Adrian Roos [Thu, 3 Aug 2017 15:05:16 +0000 (15:05 +0000)]
Merge "AOD: Unregister touchscreen sensors while pulsing" into oc-dr1-dev
am:
a957c56da0
Change-Id: Ie526be7c78cff21fe18eb42c7130a9aa68dc961e
Adrian Roos [Thu, 3 Aug 2017 15:05:15 +0000 (15:05 +0000)]
Merge "AOD: Unregister touchscreen sensors while pulsing" into oc-dr1-dev
am:
a957c56da0
Change-Id: I84627e6f4a5cc8ee0f1950977163a97b32c6954c
Adrian Roos [Thu, 3 Aug 2017 15:01:12 +0000 (15:01 +0000)]
Merge "Assist: Only call lockscreenShown when it is actually shown" into oc-dr1-dev
am:
bc3c1d0170
Change-Id: Id87a35597db82345e564fd4d92500b8dacdc0c23
Adrian Roos [Thu, 3 Aug 2017 15:01:04 +0000 (15:01 +0000)]
Merge "Assist: Only call lockscreenShown when it is actually shown" into oc-dr1-dev
am:
bc3c1d0170
Change-Id: I598d82fcd14702151a924dd481fa067613c76b0e
TreeHugger Robot [Thu, 3 Aug 2017 14:57:54 +0000 (14:57 +0000)]
Merge "AOD: Unregister touchscreen sensors while pulsing" into oc-dr1-dev
TreeHugger Robot [Thu, 3 Aug 2017 14:51:28 +0000 (14:51 +0000)]
Merge "Assist: Only call lockscreenShown when it is actually shown" into oc-dr1-dev
Alexandru-Andrei Rotaru [Thu, 3 Aug 2017 14:39:14 +0000 (14:39 +0000)]
Merge "Notify the user and turn off tethering when the service is disallowed." am:
5027dd1026 -s ours am:
54c1b9e936 am:
1f12dd7bba am:
a3c00447b7
am:
c38b519f71 -s ours
Change-Id: I871db5c642e66094faac1f8c18ffc58a7ac57f3e
Alexandru-Andrei Rotaru [Thu, 3 Aug 2017 14:27:20 +0000 (14:27 +0000)]
Merge "Notify the user and turn off tethering when the service is disallowed." am:
5027dd1026 -s ours am:
54c1b9e936 am:
1f12dd7bba
am:
a3c00447b7
Change-Id: Ica909191e8eb48aea72603bd6f795e449603931d
Alexandru-Andrei Rotaru [Thu, 3 Aug 2017 14:16:20 +0000 (14:16 +0000)]
Merge "Notify the user and turn off tethering when the service is disallowed." am:
5027dd1026 -s ours am:
54c1b9e936
am:
1f12dd7bba
Change-Id: I0ed1fbe1e3430ea6132102ce0d6d347b5542e303
Kenny Guy [Wed, 2 Aug 2017 18:41:23 +0000 (19:41 +0100)]
Update colour to match toasts.
Toasts are now black on white so update
icon we use in the toast to be black.
Test: Manual
Bug:
64120926
Change-Id: Iae153b98e187f58e0a0ab5eb315860bc97437a7f
Alexandru-Andrei Rotaru [Thu, 3 Aug 2017 14:04:49 +0000 (14:04 +0000)]
Merge "Notify the user and turn off tethering when the service is disallowed." am:
5027dd1026 -s ours
am:
54c1b9e936
Change-Id: I93d2bda3aacb51e1db8a03c4ebce90aeb4812506
Alexandru-Andrei Rotaru [Thu, 3 Aug 2017 13:53:53 +0000 (13:53 +0000)]
Merge "Notify the user and turn off tethering when the service is disallowed."
am:
5027dd1026 -s ours
Change-Id: I03d1d03f4e4e1b1dfcf68da3aa21913506739619
Alexandru-Andrei Rotaru [Tue, 18 Jul 2017 15:49:22 +0000 (16:49 +0100)]
Notify the user and turn off tethering when the service is disallowed.
Added UserRestrinctionListener for turning the service off one the
DISALLOW_CONFIG_TETHERING is on into Tethering. Added notification
about
tethering being turned off. Also added Unit Tests to test the
functionality
of the UserRestrictionListener added.
Bug:
27936525
Test: Turn the tehering service on (either wifi, usb or bluetooth).
Automatically the system should send a notification about the service
being active.Close settings from recents. From TestDPC User Restrictions
switch on DISALLOW_CONFIG_TETHERING. The tethering should be turned off
and a notification should appear informing that the service is inactive.
Merged-In: Ib7ea8885cedc2a842ebd4487c8b366a6666996bc
Change-Id: Ib7ea8885cedc2a842ebd4487c8b366a6666996bc
(cherry picked from commit
fa6d5c5ca02f1bfc454bd3cd82e6c043661e7aa7)
Pavel Grafov [Thu, 3 Aug 2017 13:21:19 +0000 (13:21 +0000)]
Merge "Move key eviction past system services user cleanup." into oc-mr1-dev am:
03515d0ad2
am:
d12455daec
Change-Id: Ic3db718fc5f25bda2e67e6da3f64ea8a1b691901
Robert Carr [Thu, 3 Aug 2017 13:16:10 +0000 (13:16 +0000)]
Merge "Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev am:
48ed8aa4d0 am:
76136dcf45" into oc-mr1-dev-plus-aosp
am:
de7f07a5c6
Change-Id: I358fdf24c452d49457802fc906ed7908d7c0f1e0
Robert Carr [Thu, 3 Aug 2017 13:13:48 +0000 (13:13 +0000)]
Merge "Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev am:
48ed8aa4d0 am:
e64d0028ae" into oc-mr1-dev-plus-aosp
am:
eee9fe304c
Change-Id: Ibacf967f6dbf5a03752186e0a4c8750cabf15cae
Adrian Roos [Thu, 3 Aug 2017 13:11:55 +0000 (13:11 +0000)]
Merge "Merge "AOD: Do not change wakeup animation during DozeService teardown" into oc-dr1-dev am:
e8107cf358 am:
b993a3a01d" into oc-mr1-dev-plus-aosp
am:
41ef097af3
Change-Id: I2b7946250c6e61ad8dc0f8a4dafa3a3361be2c9a
Pavel Grafov [Thu, 3 Aug 2017 13:10:49 +0000 (13:10 +0000)]
Merge "Move key eviction past system services user cleanup." into oc-mr1-dev
am:
03515d0ad2
Change-Id: I206f33be06a993bcaef2fc68aa2c83bef80e6488
Adrian Roos [Thu, 3 Aug 2017 13:10:05 +0000 (13:10 +0000)]
Merge "AOD: Do not change wakeup animation during DozeService teardown" into oc-dr1-dev am:
e8107cf358 am:
5398051267
am:
b8fb0f9d05
Change-Id: Ib06fa5782299fcada3a27c3b6d3d4d7ac3ef3d31
Android Build Merger (Role) [Thu, 3 Aug 2017 13:04:17 +0000 (13:04 +0000)]
Merge "Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev am:
48ed8aa4d0 am:
76136dcf45" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 3 Aug 2017 13:03:34 +0000 (13:03 +0000)]
Merge "Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev am:
48ed8aa4d0 am:
e64d0028ae" into oc-mr1-dev-plus-aosp
Robert Carr [Thu, 3 Aug 2017 13:01:46 +0000 (13:01 +0000)]
Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev am:
48ed8aa4d0
am:
76136dcf45
Change-Id: I396e7552fd7c0a5c10e26c895c68bb54ca551f6b
Android Build Merger (Role) [Thu, 3 Aug 2017 13:01:19 +0000 (13:01 +0000)]
Merge "Merge "AOD: Do not change wakeup animation during DozeService teardown" into oc-dr1-dev am:
e8107cf358 am:
b993a3a01d" into oc-mr1-dev-plus-aosp
Robert Carr [Thu, 3 Aug 2017 13:01:15 +0000 (13:01 +0000)]
Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev am:
48ed8aa4d0
am:
e64d0028ae
Change-Id: Ib87b081ec02bfa030d0561cf12beac9d4b8ca692
TreeHugger Robot [Thu, 3 Aug 2017 12:59:57 +0000 (12:59 +0000)]
Merge "Move key eviction past system services user cleanup." into oc-mr1-dev
Adrian Roos [Thu, 3 Aug 2017 12:59:00 +0000 (12:59 +0000)]
Merge "AOD: Do not change wakeup animation during DozeService teardown" into oc-dr1-dev am:
e8107cf358
am:
5398051267
Change-Id: Iaae94ae22c4d11648f410ccd7f307ddca84967ce
Adrian Roos [Thu, 3 Aug 2017 12:58:59 +0000 (12:58 +0000)]
Merge "AOD: Do not change wakeup animation during DozeService teardown" into oc-dr1-dev am:
e8107cf358
am:
b993a3a01d
Change-Id: I41f6ab0a055ad149356287429fa0847e81db473a
Robert Carr [Thu, 3 Aug 2017 12:53:40 +0000 (12:53 +0000)]
Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev
am:
48ed8aa4d0
Change-Id: Ibee1aea584f3e4141806aad6c8e7a592ccc31503
Robert Carr [Thu, 3 Aug 2017 12:53:38 +0000 (12:53 +0000)]
Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev
am:
48ed8aa4d0
Change-Id: I3030c64c30f6c16dc9c8a01e21a5dc6b58cbd273
Adrian Roos [Thu, 3 Aug 2017 12:48:38 +0000 (12:48 +0000)]
Merge "AOD: Do not change wakeup animation during DozeService teardown" into oc-dr1-dev
am:
e8107cf358
Change-Id: I2042c1d15844e34929286e91283ddb9942faea8f
Adrian Roos [Thu, 3 Aug 2017 12:48:33 +0000 (12:48 +0000)]
Merge "AOD: Do not change wakeup animation during DozeService teardown" into oc-dr1-dev
am:
e8107cf358
Change-Id: I5bafabdfe40175ee15cd3258f1e0ed536a99f164
TreeHugger Robot [Thu, 3 Aug 2017 12:45:07 +0000 (12:45 +0000)]
Merge "Inform SurfaceFlinger of which Surface is the RoundedCorners overlay." into oc-dr1-dev
Kenny Guy [Thu, 3 Aug 2017 12:42:56 +0000 (12:42 +0000)]
Update work briefcase asset. am:
f74c2a6ff6
am:
b453a5a782
Change-Id: Icf31ccc6a23c92433c96e5c24fb54d025f8d3b59
TreeHugger Robot [Thu, 3 Aug 2017 12:34:59 +0000 (12:34 +0000)]
Merge "AOD: Do not change wakeup animation during DozeService teardown" into oc-dr1-dev
Kenny Guy [Thu, 3 Aug 2017 12:30:53 +0000 (12:30 +0000)]
Update work briefcase asset.
am:
f74c2a6ff6
Change-Id: I127ca45f3a25de00bd8eac86dc2227ab3ad64dc3
Przemyslaw Szczepaniak [Thu, 3 Aug 2017 11:16:10 +0000 (11:16 +0000)]
Merge "Revert "Revert "Default 'persist.sys.timezone' property to GMT if not set on init.""" am:
82d2bd4e40 am:
f9caecd124 am:
be71148d49 am:
eefdc2c6f8
am:
f96c4d6d76
Change-Id: I51dc87579534fc8d349240c1b1d2373f21d375ba
Przemyslaw Szczepaniak [Thu, 3 Aug 2017 11:04:32 +0000 (11:04 +0000)]
Merge "Revert "Revert "Default 'persist.sys.timezone' property to GMT if not set on init.""" am:
82d2bd4e40 am:
f9caecd124 am:
be71148d49
am:
eefdc2c6f8
Change-Id: I8aa40435f0ad3477fef8f3c4650cdd30642acc91
Alan Stokes [Thu, 3 Aug 2017 11:00:35 +0000 (11:00 +0000)]
Merge "Fix trivial typo in javadoc for ActivityManager#getRunningTasks() Test: Comment change only"
Przemyslaw Szczepaniak [Thu, 3 Aug 2017 10:52:34 +0000 (10:52 +0000)]
Merge "Revert "Revert "Default 'persist.sys.timezone' property to GMT if not set on init.""" am:
82d2bd4e40 am:
f9caecd124
am:
be71148d49
Change-Id: Ibd4c390c610b20f2809b06045fa38e6231175599
Przemyslaw Szczepaniak [Thu, 3 Aug 2017 10:40:54 +0000 (10:40 +0000)]
Merge "Revert "Revert "Default 'persist.sys.timezone' property to GMT if not set on init.""" am:
82d2bd4e40
am:
f9caecd124
Change-Id: I69e18dc2838c9472b6962a181d3faa0873b27e38
Przemyslaw Szczepaniak [Thu, 3 Aug 2017 10:30:05 +0000 (10:30 +0000)]
Merge "Revert "Revert "Default 'persist.sys.timezone' property to GMT if not set on init."""
am:
82d2bd4e40
Change-Id: I8d1fe014fdc3cfd190c5ce95ec963fa8c038552c
Treehugger Robot [Thu, 3 Aug 2017 10:29:55 +0000 (10:29 +0000)]
Merge "Notify the user and turn off tethering when the service is disallowed."
Przemyslaw Szczepaniak [Thu, 3 Aug 2017 10:15:24 +0000 (10:15 +0000)]
Merge "Revert "Revert "Default 'persist.sys.timezone' property to GMT if not set on init."""
TreeHugger Robot [Thu, 3 Aug 2017 09:55:11 +0000 (09:55 +0000)]
Merge "Introduce new public API for specifying exact weight."
Kenny Guy [Tue, 20 Jun 2017 15:42:07 +0000 (16:42 +0100)]
Update work briefcase asset.
Bug:
36497538
Test: Manual - visually checked icons.
Change-Id: I1d5dd1b80bd32667e47dfc4a1c355a5106271d72
(cherry picked from commit
d49d28a8aee5ee00f5e8368bb1448b991608cf4a)
Hugo Benichi [Thu, 3 Aug 2017 07:38:46 +0000 (07:38 +0000)]
NsdManager: remove duplicated argument validation am:
cf96a1b36d
am:
2096edd6f2
Change-Id: I0aaf2006833f6eee00a7b25e4ccaa388d29d3a62
Hugo Benichi [Thu, 3 Aug 2017 07:28:16 +0000 (07:28 +0000)]
NsdManager: remove duplicated argument validation
am:
cf96a1b36d
Change-Id: I3cad605d34cd9612b6073e689dc4af04b1717413
Sudheer Shanka [Thu, 3 Aug 2017 05:53:03 +0000 (05:53 +0000)]
Merge "Refactor BatteryStatsImpl.updateCpuTimeLocked."
Hugo Benichi [Tue, 2 May 2017 04:36:28 +0000 (13:36 +0900)]
NsdManager: remove duplicated argument validation
This patch simplifies argument validation in NsdManager public api and
regroup duplicated validation into common methods.
This makes stack traces more actionable as now specific errors will
cause the api to throw exception from specific methods, whereas before
IllegalArgumentException would be thrown from inside the same api method
for different reasons.
This patch also includes a couple of other small cleanups.
Test: $ runtest -x frameworks/base/tests/net/../NsdManagerTest.java
Bug:
37013369
(cherry picked from commit
ff3e6ccca1715ae72c6499cc7c894d27f46e8403)
Change-Id: Icf047532aa551fbe0a70721cfb95507eaa84d51e
Peter Qiu [Thu, 3 Aug 2017 04:47:05 +0000 (04:47 +0000)]
Merge "SettingsLib: wifi: add support for tracking carrier Wi-Fi APs" into oc-mr1-dev am:
fca9a47ba8
am:
1387d056f9
Change-Id: Iad364bc777c571bac8aa1c31dcdc9e50ed815069
Peter Qiu [Thu, 3 Aug 2017 04:36:31 +0000 (04:36 +0000)]
Merge "SettingsLib: wifi: add support for tracking carrier Wi-Fi APs" into oc-mr1-dev
am:
fca9a47ba8
Change-Id: I2e892a455ded1cb364eb449d35601c0ca3b7f02f
TreeHugger Robot [Thu, 3 Aug 2017 04:28:24 +0000 (04:28 +0000)]
Merge "SettingsLib: wifi: add support for tracking carrier Wi-Fi APs" into oc-mr1-dev
Kurt Nelson [Thu, 3 Aug 2017 04:25:59 +0000 (04:25 +0000)]
Merge "Version guard Application.onCreate strict mode fix" into oc-mr1-dev am:
e002f44005
am:
ef5a4ca4e0
Change-Id: Icd4e4434901eecf0825421291791fc89b14ffea7
Kurt Nelson [Thu, 3 Aug 2017 04:16:02 +0000 (04:16 +0000)]
Merge "Version guard Application.onCreate strict mode fix" into oc-mr1-dev
am:
e002f44005
Change-Id: If8cb15b7bf2d5994f7895c9743d8cd0e81f78f6f
TreeHugger Robot [Thu, 3 Aug 2017 04:04:13 +0000 (04:04 +0000)]
Merge "Version guard Application.onCreate strict mode fix" into oc-mr1-dev
John Reck [Thu, 3 Aug 2017 03:30:39 +0000 (03:30 +0000)]
Merge "Add check that layer size <= maxTextureSize" into oc-mr1-dev am:
4c25f3dd43
am:
0f03652ba8
Change-Id: I589106c8d80a66b152c2978e1d3db84badef9ed5
John Reck [Thu, 3 Aug 2017 03:18:23 +0000 (03:18 +0000)]
Merge "Add check that layer size <= maxTextureSize" into oc-mr1-dev
am:
4c25f3dd43
Change-Id: I2e239c4c1e5d28952b95f1299daf8ac793cc7e0c
TreeHugger Robot [Thu, 3 Aug 2017 03:11:18 +0000 (03:11 +0000)]
Merge "Add check that layer size <= maxTextureSize" into oc-mr1-dev
TreeHugger Robot [Thu, 3 Aug 2017 02:34:39 +0000 (02:34 +0000)]
Merge "TTS: Ensure to callback onStop() from SynthesisPlaybackQueueItem."
John Reck [Thu, 3 Aug 2017 02:28:44 +0000 (02:28 +0000)]
Merge "Address API review comments" into oc-mr1-dev am:
dd5afab0d4
am:
639afe25f3
Change-Id: Ieb559e57ffa2cd99de05757b4e9b7a3f9ce26ceb
TreeHugger Robot [Thu, 3 Aug 2017 02:22:09 +0000 (02:22 +0000)]
Merge "Revert "Make ellipsize retry if text doesn't fit""
John Reck [Thu, 3 Aug 2017 02:18:54 +0000 (02:18 +0000)]
Merge "Address API review comments" into oc-mr1-dev
am:
dd5afab0d4
Change-Id: Ia6f1c19275c2a06d35a344bb2e14c376c9794088
TreeHugger Robot [Thu, 3 Aug 2017 02:10:16 +0000 (02:10 +0000)]
Merge "Address API review comments" into oc-mr1-dev
Sungsoo Lim [Thu, 3 Aug 2017 01:45:39 +0000 (01:45 +0000)]
Merge "Merge "Check CookieHandler in setDataSource with cookies" into oc-dr1-dev am:
6a2ee3b180 am:
c0fe5b2d88" into oc-mr1-dev-plus-aosp
am:
4cbf94c998
Change-Id: Ia265cafc91d92594bb4cc592c043f0d57c4de4d6
Sungsoo Lim [Thu, 3 Aug 2017 01:43:32 +0000 (01:43 +0000)]
Merge "Check CookieHandler in setDataSource with cookies" into oc-dr1-dev am:
6a2ee3b180 am:
0553f96c0a
am:
167b6837dd
Change-Id: I45dec1e4f76ab3550e00492294ee0523f48ad963
Bill Yi [Thu, 3 Aug 2017 01:40:06 +0000 (01:40 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
e1f66b297d -s ours am:
7eed96cc1c -s ours
am:
3d57a96042 -s ours
Change-Id: I7bef4cc203c6d162f9333a5f4c2948cecc167e69
Bill Yi [Thu, 3 Aug 2017 01:38:25 +0000 (01:38 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
e1f66b297d -s ours am:
37f90d5767 -s ours
am:
36bc960316 -s ours
Change-Id: I369b5eb23140b112f2cd5fcc0295bf84d0c29bfa
Dianne Hackborn [Thu, 3 Aug 2017 01:36:55 +0000 (01:36 +0000)]
Merge "Add documentation for MIN notification interaction with fg services." into oc-mr1-dev am:
530cfc1db3
am:
b49a3f1c3a
Change-Id: Idea07952532a5567aff62d70ad3572f6edec6e5b
Jeff Sharkey [Thu, 3 Aug 2017 01:35:10 +0000 (01:35 +0000)]
Merge "Don't show scary UI when rescue party kicks in." into oc-mr1-dev am:
7606d4798b
am:
9fb2386b27
Change-Id: Ibb66f14f6f172fac57ea9070f2c8080f60daf0fe
Lucas Dupin [Fri, 14 Jul 2017 18:55:05 +0000 (11:55 -0700)]
Multi-user and WallpaperColors
Test: set different wallpapers for different users and switch between them.
Test: re-ran cts tests at cts/tests/app/src/android/app/cts/WallpaperManagerTest.java
Change-Id: Ic06d1dc6db26869a2948590863ca9b8ac81c630e
Fixes:
63513694
John Reck [Thu, 3 Aug 2017 01:33:30 +0000 (01:33 +0000)]
Merge "Fix compile issue" am:
27b56eb03f am:
60c65f1a67 am:
11d331a2af am:
e25db57060
am:
66ce952a4e
Change-Id: I6882e50bfade31b43c71569a6fdff28d1ae86857
Santos Cordon [Thu, 3 Aug 2017 01:31:44 +0000 (01:31 +0000)]
Merge "Merge "Move VR preference for portrait orientation." into oc-dr1-dev am:
7c4069d255 am:
ebc05a6a42" into oc-mr1-dev-plus-aosp
am:
5c179e8edb
Change-Id: I0098636d5346993396d3c05c61525076e0fa5279
Steven Moreland [Thu, 3 Aug 2017 01:29:35 +0000 (01:29 +0000)]
Merge "com.android.server: use proper nativehelper headers" am:
41a7f5a64f -s ours am:
79e124c9c7 -s ours am:
0666e1cd5c -s ours am:
4033c5e1b7 -s ours
am:
c704b0379f -s ours
Change-Id: I9e8ab06e4b6e9f08bb01909efbb0aff03c44bb67
Ningyuan Wang [Thu, 3 Aug 2017 01:27:18 +0000 (01:27 +0000)]
Merge "Merge "Merge changes from topic 'do_not_roam_on_traffic' into oc-dr1-dev am:
54e6518fc8" into oc-mr1-dev am:
b1e8d97867" into oc-mr1-dev-plus-aosp
am:
60d63fa4fb
Change-Id: I68a0642f288973a25d1756508e23313f2e318c06
Christine Franks [Thu, 3 Aug 2017 01:25:05 +0000 (01:25 +0000)]
Merge "Merge "Merge "Prevent crash dialogs from appearing in demo mode" into oc-dr1-dev am:
8d753bc3a3" into oc-mr1-dev am:
93111a9762" into oc-mr1-dev-plus-aosp
am:
f0747920e0
Change-Id: If2095bfcc7408c9ccbe5384f001339a84766d932
Adrian Roos [Thu, 3 Aug 2017 01:23:12 +0000 (01:23 +0000)]
Merge "Merge "Merge "WakeAndUnlock: Make sure to wait for screen turning on" into oc-dr1-dev am:
46f2cdeb63" into oc-mr1-dev am:
ad825bdfd7" into oc-mr1-dev-plus-aosp
am:
64cd09456d
Change-Id: I3b87a4a25e69d01526cd5f051cdf9d3553c1ad1c