Commit Graph

277290 Commits

Author SHA1 Message Date
Greg Plesur
0cbe2e1a5c Merge "New Wear devices need to update their DISABLE_LOCKSCREEN_KEY." into cw-f-dev am: 343dbac2e0
am: c447d9ef6a

Change-Id: I17a831ab2c537c00452f250d151ec3f63b2d6277
2016-11-03 20:30:59 +00:00
Greg Plesur
e44736a819 New Wear devices need to update their DISABLE_LOCKSCREEN_KEY. am: eb2e45369a
am: a71a0b8da1

Change-Id: I9a19eea21e008a9253ea7abbd854b21f4696548c
2016-11-03 20:29:55 +00:00
Greg Plesur
c447d9ef6a Merge "New Wear devices need to update their DISABLE_LOCKSCREEN_KEY." into cw-f-dev
am: 343dbac2e0

Change-Id: Ia7b6297443c555edc9372e6991784b2a6920d2ba
2016-11-03 20:23:29 +00:00
Greg Plesur
a71a0b8da1 New Wear devices need to update their DISABLE_LOCKSCREEN_KEY.
am: eb2e45369a

Change-Id: I64c1cc38bc38d9d0ee6214a64c6ddfaa57095ce0
2016-11-03 20:23:24 +00:00
Greg Plesur
343dbac2e0 Merge "New Wear devices need to update their DISABLE_LOCKSCREEN_KEY." into cw-f-dev 2016-11-03 20:15:21 +00:00
Michael Kwan
af03cd3c5b Merge "Disable multiwindow support for watch devices by default." into cw-f-dev am: 0d3f740316
am: 10f3eda0fd

Change-Id: I5d6ad3b9b5ce63546907f629c289229bf673186d
2016-11-03 20:03:55 +00:00
Michael Kwan
4c5d4dd64d Disable multiwindow support for watch devices by default. am: 1cb6777e51
am: 620a33b827

Change-Id: Id2f6d1e2a12c6644f41ed5f535568130139cd355
2016-11-03 20:02:55 +00:00
Michael Kwan
10f3eda0fd Merge "Disable multiwindow support for watch devices by default." into cw-f-dev
am: 0d3f740316

Change-Id: I7867b0ff72237c7ce216f570034f6f811e5a6abb
2016-11-03 19:56:24 +00:00
Michael Kwan
620a33b827 Disable multiwindow support for watch devices by default.
am: 1cb6777e51

Change-Id: I9e42480be007387109f9e58efe594dca860e3597
2016-11-03 19:56:20 +00:00
Michael Kwan
0d3f740316 Merge "Disable multiwindow support for watch devices by default." into cw-f-dev 2016-11-03 19:48:59 +00:00
Greg Plesur
eb2e45369a New Wear devices need to update their DISABLE_LOCKSCREEN_KEY.
Previous versions of Wear forced this flag to "true."

BUG: 32591969
Change-Id: I9619eee5df5f67e92818ef0b7b45ddd2299449f1
2016-11-03 15:01:19 -04:00
Wyatt Riley
df03f37af4 Merge "High speed GPS/GNSS Navigation Information Block" into nyc-mr2-dev
am: 8b85444802

Change-Id: I44ba889725acdb43e7eea890cc0bfa9fe3c2b5a6
2016-11-03 17:33:26 +00:00
Wyatt Riley
0021090eb9 High speed GPS/GNSS Navigation Information Block
am: 5d5bac8383

Change-Id: If8e8576f7e18faf6cb45ff228222c0c34be98d6d
2016-11-03 17:33:19 +00:00
TreeHugger Robot
8b85444802 Merge "High speed GPS/GNSS Navigation Information Block" into nyc-mr2-dev 2016-11-03 17:27:10 +00:00
Richard Coles
0d16fa4096 Merge "Fix WebViewUpdateServiceTest failures when using Thread without Looper." am: be19fe5e8a am: 9c47f5c87a
am: 0092dbabe0

Change-Id: Ic1b2d362c582513ba821f6b9035e1ac91dcfa471
2016-11-03 14:54:09 +00:00
Richard Coles
0092dbabe0 Merge "Fix WebViewUpdateServiceTest failures when using Thread without Looper." am: be19fe5e8a
am: 9c47f5c87a

Change-Id: Ia5d867468080e0e48a4e5b3c08b1ee627e16cebe
2016-11-03 14:48:05 +00:00
Richard Coles
9c47f5c87a Merge "Fix WebViewUpdateServiceTest failures when using Thread without Looper."
am: be19fe5e8a

Change-Id: I85e2e13f395dac085616838670c19ddbedc67e9d
2016-11-03 14:42:08 +00:00
Richard Coles
be19fe5e8a Merge "Fix WebViewUpdateServiceTest failures when using Thread without Looper." 2016-11-03 14:34:50 +00:00
Michael Kwan
1cb6777e51 Disable multiwindow support for watch devices by default.
Bug: 30120559
Change-Id: I458eac557e38fd32533a98cca7cbbabc5fa08b09
2016-11-03 01:09:08 -07:00
Wyatt Riley
5d5bac8383 High speed GPS/GNSS Navigation Information Block
When speed goes above 400m/s, the GnssLocationProvider will
stop output of location, measurements and navigation message.

Test: Several on device tests, see bug for details

Bug: 31711586
Change-Id: I8bceb9a67b10ac7cf21983bb856ed0608957096a
2016-11-02 17:23:40 -07:00
Steven Moreland
630fc8c4f7 Merge "Update for hidlized hwservicemanager." am: 8d0c4ed74c am: 8527f13251
am: 0d5da175a0

Change-Id: I8ed00bc19e120e76e546c2ae0610f8771077a471
2016-11-02 22:34:30 +00:00
Steven Moreland
0d5da175a0 Merge "Update for hidlized hwservicemanager." am: 8d0c4ed74c
am: 8527f13251

Change-Id: I23ad38482ce6b7aa9857dccd6398af26b46ee46f
2016-11-02 22:28:28 +00:00
Steven Moreland
8527f13251 Merge "Update for hidlized hwservicemanager."
am: 8d0c4ed74c

Change-Id: I8314346b5ac8cf1f2b219580c02117cd6977e6aa
2016-11-02 22:23:45 +00:00
Treehugger Robot
8d0c4ed74c Merge "Update for hidlized hwservicemanager." 2016-11-02 22:17:25 +00:00
neo.chae
d3a209399a Merge "Fix idmap leak in zygote process" am: f5ad44b60a am: 4720125a3c
am: 3e15d09ed4

Change-Id: I7d3d7d72e92a66c48b68165e5e3d26a1ccd1b56a
2016-11-02 21:25:05 +00:00
neo.chae
3e15d09ed4 Merge "Fix idmap leak in zygote process" am: f5ad44b60a
am: 4720125a3c

Change-Id: If66e9476583ec50d2dca5a15376a4b84ae2a2885
2016-11-02 21:21:32 +00:00
neo.chae
4720125a3c Merge "Fix idmap leak in zygote process"
am: f5ad44b60a

Change-Id: Ia9977c8166f797ad716284eda03076e282a9fde7
2016-11-02 21:16:33 +00:00
Treehugger Robot
f5ad44b60a Merge "Fix idmap leak in zygote process" 2016-11-02 21:09:03 +00:00
Brad Ebinger
02a42886ac Merge "Modify ConnectionServiceAdapter to include Session" am: f231db7786 -s ours am: ccec8919fe
am: a895383b44

Change-Id: I0c606de6d7bd7eb37a3748c2f6ab3be889f933a6
2016-11-02 21:00:05 +00:00
Brad Ebinger
a895383b44 Merge "Modify ConnectionServiceAdapter to include Session" am: f231db7786 -s ours
am: ccec8919fe

Change-Id: I27443a9024ea4aff209a24a9049832a76f252476
2016-11-02 20:55:16 +00:00
Brad Ebinger
ccec8919fe Merge "Modify ConnectionServiceAdapter to include Session"
am: f231db7786  -s ours

Change-Id: Ia5ebf8f639e1336e9e7278faf8eb09285d3c5507
2016-11-02 20:51:36 +00:00
Steven Moreland
a813686b9d Update for hidlized hwservicemanager.
Bug: 32313592
Test: pass (end to end for others in topic).
Change-Id: I7ac6bbe8b8de5e1cb86759cbe6f31fac642cec28
2016-11-02 13:43:28 -07:00
Brad Ebinger
f231db7786 Merge "Modify ConnectionServiceAdapter to include Session" 2016-11-02 20:39:41 +00:00
pengzhicai
f85e7930d8 Merge "Fix String is empty issue" am: 80af1ba47b am: 38c585cb8d
am: d7df704d98

Change-Id: Ia75039c87b396b8b0d15f0758d17e365fb2f18e6
2016-11-02 18:34:53 +00:00
pengzhicai
d7df704d98 Merge "Fix String is empty issue" am: 80af1ba47b
am: 38c585cb8d

Change-Id: I091572280b0b2a33a2a5e2339a08df0759bb2bd7
2016-11-02 18:29:24 +00:00
pengzhicai
38c585cb8d Merge "Fix String is empty issue"
am: 80af1ba47b

Change-Id: I7000d0fe8fd5c2145e628abec11b49653027138b
2016-11-02 18:23:26 +00:00
Treehugger Robot
80af1ba47b Merge "Fix String is empty issue" 2016-11-02 18:14:50 +00:00
Brad Ebinger
1d35eee461 Merge "Modify ConnectionServiceAdapter to include Session" into stage-aosp-master am: def235760e
am: c50005ee6c

Change-Id: I7b04f249de691f1499d3e2bbcbc93bf81d4fd1ea
2016-11-02 17:47:30 +00:00
Brad Ebinger
baa73944e4 resolve merge conflicts of 4d75bee to nyc-mr1-dev-plus-aosp
am: c5eacceb3f

Change-Id: I1fe6eea67081a8d35132d87c8e3e38952e110cc0
2016-11-02 17:46:43 +00:00
Brad Ebinger
c50005ee6c Merge "Modify ConnectionServiceAdapter to include Session" into stage-aosp-master
am: def235760e

Change-Id: I309cd302b14ee0d0980632086855ba2cf97c6798
2016-11-02 17:43:49 +00:00
Brad Ebinger
c5eacceb3f resolve merge conflicts of 4d75bee to nyc-mr1-dev-plus-aosp
Change-Id: Ib11bb52c9d3826e02089485af93856ba891ad034
2016-11-02 10:33:27 -07:00
Phil Weaver
a79c39d53e Merge "Revert "Don't invalidate list data during layout."" into nyc-mr1-dev am: 7ffc2a62ff am: 9bfdce4712
am: a3c03ba74a

Change-Id: I90cf9264ede25712ebaeb1b787cc61c2438f35bc
2016-11-02 17:31:45 +00:00
Phil Weaver
1b5e3d98d2 Revert "Don't invalidate list data during layout." am: 866ded50bb am: 96b4a68c06
am: b8a314427b

Change-Id: I5ace1c6b058b795a5b04e48200d2b3d3a1ae2486
2016-11-02 17:30:48 +00:00
Phil Weaver
a3c03ba74a Merge "Revert "Don't invalidate list data during layout."" into nyc-mr1-dev am: 7ffc2a62ff
am: 9bfdce4712

Change-Id: Ic8a9c38988dd23d0b3c7e1fa96a28a2ffb2f3b6b
2016-11-02 17:26:10 +00:00
Phil Weaver
b8a314427b Revert "Don't invalidate list data during layout." am: 866ded50bb
am: 96b4a68c06

Change-Id: I02b34aea90cae2312baa5f8300bc8f6349985470
2016-11-02 17:25:17 +00:00
Phil Weaver
9bfdce4712 Merge "Revert "Don't invalidate list data during layout."" into nyc-mr1-dev
am: 7ffc2a62ff

Change-Id: Id1f42e0dcb96e9dab884faa5ecd070ced3c4fba2
2016-11-02 17:20:20 +00:00
Phil Weaver
96b4a68c06 Revert "Don't invalidate list data during layout."
am: 866ded50bb

Change-Id: I191c26bfb9488d5d67514a81387a9cde95a20eb4
2016-11-02 17:20:17 +00:00
Phil Weaver
7ffc2a62ff Merge "Revert "Don't invalidate list data during layout."" into nyc-mr1-dev 2016-11-02 17:13:24 +00:00
Brad Ebinger
def235760e Merge "Modify ConnectionServiceAdapter to include Session" into stage-aosp-master 2016-11-02 16:59:33 +00:00
Brad Ebinger
4d75bee99b Modify ConnectionServiceAdapter to include Session
Modifies the ConnectionServiceAdapter to include Session Information in
the AIDL interface so that external Sessions can be started in Telecom
from Telephony.

Test: Manual testing and Unit Tests pass
Bug: 26571395
Change-Id: I31bbfe433dd062a50bd05083e1a639dd4cd03403
2016-11-02 09:20:22 -07:00