OSDN Git Service
Adrian Roos [Wed, 2 Aug 2017 17:30:33 +0000 (17:30 +0000)]
Merge "LightStatus: Fix notification icon color filter" into oc-dr1-dev
am:
6134b7529b
Change-Id: Ib68dcc833b2a25466b147e8c406fa6bbd8517e02
Selim Cinek [Wed, 2 Aug 2017 17:27:48 +0000 (17:27 +0000)]
Merge "Fixed an issue where icons were jumping" into oc-dr1-dev
am:
7a719ab0ed
Change-Id: I5e983a7275e1dc117c1c70d6ae7be14b121d5c54
Adrian Roos [Wed, 2 Aug 2017 17:23:31 +0000 (17:23 +0000)]
Merge "LightStatus: Fix notification icon color filter" into oc-dr1-dev
Android Build Merger (Role) [Wed, 2 Aug 2017 17:16:57 +0000 (17:16 +0000)]
Merge "Merge "Add hwbinder library" am:
49e2a9a612 am:
811027ede7 am:
2785be7572" into oc-dr1-dev-plus-aosp
TreeHugger Robot [Wed, 2 Aug 2017 17:16:18 +0000 (17:16 +0000)]
Merge "Fixed an issue where icons were jumping" into oc-dr1-dev
Sundong Ahn [Wed, 2 Aug 2017 17:14:55 +0000 (17:14 +0000)]
Merge "Add hwbinder library" am:
49e2a9a612 am:
811027ede7
am:
2785be7572
Change-Id: Ia545b163166465cafa3d4ecbb0a5d0d911224b22
TreeHugger Robot [Wed, 2 Aug 2017 17:14:31 +0000 (17:14 +0000)]
Merge "services.core: remove use of -static hidl java" into oc-dr1-dev-plus-aosp
Sundong Ahn [Wed, 2 Aug 2017 17:05:56 +0000 (17:05 +0000)]
Merge "Add hwbinder library" am:
49e2a9a612
am:
811027ede7
Change-Id: Idec0d080a65d96ff866969f47e9902e40e800fdf
Stan Iliev [Wed, 2 Aug 2017 17:01:17 +0000 (17:01 +0000)]
Merge "Delete dead code function SpotShadow::makeClockwise" am:
8c9e5c81ad am:
98eaf41eec
am:
fb3f29b608
Change-Id: I29cbdb6b741f0e4d84a12269607cdd32c6a51a74
Sundong Ahn [Wed, 2 Aug 2017 16:57:50 +0000 (16:57 +0000)]
Merge "Add hwbinder library"
am:
49e2a9a612
Change-Id: I3c7528dcf98bf3b92843594172531fd30a5f29d4
Stan Iliev [Wed, 2 Aug 2017 16:52:20 +0000 (16:52 +0000)]
Merge "Delete dead code function SpotShadow::makeClockwise" am:
8c9e5c81ad
am:
98eaf41eec
Change-Id: I3760a36d915f495fe8d4e457982440ff61934a6b
Treehugger Robot [Wed, 2 Aug 2017 16:46:42 +0000 (16:46 +0000)]
Merge "Add hwbinder library"
Stan Iliev [Wed, 2 Aug 2017 16:44:22 +0000 (16:44 +0000)]
Merge "Delete dead code function SpotShadow::makeClockwise"
am:
8c9e5c81ad
Change-Id: I5d696089e13dc68115451c223646ef5e0688b330
Treehugger Robot [Wed, 2 Aug 2017 16:29:23 +0000 (16:29 +0000)]
Merge "Delete dead code function SpotShadow::makeClockwise"
Android Build Merger (Role) [Wed, 2 Aug 2017 16:11:30 +0000 (16:11 +0000)]
Merge "Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am:
c8f0fd7076 am:
6f9f17475d" into oc-dr1-dev-plus-aosp
Felipe Leme [Wed, 2 Aug 2017 16:09:58 +0000 (16:09 +0000)]
Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am:
c8f0fd7076
am:
6f9f17475d
Change-Id: Ic1c671be822007e3d0493385e5ceba60f921b607
Felipe Leme [Wed, 2 Aug 2017 16:09:20 +0000 (16:09 +0000)]
Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev am:
c8f0fd7076
am:
32d4e30778
Change-Id: I5e3eff32fe5224d69bb41c4c4c48b880bc701c4b
Felipe Leme [Wed, 2 Aug 2017 16:00:41 +0000 (16:00 +0000)]
Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev
am:
c8f0fd7076
Change-Id: Ida9652bb511ea0aa180e649992a9e5fa6409b2be
Felipe Leme [Wed, 2 Aug 2017 16:00:39 +0000 (16:00 +0000)]
Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev
am:
c8f0fd7076
Change-Id: I3a2419aa6244f01a54211ab60558cc729c29249e
Felipe Leme [Wed, 2 Aug 2017 15:52:05 +0000 (15:52 +0000)]
Merge "Clarifies how the autofill service should check for signature hashes." into oc-dev
Steven Moreland [Wed, 2 Aug 2017 15:30:37 +0000 (15:30 +0000)]
Merge "com.android.server: use proper nativehelper headers" into stage-aosp-master am:
7d7c269944
am:
81972a18e4
Change-Id: Id008ba3508c972d8d27eebca22009b4823e387e0
Steven Moreland [Wed, 2 Aug 2017 15:22:09 +0000 (15:22 +0000)]
Merge "com.android.server: use proper nativehelper headers" into stage-aosp-master
am:
7d7c269944
Change-Id: Ie9058f2b554d2d88d31b4bc66ac56d4bf735704d
TreeHugger Robot [Wed, 2 Aug 2017 15:08:37 +0000 (15:08 +0000)]
Merge "com.android.server: use proper nativehelper headers" into stage-aosp-master
Adrian Roos [Wed, 2 Aug 2017 14:57:11 +0000 (16:57 +0200)]
LightStatus: Fix notification icon color filter
Fixes an issue with the color filter applied to status bar icons where the
tint's alpha channel was ignored.
Change-Id: Idf22c70524fb718995d09ef339b825425ca5f7a7
Fixes:
64139391
Test: Look at light status bar with notifications; verify that icons have slightly gray tint instead of fully black
Bill Yi [Wed, 2 Aug 2017 14:36:03 +0000 (14:36 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
9ce641fd81 -s ours
Change-Id: I35fdc137ba9f079e4d632d2e62c5aacbb83e9ec4
TreeHugger Robot [Wed, 2 Aug 2017 14:25:24 +0000 (14:25 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Jorim Jaggi [Wed, 2 Aug 2017 12:23:06 +0000 (12:23 +0000)]
Merge "Refine condition for starting window skip" into oc-dr1-dev
am:
612de053b8
Change-Id: I9147082d4776b451b487c74785af9df9e2590ca3
Jorim Jaggi [Wed, 2 Aug 2017 12:15:40 +0000 (12:15 +0000)]
Merge "Refine condition for starting window skip" into oc-dr1-dev
Bill Yi [Wed, 2 Aug 2017 07:57:25 +0000 (00:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: I80d58d6708464b7254857c5fca1680bbf4f0212b
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Jonathan Basseri [Wed, 2 Aug 2017 02:27:55 +0000 (02:27 +0000)]
Merge "Revert "Move getNetworkCountryIso impl from TM to PIM."" am:
85a215bae7 am:
7728849a39
am:
0fed7e3282
Change-Id: If811c7aa40c5be4b0ffcfa5addef8c4b147a1c71
Jonathan Basseri [Wed, 2 Aug 2017 02:06:55 +0000 (02:06 +0000)]
Merge "Revert "Move getNetworkCountryIso impl from TM to PIM."" am:
85a215bae7
am:
7728849a39
Change-Id: Id7f000e7a67c53c8c3d26482a7d1697255943bf7
Jonathan Basseri [Wed, 2 Aug 2017 01:58:18 +0000 (01:58 +0000)]
Merge "Revert "Move getNetworkCountryIso impl from TM to PIM.""
am:
85a215bae7
Change-Id: I30dddd90e5984519219865752f563a45962be593
Felipe Leme [Wed, 2 Aug 2017 01:57:16 +0000 (01:57 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev am:
6829a1dace
am:
e971d933be
Change-Id: Id05a08413742ef94a426738fd0e82243c0553942
Jonathan Basseri [Wed, 2 Aug 2017 01:51:21 +0000 (01:51 +0000)]
Merge "Move getNetworkCountryIso impl from TM to PIM." am:
58bbef15d8 am:
02cc8151a6
am:
aaeca1e977
Change-Id: I9935e8825683fb23fc03e38a93380add8fe4408a
Jonathan Basseri [Wed, 2 Aug 2017 01:44:09 +0000 (01:44 +0000)]
Merge "Revert "Move getNetworkCountryIso impl from TM to PIM.""
Jonathan Basseri [Wed, 2 Aug 2017 01:10:47 +0000 (01:10 +0000)]
Revert "Move getNetworkCountryIso impl from TM to PIM."
This reverts commit
6f4657363cac93ddcc718d9716e3b138f770f2e2.
Change-Id: Ie0062369198af03441c531cd2181ed9c12b8f012
Stan Iliev [Wed, 27 Jul 2016 22:08:06 +0000 (18:08 -0400)]
Delete dead code function SpotShadow::makeClockwise
Delete SpotShadow::makeClockwise, which is unused and does
not link when compiler optimizations are disabled (for debugging).
SpotShadow::makeClockwise calls non-existent function
ShadowTessellator::isClockwise, which only works because the
optimizer deletes the function.
Change-Id: Ib8a014bf168782772faa1da7d75a079c1fd28ed9
(cherry picked from commit
fdb625a309755fb762c448dd8c2c4e3a7cc26021)
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:39 +0000 (00:26 +0000)]
Merge "Cherry-picked some Autofill Javadoc improvements from " into oc-dev
am:
6829a1dace
Change-Id: I00eed7ae9679f117296ad1f7162e057720e69aab
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
Steven Moreland [Tue, 1 Aug 2017 23:34:40 +0000 (16:34 -0700)]
services.core: remove use of -static hidl java
These libraries are being removed. Now, the regular java
library can be used as both a static and non-static library,
we are removing these duplicate libraries which cause
several types problems (such as undefined behavior when
both the static and non-static libs are loaded).
Bug:
36376126
Test: boot marlin device
Change-Id: I6acb6a41fd5c62a3070ada373aed11706c423463
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
Jonathan Basseri [Tue, 1 Aug 2017 22:44:01 +0000 (22:44 +0000)]
Merge "Move getNetworkCountryIso impl from TM to PIM." am:
58bbef15d8
am:
02cc8151a6
Change-Id: Ie3ef6584785cf976cd14fd9143bcf83c20506500
TreeHugger Robot [Tue, 1 Aug 2017 22:38:28 +0000 (22:38 +0000)]
Merge "Fix broken robotests." into oc-dr1-dev
Jonathan Basseri [Tue, 1 Aug 2017 22:34:44 +0000 (22:34 +0000)]
Merge "Move getNetworkCountryIso impl from TM to PIM."
am:
58bbef15d8
Change-Id: I8a97c049b97eca25a03f7cfcbe57eb6729c6741b
Jonathan Basseri [Tue, 1 Aug 2017 22:25:28 +0000 (22:25 +0000)]
Merge "Move getNetworkCountryIso impl from TM to PIM."
Selim Cinek [Tue, 1 Aug 2017 00:47:45 +0000 (17:47 -0700)]
Fixed an issue where icons were jumping
Because width and height are different for icons on
some devices, the animation could jump unfortunately.
This was mainly introduced since we changed the
statusbar height.
Test: observe icon animations (Especially on last notification)
Change-Id: Iee4f63467895045146c92d68eb4f9ca8a38d943a
Fixes:
64008528
Jonathan Basseri [Wed, 19 Jul 2017 20:44:31 +0000 (13:44 -0700)]
Move getNetworkCountryIso impl from TM to PIM.
This moves the implementation of getNetworkCountryIso from
TelephonyManager into PhoneInterfaceManager so that we can perform an
additional IWLAN check.
Bug:
63050313
Test: no compilation errors
Change-Id: I8463af8ed427b73b57a4076c0ff79f055c697657
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
Steven Moreland [Tue, 1 Aug 2017 17:18:40 +0000 (10:18 -0700)]
com.android.server: use proper nativehelper headers
libnativehelper exports headers under nativehelper. These were
available before incorrectly as global headers in order to give
access to jni.h.
Test: com.android.server finds headers
Bug:
63762847
Change-Id: Icb3018f520004f65e8dd565d6e1d563551548eba
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
Felipe Leme [Mon, 31 Jul 2017 18:34:14 +0000 (11:34 -0700)]
Clarifies how the autofill service should check for signature hashes.
Test: m update-api
Bug:
64125551
Fixes:
63991811
Change-Id: I1ba66787ef91c0fc5fab20b5e9e9fd47aee46412
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