Daniel Nishi
e76b9dcb62
Fix a bug where the package stats query timeout may crash.
...
am: cf76a16e66
2016-12-22 21:09:53 +00:00
Steven Moreland
42bf224ed4
Merge "HwBinder: fail gracefully for device w/o hwbinder" am: 380697ca79 am: b6022b9fa0 am: 5e1efa2cc7
...
am: 8b775f96b9
2016-12-22 21:09:19 +00:00
Pankaj Kanwar
1ed11ee012
Merge "DO NOT MERGE: Add UI toggle to control connections to carrier networks." into nyc-mr2-dev am: f6d8e1f635
...
am: 55a0803234
2016-12-22 21:06:21 +00:00
pkanwar
07c4aa34a9
DO NOT MERGE: Add UI toggle to control connections to carrier networks. am: 57f383709b
...
am: 21f8870abc
2016-12-22 21:05:25 +00:00
TreeHugger Robot
dfe1bc2f34
Merge "Fix a bug where the package stats query timeout may crash." into nyc-mr2-dev
2016-12-22 21:03:04 +00:00
Steven Moreland
8b775f96b9
Merge "HwBinder: fail gracefully for device w/o hwbinder" am: 380697ca79 am: b6022b9fa0
...
am: 5e1efa2cc7
2016-12-22 20:58:54 +00:00
Alex Klyubin
3a8eac544b
Merge "resolve merge conflicts of b53d984 to master"
2016-12-22 20:56:59 +00:00
Pankaj Kanwar
55a0803234
Merge "DO NOT MERGE: Add UI toggle to control connections to carrier networks." into nyc-mr2-dev
...
am: f6d8e1f635
2016-12-22 20:54:11 +00:00
pkanwar
21f8870abc
DO NOT MERGE: Add UI toggle to control connections to carrier networks.
...
am: 57f383709b
2016-12-22 20:53:58 +00:00
Steven Moreland
5e1efa2cc7
Merge "HwBinder: fail gracefully for device w/o hwbinder" am: 380697ca79
...
am: b6022b9fa0
2016-12-22 20:53:52 +00:00
Steven Moreland
b6022b9fa0
Merge "HwBinder: fail gracefully for device w/o hwbinder"
...
am: 380697ca79
2016-12-22 20:48:17 +00:00
Pankaj Kanwar
f6d8e1f635
Merge "DO NOT MERGE: Add UI toggle to control connections to carrier networks." into nyc-mr2-dev
2016-12-22 20:41:58 +00:00
Treehugger Robot
380697ca79
Merge "HwBinder: fail gracefully for device w/o hwbinder"
2016-12-22 20:41:01 +00:00
Ashutosh Joshi
19753cca3f
Switch to HIDL service based HAL
...
Switch to using HIDL service based HAL.
Some cleanup.
Test: GTS tests pass
Change-Id: Icf133fe4ead56336973dc50c4ec2aab18382a8ca
2016-12-22 12:28:57 -08:00
Santos Cordon
c7e853f511
Add Brightness setting for VR Mode.
...
This change saves and loads a different brightness setting when the user
goes in and out of VR Mode.
Bug: 30984614
Change-Id: Ie5578bbd6ea346f0eb34fe4abbfd604a5d7c0c93
2016-12-22 12:27:51 -08:00
Meng Wang
3070dbfae6
Merge "Add API for reporting IMS registration failures"
2016-12-22 20:03:42 +00:00
TreeHugger Robot
4bd76266a4
Merge "Add simplified_network_settings_bool to CarrierConfig."
2016-12-22 20:01:57 +00:00
Alex Klyubin
f271c6d266
resolve merge conflicts of b53d984 to master
...
Change-Id: I3fe63a5c0193c720b8ec4ca53834096de8433f26
2016-12-22 12:00:24 -08:00
Joe LaPenna
5e0164e16c
Add simplified_network_settings_bool to CarrierConfig.
...
Some carriers want to further simplify network settings based on a
variety of wifi or cellular related bundles. Expose a config a
carrier might set to allow SysUi, Settings and platform to adjust.
BUG: 33111931
Test: runtest carrierconfig-unit
Change-Id: I35a7ef15bbba23cf9e0380432fc001804c7e1804
Merged-In: I35a7ef15bbba23cf9e0380432fc001804c7e1804
2016-12-22 11:53:10 -08:00
Sundeep Ghuman
dfd5049246
Merge "Fix failing WifiNetworkScoreCacheTest." am: 5e055b6a18 am: 80f1e2e52a am: 43e86c1ca6
...
am: f44bea51fb
2016-12-22 19:42:28 +00:00
Sundeep Ghuman
48e59edacc
Merge "Cherrypick: Define the calculateRankingScore method and Key." am: 425af45d02 am: 41577a0029 am: bfc0bfe645
...
am: 4ac2f9f53e
2016-12-22 19:41:08 +00:00
Jeremy Joslin
2f59aa0ce5
Merge changes I40f055df,I562713df am: 4a04c07df4 am: 8eff13b521 am: deddce7ff6
...
am: 10524f61f5
2016-12-22 19:38:59 +00:00
Jeremy Joslin
4a56a7ae48
Stay bound to the most current active scorer. am: b1365852cc am: d79019a616 am: 268176317b
...
am: 7d26ab59cd
2016-12-22 19:37:49 +00:00
Jeremy Joslin
ddf3c3c937
Clear and restore the calling ID. am: 29ed4a99bf am: 3588b8d44c am: 3f32d12be0
...
am: 7af07643f3
2016-12-22 19:36:38 +00:00
Alex Klyubin
b53d984132
Merge "Make users of MtpServer fill in DeviceInfo field values" am: 933ea68aca am: e988e8f1f6
...
am: 8e23aa4ee6
2016-12-22 19:32:47 +00:00
Daniel Nishi
cf76a16e66
Fix a bug where the package stats query timeout may crash.
...
This adds a null-check to verify that we got real data before
trying to use it and increases the timeout time to reduce the
likelihood of timing out.
Test: FrameworkServicesTests
Bug: 33836034
Change-Id: Ia1ad4aba05c5c4fb8688fc9fc94df344f736e396
2016-12-22 11:32:33 -08:00
Sundeep Ghuman
f44bea51fb
Merge "Fix failing WifiNetworkScoreCacheTest." am: 5e055b6a18 am: 80f1e2e52a
...
am: 43e86c1ca6
2016-12-22 19:27:29 +00:00
Sundeep Ghuman
4ac2f9f53e
Merge "Cherrypick: Define the calculateRankingScore method and Key." am: 425af45d02 am: 41577a0029
...
am: bfc0bfe645
2016-12-22 19:26:05 +00:00
Jeremy Joslin
10524f61f5
Merge changes I40f055df,I562713df am: 4a04c07df4 am: 8eff13b521
...
am: deddce7ff6
2016-12-22 19:24:17 +00:00
Alex Klyubin
8e23aa4ee6
Merge "Make users of MtpServer fill in DeviceInfo field values" am: 933ea68aca
...
am: e988e8f1f6
2016-12-22 19:22:46 +00:00
Jeremy Joslin
7d26ab59cd
Stay bound to the most current active scorer. am: b1365852cc am: d79019a616
...
am: 268176317b
2016-12-22 19:22:44 +00:00
Jeremy Joslin
7af07643f3
Clear and restore the calling ID. am: 29ed4a99bf am: 3588b8d44c
...
am: 3f32d12be0
2016-12-22 19:21:45 +00:00
Alex Klyubin
aedc94bf11
resolve merge conflicts of a9888fc to master
...
Change-Id: I6ad00bf5bc1b18406b7fc8969c35bf7970fd1967
2016-12-22 11:20:26 -08:00
Sundeep Ghuman
43e86c1ca6
Merge "Fix failing WifiNetworkScoreCacheTest." am: 5e055b6a18
...
am: 80f1e2e52a
2016-12-22 19:16:13 +00:00
Sundeep Ghuman
bfc0bfe645
Merge "Cherrypick: Define the calculateRankingScore method and Key." am: 425af45d02
...
am: 41577a0029
2016-12-22 19:14:48 +00:00
Jeremy Joslin
deddce7ff6
Merge changes I40f055df,I562713df am: 4a04c07df4
...
am: 8eff13b521
2016-12-22 19:12:47 +00:00
pkanwar
57f383709b
DO NOT MERGE: Add UI toggle to control connections to carrier networks.
...
Bug: 31003437
Change-Id: I6cf32ae4d376eb65f80492da0922dbecb762c9da
2016-12-22 11:12:02 -08:00
Jeremy Joslin
268176317b
Stay bound to the most current active scorer. am: b1365852cc
...
am: d79019a616
2016-12-22 19:11:48 +00:00
Jeremy Joslin
3f32d12be0
Clear and restore the calling ID. am: 29ed4a99bf
...
am: 3588b8d44c
2016-12-22 19:10:46 +00:00
Alex Klyubin
e988e8f1f6
Merge "Make users of MtpServer fill in DeviceInfo field values"
...
am: 933ea68aca
2016-12-22 19:10:00 +00:00
Alex Klyubin
a9888fc0c4
resolve merge conflicts of febd982 to stage-aosp-master am: 5c53fdb893
...
am: b824658494
2016-12-22 19:06:09 +00:00
Sundeep Ghuman
80f1e2e52a
Merge "Fix failing WifiNetworkScoreCacheTest."
...
am: 5e055b6a18
2016-12-22 19:05:44 +00:00
Sundeep Ghuman
41577a0029
Merge "Cherrypick: Define the calculateRankingScore method and Key."
...
am: 425af45d02
2016-12-22 19:04:22 +00:00
Jeremy Joslin
8eff13b521
Merge changes I40f055df,I562713df
...
am: 4a04c07df4
2016-12-22 19:02:45 +00:00
Jeremy Joslin
d79019a616
Stay bound to the most current active scorer.
...
am: b1365852cc
2016-12-22 19:02:38 +00:00
Jeremy Joslin
3588b8d44c
Clear and restore the calling ID.
...
am: 29ed4a99bf
2016-12-22 19:01:43 +00:00
Alex Klyubin
b824658494
resolve merge conflicts of febd982 to stage-aosp-master
...
am: 5c53fdb893
2016-12-22 19:01:13 +00:00
Tom O'Neill
41a91fa3a2
Merge "Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b am: 1684e5f344 am: d28eef0cc2 am: 1f458fdc66 am: d82f8a67fc am: 1ac8affd51 am: 56098f81b6 am: 7cec76de0f am: 2da05d0f9e am: 3b7d90c024 am: f035e8b411 am: 1cc8a2a617" into nyc-mr2-dev-plus-aosp
...
am: 52c35fb3a8
2016-12-22 18:35:18 +00:00
Tom O'Neill
c6d0a44b6d
Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b am: 1684e5f344 am: d28eef0cc2 am: 1f458fdc66 am: d82f8a67fc am: 1ac8affd51 am: 56098f81b6 am: 7cec76de0f am: 2da05d0f9e am: 3b7d90c024 am: f035e8b411 am: 1cc8a2a617
...
am: b14ae0e335
2016-12-22 18:35:08 +00:00
Tom O'Neill
50f36be675
Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b am: 1684e5f344 am: d28eef0cc2 am: 1f458fdc66 am: d82f8a67fc am: 1ac8affd51 am: 56098f81b6 am: 7cec76de0f am: 2da05d0f9e am: 3b7d90c024 am: f035e8b411 am: 8dc64b729b
...
am: a72e75213f
2016-12-22 18:33:42 +00:00
