OSDN Git Service
Felipe Leme [Wed, 2 Aug 2017 00:35:44 +0000 (00:35 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am:
6829a1dace
am:
27eb322ed2
Change-Id: Ib78f7d5d690eff9a7b6c424600e1f0a300417b16
Felipe Leme [Wed, 2 Aug 2017 00:26:37 +0000 (00:26 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev
am:
6829a1dace
Change-Id: I41dec3cb31e6b523927717950f827f45dadabd8b
TreeHugger Robot [Wed, 2 Aug 2017 00:08:15 +0000 (00:08 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev
Sundeep Ghuman [Tue, 1 Aug 2017 22:47:04 +0000 (22:47 +0000)]
Merge "Fix broken robotests." into oc-dr1-dev
am:
a048e3c03f
Change-Id: I35b3b811fed79b3aafef063df907dddcdc736ecd
TreeHugger Robot [Tue, 1 Aug 2017 22:38:28 +0000 (22:38 +0000)]
Merge "Fix broken robotests." into oc-dr1-dev
Selim Cinek [Tue, 1 Aug 2017 21:58:35 +0000 (21:58 +0000)]
Merge "Fixed an issue where the statusbar was expanded" into oc-dr1-dev
am:
bbd9264c46
Change-Id: I7794e3dc60fb6379b1c3c3c7400be61e45c9a301
TreeHugger Robot [Tue, 1 Aug 2017 21:37:00 +0000 (21:37 +0000)]
Merge "Fixed an issue where the statusbar was expanded" into oc-dr1-dev
Android Build Merger (Role) [Tue, 1 Aug 2017 21:35:01 +0000 (21:35 +0000)]
Merge "Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am:
d71cc3b72e am:
9e1b7759dc" into oc-dr1-dev-plus-aosp
Andrew Solovay [Tue, 1 Aug 2017 21:32:05 +0000 (21:32 +0000)]
Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am:
d71cc3b72e
am:
9e1b7759dc
Change-Id: Ief80079e0cda4aca334f513409c43feae3d34b28
Andrew Solovay [Tue, 1 Aug 2017 21:31:58 +0000 (21:31 +0000)]
Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev am:
d71cc3b72e
am:
d4b1a0985b
Change-Id: I18839e2c5c1f64639a7920d64f3271cd2d6dc1a4
Andrew Solovay [Tue, 1 Aug 2017 21:21:58 +0000 (21:21 +0000)]
Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev
am:
d71cc3b72e
Change-Id: I8130d71136078d17196e198db6ff36f7f8489a5c
Andrew Solovay [Tue, 1 Aug 2017 21:21:01 +0000 (21:21 +0000)]
Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev
am:
d71cc3b72e
Change-Id: Ifc47ddab2329814e39022b51510f4264937a3c04
Andrew Solovay [Tue, 1 Aug 2017 21:07:18 +0000 (21:07 +0000)]
Merge "docs: Noted that JobIntentService is usually a better choice" into oc-dev
Ruchi Kandoi [Tue, 1 Aug 2017 20:59:14 +0000 (20:59 +0000)]
Merge "Set default value for T3T_PMM." am:
7770adf755 am:
1decea7847
am:
e6a08439b6
Change-Id: I80df7df67afa1e9a7dd4071d3005ef2e1ed0c004
Ruchi Kandoi [Tue, 1 Aug 2017 20:51:30 +0000 (20:51 +0000)]
Merge "Set default value for T3T_PMM." am:
7770adf755
am:
1decea7847
Change-Id: Ic1548d625c7a3e025af95cd329dd9d4e5f69caef
Ruchi Kandoi [Tue, 1 Aug 2017 20:40:33 +0000 (20:40 +0000)]
Merge "Set default value for T3T_PMM."
am:
7770adf755
Change-Id: I31da06276b222d597b3834b4b912f4e0930ee6bc
Ruchi Kandoi [Tue, 1 Aug 2017 20:30:50 +0000 (20:30 +0000)]
Merge "Set default value for T3T_PMM."
Love Khanna [Tue, 1 Aug 2017 20:07:57 +0000 (20:07 +0000)]
Merge "Set default value for T3T_PMM." into oc-dr1-dev
am:
756d93964d
Change-Id: If491a922902bc18d282e4c3c3b4a689d78eac897
Adam Cohen [Tue, 1 Aug 2017 19:57:28 +0000 (19:57 +0000)]
Merge "Revert "Fixing occasional jump when launching certain apps from Recents."" into oc-dr1-dev
am:
0151c395b5
Change-Id: I027d106b11eb23bc056451c65cb89266cfea12e1
Jason Monk [Tue, 1 Aug 2017 19:53:00 +0000 (19:53 +0000)]
Merge "Make it easier to click on phone nav buttons" into oc-dr1-dev
am:
7d08ca6e4d
Change-Id: Id345173efdfb2ceed7449680ad9d9c252fbf8be2
TreeHugger Robot [Tue, 1 Aug 2017 19:48:12 +0000 (19:48 +0000)]
Merge "Set default value for T3T_PMM." into oc-dr1-dev
Adam Cohen [Tue, 1 Aug 2017 19:41:42 +0000 (19:41 +0000)]
Merge "Revert "Fixing occasional jump when launching certain apps from Recents."" into oc-dr1-dev
Jason Monk [Tue, 1 Aug 2017 19:41:10 +0000 (19:41 +0000)]
Merge "Make it easier to click on phone nav buttons" into oc-dr1-dev
Badhri Jagan Sridharan [Tue, 1 Aug 2017 19:03:57 +0000 (19:03 +0000)]
Merge "Reword analog audio not supported notification" into oc-dr1-dev
am:
69840ca338
Change-Id: Id3dc3a226f4830cd7ec748db826283d4889d82e0
Adam Lesinski [Tue, 1 Aug 2017 18:58:54 +0000 (18:58 +0000)]
Merge "Refresh constants when MCC/MNC changes in PowerUI" into oc-dr1-dev
am:
50d25dc00c
Change-Id: Idfbbe397c5019d4f01502a5ee2ce7a04cd7efdba
TreeHugger Robot [Tue, 1 Aug 2017 18:51:53 +0000 (18:51 +0000)]
Merge "Reword analog audio not supported notification" into oc-dr1-dev
Adam Lesinski [Tue, 1 Aug 2017 18:47:42 +0000 (18:47 +0000)]
Merge "Refresh constants when MCC/MNC changes in PowerUI" into oc-dr1-dev
Jason Monk [Tue, 1 Aug 2017 18:47:22 +0000 (18:47 +0000)]
Merge "Cleanup QS dialogs" into oc-dr1-dev
am:
cb5e0e63b4
Change-Id: Iae6cbee1ff7901bc36f38343e822b99063e8fe57
Jason Monk [Tue, 1 Aug 2017 18:31:15 +0000 (18:31 +0000)]
Merge "Cleanup QS dialogs" into oc-dr1-dev
Alison Cichowlas [Tue, 1 Aug 2017 18:18:49 +0000 (18:18 +0000)]
Merge "Move ShutdownThread calls to system ui thread." into oc-dr1-dev
am:
39a556f1d8
Change-Id: Idd341f7969c40184327428fc27b9f597dab57905
Alison Cichowlas [Tue, 1 Aug 2017 18:06:39 +0000 (18:06 +0000)]
Merge "Move ShutdownThread calls to system ui thread." into oc-dr1-dev
Selim Cinek [Tue, 1 Aug 2017 17:44:29 +0000 (10:44 -0700)]
Fixed an issue where the statusbar was expanded
Since we weren't always updating our state whether
our scrims are visible, we could get stuck in an
uninteractable state.
Test: manual, doubletap on AOD notification
Change-Id: I48eca4f29775578382098cf8be876be09ba037a9
Fixes:
64216359
Love Khanna [Tue, 1 Aug 2017 13:02:59 +0000 (18:32 +0530)]
Set default value for T3T_PMM.
If HCEF Application does not provide the T3T PMM value, set the
default value (
FFFFFFFFFFFFFFFF) as per NCI specification.
Bug:
64112415
Test: CTS Verifier; HCE-F Reader/Emulator Test
Change-Id: I24f212d9bebd978342e4dd04d618572132e7eb4b
(cherry picked from commit
20a77e973f62f145ab7b3a4822ce34407c0ca476)
Love Khanna [Tue, 1 Aug 2017 13:02:59 +0000 (18:32 +0530)]
Set default value for T3T_PMM.
If HCEF Application does not provide the T3T PMM value, set the
default value (
FFFFFFFFFFFFFFFF) as per NCI specification.
Bug:
64112415
Test: CTS Verifier; HCE-F Reader/Emulator Test
Change-Id: I24f212d9bebd978342e4dd04d618572132e7eb4b
Jason Monk [Tue, 1 Aug 2017 16:51:19 +0000 (16:51 +0000)]
Merge "Fix QS wifi scan state" into oc-dr1-dev
am:
ce099ba8bc
Change-Id: I314e569a00bf8679739f8e25e8eaa6af76c8c5ce
Jason Monk [Tue, 1 Aug 2017 16:41:43 +0000 (16:41 +0000)]
Merge "Fix QS wifi scan state" into oc-dr1-dev
Jason Monk [Fri, 28 Jul 2017 18:35:13 +0000 (14:35 -0400)]
Make it easier to click on phone nav buttons
When touches fall through the normal click targets, redirect them
to the nearest view.
Test: runtest systemui
Change-Id: I48267d9b1e15bf8dbe8725b72326751b03196efa
Fixes:
64080938
Paul Mclean [Tue, 1 Aug 2017 15:32:21 +0000 (15:32 +0000)]
Merge "Fix exceptions causing HTC dongle (and JBL headset) to fail connection logic." into oc-dr1-dev
am:
f3562ffdfb
Change-Id: I7af6e0b15e2a09c636a2d540714bfc5dd2d459f9
Paul Mclean [Tue, 1 Aug 2017 15:28:27 +0000 (15:28 +0000)]
Merge "Fix exceptions causing HTC dongle (and JBL headset) to fail connection logic." into oc-dr1-dev
Bill Yi [Tue, 1 Aug 2017 15:24:32 +0000 (15:24 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
040c26f636 -s ours
Change-Id: I2ff8751dcedf1648b145a559c0dabce42f944bf0
TreeHugger Robot [Tue, 1 Aug 2017 15:18:52 +0000 (15:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Android Build Merger (Role) [Tue, 1 Aug 2017 15:18:48 +0000 (15:18 +0000)]
Merge "Merge "power: gps: add gps read timeout" into cw-f-dev am:
33676dddbd am:
b5da08a276 am:
d88f4b723d am:
cd68805540" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 1 Aug 2017 15:17:25 +0000 (15:17 +0000)]
Merge "Merge "power: gps: add gps read timeout" into cw-f-dev am:
33676dddbd am:
b5da08a276 am:
d88f4b723d am:
5e76d54639" into oc-dr1-dev-plus-aosp
Maggie Lee [Tue, 1 Aug 2017 15:16:45 +0000 (15:16 +0000)]
Merge "power: gps: add gps read timeout" into cw-f-dev am:
33676dddbd am:
b5da08a276 am:
d88f4b723d
am:
cd68805540
Change-Id: Iaf585d7d9489cc35b834b6907232ad9dd3185ec7
Maggie Lee [Tue, 1 Aug 2017 15:14:56 +0000 (15:14 +0000)]
Merge "power: gps: add gps read timeout" into cw-f-dev am:
33676dddbd am:
b5da08a276 am:
d88f4b723d
am:
5e76d54639
Change-Id: Ia8c8aa458f3b8e57eaa7253fe87bad1efe5e23c9
Andriy Naborskyy [Tue, 1 Aug 2017 15:13:27 +0000 (15:13 +0000)]
Merge changes I49a76582,Iac4b75bc into cw-f-dev am:
f18599a15b am:
9295f58d26 am:
502986f72a
am:
5223106231
Change-Id: I87ec29fb8b0ec5f61841b0596f0628d1e6cb0c71
Hugo Benichi [Tue, 1 Aug 2017 15:12:15 +0000 (15:12 +0000)]
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am:
456b91561d -s ours am:
ff55799950 -s ours am:
17e2448c26 -s ours
am:
0dbabf02f2 -s ours
Change-Id: Ie1a18b001d85450f6458f33b75b0f2f3965a81a9
Andriy Naborskyy [Tue, 1 Aug 2017 15:04:35 +0000 (15:04 +0000)]
Merge changes I49a76582,Iac4b75bc into cw-f-dev am:
f18599a15b am:
9295f58d26 am:
502986f72a
am:
257910c493
Change-Id: I413cdc0d2075cbad6f5409318ad58e394733a5e3
Maggie Lee [Tue, 1 Aug 2017 15:03:39 +0000 (15:03 +0000)]
Merge "power: gps: add gps read timeout" into cw-f-dev am:
33676dddbd am:
b5da08a276
am:
d88f4b723d
Change-Id: I63d677df2353fff2d2e786e25b0dc416837f1581
Hugo Benichi [Tue, 1 Aug 2017 15:03:31 +0000 (15:03 +0000)]
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am:
456b91561d -s ours am:
ff55799950 -s ours am:
17e2448c26 -s ours
am:
7cf8e71e33 -s ours
Change-Id: Idf2184eb808068366384031694c7fa89fe49c8bb
Maggie Lee [Tue, 1 Aug 2017 15:02:00 +0000 (15:02 +0000)]
Merge "power: gps: add gps read timeout" into cw-f-dev am:
33676dddbd am:
b5da08a276
am:
d88f4b723d
Change-Id: I538ec037d1eb1b2ef8970d527a2d9aa53fd7fad8
Andriy Naborskyy [Tue, 1 Aug 2017 14:56:23 +0000 (14:56 +0000)]
Merge changes I49a76582,Iac4b75bc into cw-f-dev am:
f18599a15b am:
9295f58d26
am:
502986f72a
Change-Id: Ic615cfdefcf6a226c868e9203e74070e9000a931
Hugo Benichi [Tue, 1 Aug 2017 14:55:26 +0000 (14:55 +0000)]
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am:
456b91561d -s ours am:
ff55799950 -s ours
am:
17e2448c26 -s ours
Change-Id: Ia38655a26410e9ea78e394e5c59e052739f041a6
Andriy Naborskyy [Tue, 1 Aug 2017 14:52:13 +0000 (14:52 +0000)]
Merge changes I49a76582,Iac4b75bc into cw-f-dev am:
f18599a15b am:
9295f58d26
am:
502986f72a
Change-Id: Idae1def3c8dc80d7f5e3cd83438553cf099541a7
Hugo Benichi [Tue, 1 Aug 2017 14:50:36 +0000 (14:50 +0000)]
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am:
456b91561d -s ours am:
ff55799950 -s ours
am:
17e2448c26 -s ours
Change-Id: Idc2217a66f60caa783957fd6caeaafa1ff1615bc
Maggie Lee [Tue, 1 Aug 2017 14:47:57 +0000 (14:47 +0000)]
Merge "power: gps: add gps read timeout" into cw-f-dev am:
33676dddbd
am:
b5da08a276
Change-Id: I5d96dd73affe79880583347e32a95be8510a5462
Jason Monk [Tue, 1 Aug 2017 14:38:02 +0000 (10:38 -0400)]
Cleanup QS dialogs
Test: manual
Change-Id: I3a87b171d9000ac6628f3d83fc2a817136dc3010
Fixes:
64159285
Fixes:
64158814
Andriy Naborskyy [Tue, 1 Aug 2017 14:38:26 +0000 (14:38 +0000)]
Merge changes I49a76582,Iac4b75bc into cw-f-dev am:
f18599a15b
am:
9295f58d26
Change-Id: Ifd70690f5e275e89d59a15134427e2bcc91e67c7
Maggie Lee [Tue, 1 Aug 2017 14:37:40 +0000 (14:37 +0000)]
Merge "power: gps: add gps read timeout" into cw-f-dev
am:
33676dddbd
Change-Id: I7e3a779631c2de4a14521c8dac6d5b2d96ce1b29
Hugo Benichi [Tue, 1 Aug 2017 14:37:06 +0000 (14:37 +0000)]
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler am:
456b91561d -s ours
am:
ff55799950 -s ours
Change-Id: I6d788c5b7cd5c6877799e5a3e0ad865996147b70
Maggie Lee [Tue, 1 Aug 2017 14:31:23 +0000 (14:31 +0000)]
Merge "power: gps: add gps read timeout" into cw-f-dev
Andriy Naborskyy [Tue, 1 Aug 2017 14:30:05 +0000 (14:30 +0000)]
Merge changes I49a76582,Iac4b75bc into cw-f-dev
am:
f18599a15b
Change-Id: Ib1f6b94a4970bbec28d6bbc7de8969c9d5d3975f
Hugo Benichi [Tue, 1 Aug 2017 14:30:02 +0000 (14:30 +0000)]
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler
am:
456b91561d -s ours
Change-Id: Ie54e0712dc83514ff3ddcd6cee1b0bd2e80c73ad
Andriy Naborskyy [Tue, 1 Aug 2017 14:16:30 +0000 (14:16 +0000)]
Merge changes I49a76582,Iac4b75bc into cw-f-dev
* changes:
DO NOT MERGE ANYWHERE ConnectivityService: move reportNetworkConnectivity to handler
DO NOT MERGE ANYWHERE ConnectivityService: safer locking
Jason Monk [Tue, 1 Aug 2017 14:13:43 +0000 (10:13 -0400)]
Fix QS wifi scan state
Test: manual
Change-Id: Icc4e627f1248b5749801ad532220b3b9fade036d
Fixes:
63648257
Geoffrey Pitsch [Tue, 1 Aug 2017 14:08:36 +0000 (14:08 +0000)]
Merge "Disable AOD when accessibility color inversion is on." into oc-dr1-dev
am:
861b35e1df
Change-Id: I4ee3ad06138a66b47bca6e56fbbd0bd970d91e08
Geoffrey Pitsch [Tue, 1 Aug 2017 14:00:22 +0000 (14:00 +0000)]
Merge "Disable AOD when accessibility color inversion is on." into oc-dr1-dev
Bill Yi [Tue, 1 Aug 2017 07:41:01 +0000 (07:41 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
7eca0300b9 -s ours
Change-Id: I0a52d4ad04ee589d80dd34f218eba693097aa979
TreeHugger Robot [Tue, 1 Aug 2017 07:32:58 +0000 (07:32 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Yohei Yukawa [Tue, 1 Aug 2017 06:11:09 +0000 (06:11 +0000)]
Merge "Fine-tune the condition to hide IME switcher" into oc-dr1-dev
am:
dbd60cd6ee
Change-Id: I919a34c60181f4582992d4d7bf7838b66051b39d
Yohei Yukawa [Tue, 1 Aug 2017 06:01:20 +0000 (06:01 +0000)]
Merge "Fine-tune the condition to hide IME switcher" into oc-dr1-dev
Andrew Solovay [Tue, 1 Aug 2017 02:13:38 +0000 (19:13 -0700)]
docs: Noted that JobIntentService is usually a better choice
Since IntentService is subject to the O background restrictions,
most devs are better off switching to the new JobIntentService.
(I assume IntentService is not actually deprecated; if it is, tell
me and I'll change this to a @deprecated tag!)
See first comment for doc stage location.
Test: make ds-docs
Bug:
64159987
Change-Id: I83a53d1e6336c2134bf4c61bedd2ae42cd80493a
Bill Yi [Tue, 1 Aug 2017 02:03:43 +0000 (19:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idd7fe75cda287243462dc045eff8f3ab2511bd47
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Tyler Freeman [Tue, 1 Aug 2017 01:59:43 +0000 (01:59 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev am:
a053eaa841 -s ours am:
65d806d043 -s ours am:
6b2d37ca25 -s ours
am:
a4f4b537cc -s ours
Change-Id: If1975f1c4897032e473da9c1ee67df8035d2d399
Tyler Freeman [Tue, 1 Aug 2017 01:53:40 +0000 (01:53 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev am:
a053eaa841 -s ours am:
65d806d043 -s ours am:
6b2d37ca25 -s ours
am:
1831989a6e -s ours
Change-Id: I73c6844270e95d54307335418f4bfd2a0098aade
Tyler Freeman [Tue, 1 Aug 2017 01:49:11 +0000 (01:49 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev am:
a053eaa841 -s ours am:
65d806d043 -s ours
am:
6b2d37ca25 -s ours
Change-Id: I4b52d3a68a38bb67cc67a99aad4f13ae6ae906bb
Sundeep Ghuman [Tue, 1 Aug 2017 01:46:45 +0000 (18:46 -0700)]
Fix broken robotests.
In ag/
2580164 AccessPoint.java made a reference to WifiTracker, which
in term references WifiNetworkScoreCache. Since the Robolectric in the
platform still has not been updated to support API 26 (Android O), this
caused the test to break.
By definining the class in the test package, the test can be fixed until
proper Android O support is added to the robolectric prebuilts in the
platform code.
Bug:
64217019
Test: make -j40 RunSettingsLibRoboTests
Change-Id: I6cfd5c17d1aba98d43cca4828058493960a7ff79
Adam Lesinski [Mon, 31 Jul 2017 20:42:00 +0000 (13:42 -0700)]
Refresh constants when MCC/MNC changes in PowerUI
The PowerUI in SystemUI decides whether to show high temperature
warnings to the user based on resources defined for mnc/mcc
configurations. PowerUI only loads the relevant constants once
at startup, meaning any SIM changes that come after the initialization
are not visible. Sometimes, these changes are the first initialization
of mnc/mcc.
PowerUI now listens to configuration changes and updates its internal
state when mnc/mcc changes occur.
Bug:
62845934
Test: manual (put SIM in device and reboot)
Change-Id: Id6a13017924f0367594aa29419aac59ac8b7c157
Tyler Freeman [Tue, 1 Aug 2017 01:41:18 +0000 (01:41 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev am:
a053eaa841 -s ours am:
65d806d043 -s ours
am:
6b2d37ca25 -s ours
Change-Id: I111a86ba53a48ab3db3e5211e86afc0a1d2a21e0
Tyler Freeman [Tue, 1 Aug 2017 01:33:44 +0000 (01:33 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev am:
a053eaa841 -s ours
am:
65d806d043 -s ours
Change-Id: Ie89e28aae64abfc833ed97748654d509cd52c07b
Tyler Freeman [Tue, 1 Aug 2017 01:24:08 +0000 (01:24 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev
am:
a053eaa841 -s ours
Change-Id: If8383edac561ad83edf182ee1c6e9687b180a1c2
Tyler Freeman [Tue, 1 Aug 2017 01:10:44 +0000 (01:10 +0000)]
Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev
Meng Wang [Tue, 1 Aug 2017 00:36:58 +0000 (00:36 +0000)]
Merge "Show error code in WFC error notification." into oc-dr1-dev
am:
d2063214a5
Change-Id: I7c1980af1c877c7b3b4500daccb1226876c7e5bf
Meng Wang [Tue, 1 Aug 2017 00:35:42 +0000 (00:35 +0000)]
Merge "Remoe translations of values-mcc310-mnc260" into oc-dr1-dev
am:
0891411cfd
Change-Id: Id6972effd7feae66bdc7d53be08c832c14cc2d90
Meng Wang [Tue, 1 Aug 2017 00:28:12 +0000 (00:28 +0000)]
Merge "Show error code in WFC error notification." into oc-dr1-dev
Meng Wang [Tue, 1 Aug 2017 00:28:12 +0000 (00:28 +0000)]
Merge "Remoe translations of values-mcc310-mnc260" into oc-dr1-dev
Badhri Jagan Sridharan [Mon, 31 Jul 2017 19:55:46 +0000 (12:55 -0700)]
Reword analog audio not supported notification
New title: Analog audio accessory detected
New message: The attached device is not compatible with this
phone. Tap to learn more.
Also switch to bigTextStyle as the notification message
takes more than one line to display.
Bug:
63962800
Test: Attached analog audio accessory to verify the notification
manually. Also verified that the charging notification remians
untouched.
Change-Id: I5c395bdf3c3dd11f3be8835ec773f087afdc85d9
z00208928 [Fri, 21 Jul 2017 14:26:29 +0000 (22:26 +0800)]
power: gps: add gps read timeout
During download gps file, if network is disconnected, it do not release wakelock
to prevent system to sleep and consume more power until network is connected.
So set gps read tiemout.
Bug:
33469278
Change-Id: I41adf137559d88f76d9da6f63585bfdefc3117b1
Signed-off-by: z00208928 <zhangwei519@huawei.com>
Yohei Yukawa [Mon, 31 Jul 2017 22:37:14 +0000 (15:37 -0700)]
Fine-tune the condition to hide IME switcher
This is a follow up CL to a previous CL [1] that aimed to avoid
redundant IME switcher icon/notification on the keyguard, which already
has a keyboard icon to show IME switcher.
What the previous attempt overlooked is that when some other window is
shown over the keyguard and accepting text input, then we instead may
want to show the IME switcher icon/notification in the system UI level
because such a window may or may not have the icon to show IME
switcher.
This CL addresses above case by checking whether the keyguard is also
occluded or not. Bug
64224022 is also filed to find any other better
solution to stop relying on the keyguard visibility.
[1]: Ibee9123f4a520e77f4baf8bdd3d75364ab451100
2c93efc9eb188532472edc9e0c3e1ab8121aa20d
Test: Manually done as follows
1. Enable multiple IMEs
2. Set a password to lockscreen
3. Lock screen
4. Make sure that IME switcher UI is not shown when typing
password on the keyguard (Bug
5858903 is still fixed)
5. Show any window that has EditText over the keyguard
6. Focus in to that EditText
7. Make sure that IME switcher UI is shown
Fixes:
63585213
Change-Id: I2ae7fc7676e5b64d8910dbc6833d3042e8d2329a
Eino-Ville Talvala [Mon, 31 Jul 2017 22:30:01 +0000 (22:30 +0000)]
Merge "Camera2: Release input surface on capture session close" into oc-dr1-dev
am:
06802167e5
Change-Id: I3370a3c8853d171b29856d2a94e7121e6a5ad1b5
Adam Cohen [Mon, 31 Jul 2017 22:18:38 +0000 (22:18 +0000)]
Revert "Fixing occasional jump when launching certain apps from Recents."
issue
64098508
This reverts commit
7b088c3e2820809437ad40e88a457c220943692e.
Change-Id: If3c1e324d231c5f29a5c68812fe93af6a7335b11
Eino-Ville Talvala [Mon, 31 Jul 2017 22:21:40 +0000 (22:21 +0000)]
Merge "Camera2: Release input surface on capture session close" into oc-dr1-dev
Adam Lesinski [Mon, 31 Jul 2017 22:17:26 +0000 (22:17 +0000)]
Merge "Remove extraneous invalidate call that unregisters AssetManagers" into oc-dr1-dev
am:
defdb1fd70
Change-Id: I16587768d92201f8d4d083b70ae972cca47e8b5c
Bill Yi [Mon, 31 Jul 2017 22:11:31 +0000 (15:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I668e6f2c9663628bc4451ac15f73af46088431c3
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Adam Lesinski [Mon, 31 Jul 2017 22:08:30 +0000 (22:08 +0000)]
Merge "Remove extraneous invalidate call that unregisters AssetManagers" into oc-dr1-dev
Alex Sakhartchouk [Mon, 31 Jul 2017 21:48:24 +0000 (21:48 +0000)]
Merge "When exiting persistent vr, we should exit overall vr mode." into oc-dr1-dev
am:
34b2389fcf
Change-Id: Idfba4f8c58f302f40de4826f034914f430ab3382
TreeHugger Robot [Mon, 31 Jul 2017 21:43:44 +0000 (21:43 +0000)]
Merge "When exiting persistent vr, we should exit overall vr mode." into oc-dr1-dev
Stanley Tng [Tue, 18 Apr 2017 05:35:45 +0000 (22:35 -0700)]
DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)
There are intermittent issues where either the returned Bluetooth
MAC address to Java framework is uninitialized or this address update
arrives too late. This fix will do 2 things:
(1) Returns error when MAC address is unavailable in the native code.
(2) Updates the MAC address later by adding a new broadcast event.
Test: Check address for these cases: factory reset, system reboot, and
Bluetooth re-enable.
Bug:
36709382
Merged-In: I09720193e38fdf9139e1bb146f8e1847e2b65b1a
(cherry picked from commit
ad4d1d8e28618546953e75d4983335631feb6f2a)
Change-Id: Ifae3adf6e2aad1f0811c03d3114d1bd0452e7c23
Alison Cichowlas [Mon, 31 Jul 2017 15:24:34 +0000 (11:24 -0400)]
Move ShutdownThread calls to system ui thread.
Test: Manual
Fixes:
63680790
Change-Id: I6e431efb7594ba86311aac857dbf3970d48044ac
Michal Karpinski [Mon, 31 Jul 2017 19:05:13 +0000 (19:05 +0000)]
Merge "Reintroduce the contract for random token to be non-negative" into oc-dr1-dev
am:
810c312a29
Change-Id: I4518f7a6317d3c01e37a47b19dee653ccff71502