OSDN Git Service

android-x86/frameworks-base.git
7 years agoSend RECOMMEND_NETWORKS action when binding to provider.
Joe LaPenna [Tue, 27 Dec 2016 22:50:14 +0000 (14:50 -0800)]
Send RECOMMEND_NETWORKS action when binding to provider.

Some services use action to disambiguate which binder to return in
onBind.

Test: built && installed && bound.
BUG: 33905890
Change-Id: I83ae41b472c597661b93f5467b64b258e9056f5f

7 years agoRemove redundant public modifiers in interfaces.
Niels Egberts [Fri, 23 Dec 2016 12:18:22 +0000 (12:18 +0000)]
Remove redundant public modifiers in interfaces.

Also applied formatter on modified lines.

Test: refactoring CL. Existing unit tests still pass.
Change-Id: I9a7c33e7590260ede0811dd1b50b565b0f8d2f87

7 years agoDon't loop forever on zero-length ICMPv6 ND options. am: 2f157c421a
Lorenzo Colitti [Fri, 23 Dec 2016 08:32:03 +0000 (08:32 +0000)]
Don't loop forever on zero-length ICMPv6 ND options. am: 2f157c421a
am: 9bfda163e2

Change-Id: Ice002fa65828eb738323425597dec1549c0f9a42

7 years agoDon't loop forever on zero-length ICMPv6 ND options.
Lorenzo Colitti [Fri, 23 Dec 2016 08:26:29 +0000 (08:26 +0000)]
Don't loop forever on zero-length ICMPv6 ND options.
am: 2f157c421a

Change-Id: Id8fbe5361b8a826677638213eed565be333f2c4d

7 years agoDon't loop forever on zero-length ICMPv6 ND options.
Lorenzo Colitti [Fri, 23 Dec 2016 04:54:50 +0000 (13:54 +0900)]
Don't loop forever on zero-length ICMPv6 ND options.

Bug: 33828433
Change-Id: Ie1905167126c8c8f3896eaa5e36cd006ca354e99

7 years agoMerge "Add Brightness setting for VR Mode." into nyc-mr2-dev am: cfdf27f24b
Santos Cordon [Fri, 23 Dec 2016 00:10:04 +0000 (00:10 +0000)]
Merge "Add Brightness setting for VR Mode." into nyc-mr2-dev am: cfdf27f24b
am: 13d418bea8  -s ours

Change-Id: I7d17f24018e646e96ce74bbd826345bea7b5560d

7 years agoAdd Brightness setting for VR Mode. am: 84980c7a93
Santos Cordon [Fri, 23 Dec 2016 00:09:04 +0000 (00:09 +0000)]
Add Brightness setting for VR Mode. am: 84980c7a93
am: 84334e25cd  -s ours

Change-Id: I89de340dc25d767f49d163db00fcc3837f71963e

7 years agoMerge "Add Brightness setting for VR Mode." into nyc-mr2-dev
Santos Cordon [Thu, 22 Dec 2016 23:58:15 +0000 (23:58 +0000)]
Merge "Add Brightness setting for VR Mode." into nyc-mr2-dev
am: cfdf27f24b

Change-Id: I1edc922f659f83f36102a3e6d3e36e2a6f74716f

7 years agoAdd Brightness setting for VR Mode.
Santos Cordon [Thu, 22 Dec 2016 23:58:05 +0000 (23:58 +0000)]
Add Brightness setting for VR Mode.
am: 84980c7a93

Change-Id: I4a9c3db7bdf73e673cf8b2409404339df94086c2

7 years agoMerge "Add Brightness setting for VR Mode." into nyc-mr2-dev
Santos Cordon [Thu, 22 Dec 2016 23:49:16 +0000 (23:49 +0000)]
Merge "Add Brightness setting for VR Mode." into nyc-mr2-dev

7 years agoAdd Brightness setting for VR Mode.
Santos Cordon [Tue, 20 Sep 2016 22:50:35 +0000 (15:50 -0700)]
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
Merged-In: Ie5578bbd6ea346f0eb34fe4abbfd604a5d7c0c93
Change-Id: Ie5578bbd6ea346f0eb34fe4abbfd604a5d7c0c93

7 years agoMerge "Add Brightness setting for VR Mode."
Santos Cordon [Thu, 22 Dec 2016 23:08:51 +0000 (23:08 +0000)]
Merge "Add Brightness setting for VR Mode."

7 years agoMerge "Adjust tooltip layout"
TreeHugger Robot [Thu, 22 Dec 2016 22:39:40 +0000 (22:39 +0000)]
Merge "Adjust tooltip layout"

7 years agoMerge "Notification of playback activity"
Jean-Michel Trivi [Thu, 22 Dec 2016 22:08:17 +0000 (22:08 +0000)]
Merge "Notification of playback activity"

7 years agoMerge "Merge "Add simplified_network_settings_bool to CarrierConfig." am: 4ce798f45f...
Android Build Merger (Role) [Thu, 22 Dec 2016 21:59:26 +0000 (21:59 +0000)]
Merge "Merge "Add simplified_network_settings_bool to CarrierConfig." am: 4ce798f45f am: 6f87331902 am: 715acea102 am: dfee8e5f2d  -s ours"

7 years agoMerge "Switch to HIDL service based HAL"
TreeHugger Robot [Thu, 22 Dec 2016 21:59:17 +0000 (21:59 +0000)]
Merge "Switch to HIDL service based HAL"

7 years agoMerge "Add simplified_network_settings_bool to CarrierConfig." am: 4ce798f45f am...
Joe LaPenna [Thu, 22 Dec 2016 21:58:32 +0000 (21:58 +0000)]
Merge "Add simplified_network_settings_bool to CarrierConfig." am: 4ce798f45f am: 6f87331902 am: 715acea102
am: dfee8e5f2d  -s ours

Change-Id: I20a62e19cd4c7645122822da41a3693f4fc584f8

7 years agoMerge "Add simplified_network_settings_bool to CarrierConfig." am: 4ce798f45f am...
Joe LaPenna [Thu, 22 Dec 2016 21:51:57 +0000 (21:51 +0000)]
Merge "Add simplified_network_settings_bool to CarrierConfig." am: 4ce798f45f am: 6f87331902
am: 715acea102

Change-Id: I44bc0113697be113ef79ac9a904485b49bed2f87

7 years agoMerge "Add simplified_network_settings_bool to CarrierConfig." am: 4ce798f45f
Joe LaPenna [Thu, 22 Dec 2016 21:47:00 +0000 (21:47 +0000)]
Merge "Add simplified_network_settings_bool to CarrierConfig." am: 4ce798f45f
am: 6f87331902

Change-Id: I3681893e43949060922f72c65f8f106090005d14

7 years agoMerge "Add simplified_network_settings_bool to CarrierConfig."
Joe LaPenna [Thu, 22 Dec 2016 21:41:23 +0000 (21:41 +0000)]
Merge "Add simplified_network_settings_bool to CarrierConfig."
am: 4ce798f45f

Change-Id: I7343422cd3405628d6c2b90092af631b77eb37a7

7 years agoMerge "Add simplified_network_settings_bool to CarrierConfig."
Treehugger Robot [Thu, 22 Dec 2016 21:29:56 +0000 (21:29 +0000)]
Merge "Add simplified_network_settings_bool to CarrierConfig."

7 years agoRevert "DO NOT MERGE: Add API to indicate carrier networks."
pkanwar [Thu, 22 Dec 2016 21:26:42 +0000 (21:26 +0000)]
Revert "DO NOT MERGE: Add API to indicate carrier networks."
am: d3d5cb4645  -s ours

Change-Id: Ib3f0dd6b10eeb94032cca51371db753dd8ed9bb9

7 years agoAdjust tooltip layout
Vladislav Kaznacheev [Tue, 6 Dec 2016 22:30:17 +0000 (14:30 -0800)]
Adjust tooltip layout

Position a mouse hover tooltip closer to the target.
Limit tooltip width and make it multiline (maxLines=3).
Show a long press tooltip above the target, not below.

Bug: 33352391
Bug: 33353823
Bug: 33354000

Test: manual
Change-Id: Ie00353d715d73d432b5d892a0a7c04508a003a78

7 years agoRevert "DO NOT MERGE: Add API to indicate carrier networks."
pkanwar [Thu, 22 Dec 2016 21:16:53 +0000 (13:16 -0800)]
Revert "DO NOT MERGE: Add API to indicate carrier networks."

These changes are not applicable for aosp and will be implemented in
master.

This reverts commit 9f47a5d85eca1f93833b328dea3d31fc36d79591.

Bug: 31003437

7 years agoMerge "Fix a bug where the package stats query timeout may crash." into nyc-mr2-dev...
Daniel Nishi [Thu, 22 Dec 2016 21:16:42 +0000 (21:16 +0000)]
Merge "Fix a bug where the package stats query timeout may crash." into nyc-mr2-dev am: dfe1bc2f34
am: 70eb66a904

Change-Id: I46f86f7c166ebf91723675467847d2ff472164b2

7 years agoFix a bug where the package stats query timeout may crash. am: cf76a16e66
Daniel Nishi [Thu, 22 Dec 2016 21:15:43 +0000 (21:15 +0000)]
Fix a bug where the package stats query timeout may crash. am: cf76a16e66
am: e76b9dcb62

Change-Id: I341041c0edec8706cc449527b1dd130384a4ab01

7 years agoMerge "Restoring last focused view when teleporting to a cluster."
TreeHugger Robot [Thu, 22 Dec 2016 21:11:35 +0000 (21:11 +0000)]
Merge "Restoring last focused view when teleporting to a cluster."

7 years agoMerge "Fix a bug where the package stats query timeout may crash." into nyc-mr2-dev
Daniel Nishi [Thu, 22 Dec 2016 21:10:00 +0000 (21:10 +0000)]
Merge "Fix a bug where the package stats query timeout may crash." into nyc-mr2-dev
am: dfe1bc2f34

Change-Id: I1c06fad6316f3cc34b917cbbf359d838e01d650e

7 years agoFix a bug where the package stats query timeout may crash.
Daniel Nishi [Thu, 22 Dec 2016 21:09:53 +0000 (21:09 +0000)]
Fix a bug where the package stats query timeout may crash.
am: cf76a16e66

Change-Id: Ibc146f89412387eb05a164c2a1969210fcea4262

7 years agoMerge "HwBinder: fail gracefully for device w/o hwbinder" am: 380697ca79 am: b6022b9f...
Steven Moreland [Thu, 22 Dec 2016 21:09:19 +0000 (21:09 +0000)]
Merge "HwBinder: fail gracefully for device w/o hwbinder" am: 380697ca79 am: b6022b9fa0 am: 5e1efa2cc7
am: 8b775f96b9

Change-Id: I9a9d8f353055362d8c9cd85cde56fce9ab56852f

7 years agoMerge "DO NOT MERGE: Add UI toggle to control connections to carrier networks." into...
Pankaj Kanwar [Thu, 22 Dec 2016 21:06:21 +0000 (21:06 +0000)]
Merge "DO NOT MERGE: Add UI toggle to control connections to carrier networks." into nyc-mr2-dev am: f6d8e1f635
am: 55a0803234  -s ours

Change-Id: Ic188d4136d408214fd3f537c961183bbdd32bede

7 years agoDO NOT MERGE: Add UI toggle to control connections to carrier networks. am: 57f383709b
pkanwar [Thu, 22 Dec 2016 21:05:25 +0000 (21:05 +0000)]
DO NOT MERGE: Add UI toggle to control connections to carrier networks. am: 57f383709b
am: 21f8870abc  -s ours

Change-Id: Ia87b47762c4176e28a0733214ac6fc29d89eb7b6

7 years agoMerge "Fix a bug where the package stats query timeout may crash." into nyc-mr2-dev
TreeHugger Robot [Thu, 22 Dec 2016 21:03:00 +0000 (21:03 +0000)]
Merge "Fix a bug where the package stats query timeout may crash." into nyc-mr2-dev

7 years agoMerge "HwBinder: fail gracefully for device w/o hwbinder" am: 380697ca79 am: b6022b9fa0
Steven Moreland [Thu, 22 Dec 2016 20:58:54 +0000 (20:58 +0000)]
Merge "HwBinder: fail gracefully for device w/o hwbinder" am: 380697ca79 am: b6022b9fa0
am: 5e1efa2cc7

Change-Id: I190fab7adf1222c71d6d5d71ab8cbe2928600a34

7 years agoMerge "resolve merge conflicts of b53d984 to master"
Alex Klyubin [Thu, 22 Dec 2016 20:56:56 +0000 (20:56 +0000)]
Merge "resolve merge conflicts of b53d984 to master"

7 years agoMerge "DO NOT MERGE: Add UI toggle to control connections to carrier networks." into...
Pankaj Kanwar [Thu, 22 Dec 2016 20:54:11 +0000 (20:54 +0000)]
Merge "DO NOT MERGE: Add UI toggle to control connections to carrier networks." into nyc-mr2-dev
am: f6d8e1f635

Change-Id: I1412b56245583d65f382613fd466ede1efaa298f

7 years agoDO NOT MERGE: Add UI toggle to control connections to carrier networks.
pkanwar [Thu, 22 Dec 2016 20:53:58 +0000 (20:53 +0000)]
DO NOT MERGE: Add UI toggle to control connections to carrier networks.
am: 57f383709b

Change-Id: Ieb3aa3a0755bcd16759d91852980bcdf5373eaa8

7 years agoMerge "HwBinder: fail gracefully for device w/o hwbinder" am: 380697ca79
Steven Moreland [Thu, 22 Dec 2016 20:53:52 +0000 (20:53 +0000)]
Merge "HwBinder: fail gracefully for device w/o hwbinder" am: 380697ca79
am: b6022b9fa0

Change-Id: I7135d790ed299f21975c5b27b534714d83ccf440

7 years agoMerge "HwBinder: fail gracefully for device w/o hwbinder"
Steven Moreland [Thu, 22 Dec 2016 20:48:17 +0000 (20:48 +0000)]
Merge "HwBinder: fail gracefully for device w/o hwbinder"
am: 380697ca79

Change-Id: I301b1f9e9344a8b314a6debff3fef2e7c8362f1a

7 years agoMerge "DO NOT MERGE: Add UI toggle to control connections to carrier networks." into...
Pankaj Kanwar [Thu, 22 Dec 2016 20:41:54 +0000 (20:41 +0000)]
Merge "DO NOT MERGE: Add UI toggle to control connections to carrier networks." into nyc-mr2-dev

7 years agoMerge "HwBinder: fail gracefully for device w/o hwbinder"
Treehugger Robot [Thu, 22 Dec 2016 20:41:01 +0000 (20:41 +0000)]
Merge "HwBinder: fail gracefully for device w/o hwbinder"

7 years agoSwitch to HIDL service based HAL
Ashutosh Joshi [Wed, 23 Nov 2016 21:56:39 +0000 (13:56 -0800)]
Switch to HIDL service based HAL

Switch to using HIDL service based HAL.
Some cleanup.

Test: GTS tests pass

Change-Id: Icf133fe4ead56336973dc50c4ec2aab18382a8ca

7 years agoAdd Brightness setting for VR Mode.
Santos Cordon [Tue, 20 Sep 2016 22:50:35 +0000 (15:50 -0700)]
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

7 years agoMerge "Add API for reporting IMS registration failures"
Meng Wang [Thu, 22 Dec 2016 20:03:39 +0000 (20:03 +0000)]
Merge "Add API for reporting IMS registration failures"

7 years agoMerge "Add simplified_network_settings_bool to CarrierConfig."
TreeHugger Robot [Thu, 22 Dec 2016 20:01:56 +0000 (20:01 +0000)]
Merge "Add simplified_network_settings_bool to CarrierConfig."

7 years agoresolve merge conflicts of b53d984 to master
Alex Klyubin [Thu, 22 Dec 2016 20:00:24 +0000 (12:00 -0800)]
resolve merge conflicts of b53d984 to master

Change-Id: I3fe63a5c0193c720b8ec4ca53834096de8433f26

7 years agoAdd simplified_network_settings_bool to CarrierConfig.
Joe LaPenna [Thu, 22 Dec 2016 04:17:08 +0000 (20:17 -0800)]
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

7 years agoMerge "Fix failing WifiNetworkScoreCacheTest." am: 5e055b6a18 am: 80f1e2e52a am:...
Sundeep Ghuman [Thu, 22 Dec 2016 19:42:28 +0000 (19:42 +0000)]
Merge "Fix failing WifiNetworkScoreCacheTest." am: 5e055b6a18 am: 80f1e2e52a am: 43e86c1ca6
am: f44bea51fb

Change-Id: Ia1ce5ee294b75f5169926492749e31e8a62825a7

7 years agoMerge "Cherrypick: Define the calculateRankingScore method and Key." am: 425af45d02...
Sundeep Ghuman [Thu, 22 Dec 2016 19:41:08 +0000 (19:41 +0000)]
Merge "Cherrypick: Define the calculateRankingScore method and Key." am: 425af45d02 am: 41577a0029 am: bfc0bfe645
am: 4ac2f9f53e  -s ours

Change-Id: I14ab253fa2748f343531a283ce34df57c2d2eb0e

7 years agoMerge changes I40f055df,I562713df am: 4a04c07df4 am: 8eff13b521 am: deddce7ff6
Jeremy Joslin [Thu, 22 Dec 2016 19:38:59 +0000 (19:38 +0000)]
Merge changes I40f055df,I562713df am: 4a04c07df4 am: 8eff13b521 am: deddce7ff6
am: 10524f61f5  -s ours

Change-Id: I6706e4d3c292a00b47ea6fe835aa986c72e98350

7 years agoStay bound to the most current active scorer. am: b1365852cc am: d79019a616 am: 26817...
Jeremy Joslin [Thu, 22 Dec 2016 19:37:49 +0000 (19:37 +0000)]
Stay bound to the most current active scorer. am: b1365852cc am: d79019a616 am: 268176317b
am: 7d26ab59cd  -s ours

Change-Id: I15813561ed89e8b3f8c434a5ec2246d5cb50fab0

7 years agoClear and restore the calling ID. am: 29ed4a99bf am: 3588b8d44c am: 3f32d12be0
Jeremy Joslin [Thu, 22 Dec 2016 19:36:38 +0000 (19:36 +0000)]
Clear and restore the calling ID. am: 29ed4a99bf am: 3588b8d44c am: 3f32d12be0
am: 7af07643f3  -s ours

Change-Id: I09464c8037545f80d9a78f5f2e7b5bfc3ce65ea0

7 years agoMerge "Make users of MtpServer fill in DeviceInfo field values" am: 933ea68aca am...
Alex Klyubin [Thu, 22 Dec 2016 19:32:47 +0000 (19:32 +0000)]
Merge "Make users of MtpServer fill in DeviceInfo field values" am: 933ea68aca am: e988e8f1f6
am: 8e23aa4ee6

Change-Id: I13926b884509c4018d8ced24a80acc3e8c2b5d7a

7 years agoFix a bug where the package stats query timeout may crash.
Daniel Nishi [Thu, 22 Dec 2016 19:06:51 +0000 (11:06 -0800)]
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

7 years agoMerge "Fix failing WifiNetworkScoreCacheTest." am: 5e055b6a18 am: 80f1e2e52a
Sundeep Ghuman [Thu, 22 Dec 2016 19:27:29 +0000 (19:27 +0000)]
Merge "Fix failing WifiNetworkScoreCacheTest." am: 5e055b6a18 am: 80f1e2e52a
am: 43e86c1ca6

Change-Id: If7acfafd1cb8e52b778cf8fb347e1a0d509d7f62

7 years agoMerge "Cherrypick: Define the calculateRankingScore method and Key." am: 425af45d02...
Sundeep Ghuman [Thu, 22 Dec 2016 19:26:05 +0000 (19:26 +0000)]
Merge "Cherrypick: Define the calculateRankingScore method and Key." am: 425af45d02 am: 41577a0029
am: bfc0bfe645

Change-Id: Ia3d455791e3f219a3e0cff3b6946184757487d71

7 years agoMerge changes I40f055df,I562713df am: 4a04c07df4 am: 8eff13b521
Jeremy Joslin [Thu, 22 Dec 2016 19:24:17 +0000 (19:24 +0000)]
Merge changes I40f055df,I562713df am: 4a04c07df4 am: 8eff13b521
am: deddce7ff6

Change-Id: I0026c9b1fed0e8eeab95a1d0c03f8235c7643c62

7 years agoMerge "Make users of MtpServer fill in DeviceInfo field values" am: 933ea68aca
Alex Klyubin [Thu, 22 Dec 2016 19:22:46 +0000 (19:22 +0000)]
Merge "Make users of MtpServer fill in DeviceInfo field values" am: 933ea68aca
am: e988e8f1f6

Change-Id: Icce6e31723d4dac12cf2c2e389e69c067dd66a91

7 years agoStay bound to the most current active scorer. am: b1365852cc am: d79019a616
Jeremy Joslin [Thu, 22 Dec 2016 19:22:44 +0000 (19:22 +0000)]
Stay bound to the most current active scorer. am: b1365852cc am: d79019a616
am: 268176317b

Change-Id: I3fcfd02759c9748b4e00a5e825b670259c0d0263

7 years agoClear and restore the calling ID. am: 29ed4a99bf am: 3588b8d44c
Jeremy Joslin [Thu, 22 Dec 2016 19:21:45 +0000 (19:21 +0000)]
Clear and restore the calling ID. am: 29ed4a99bf am: 3588b8d44c
am: 3f32d12be0

Change-Id: I2cbf3ca1ff0a743de1b08fad467027ec59333def

7 years agoresolve merge conflicts of a9888fc to master
Alex Klyubin [Thu, 22 Dec 2016 19:20:26 +0000 (11:20 -0800)]
resolve merge conflicts of a9888fc to master

Change-Id: I6ad00bf5bc1b18406b7fc8969c35bf7970fd1967

7 years agoMerge "Fix failing WifiNetworkScoreCacheTest." am: 5e055b6a18
Sundeep Ghuman [Thu, 22 Dec 2016 19:16:13 +0000 (19:16 +0000)]
Merge "Fix failing WifiNetworkScoreCacheTest." am: 5e055b6a18
am: 80f1e2e52a

Change-Id: I08fe2e52a4926dc3d2fae02bf90c3fcf5b60ee82

7 years agoMerge "Cherrypick: Define the calculateRankingScore method and Key." am: 425af45d02
Sundeep Ghuman [Thu, 22 Dec 2016 19:14:48 +0000 (19:14 +0000)]
Merge "Cherrypick: Define the calculateRankingScore method and Key." am: 425af45d02
am: 41577a0029

Change-Id: I7807d92a705a8ec9d9c7b04159e1cd2290846e38

7 years agoMerge changes I40f055df,I562713df am: 4a04c07df4
Jeremy Joslin [Thu, 22 Dec 2016 19:12:47 +0000 (19:12 +0000)]
Merge changes I40f055df,I562713df am: 4a04c07df4
am: 8eff13b521

Change-Id: I758eaa79b9707073fcfea1454e59c48c58a80e4d

7 years agoDO NOT MERGE: Add UI toggle to control connections to carrier networks.
pkanwar [Thu, 22 Dec 2016 19:12:02 +0000 (11:12 -0800)]
DO NOT MERGE: Add UI toggle to control connections to carrier networks.

Bug: 31003437
Change-Id: I6cf32ae4d376eb65f80492da0922dbecb762c9da

7 years agoStay bound to the most current active scorer. am: b1365852cc
Jeremy Joslin [Thu, 22 Dec 2016 19:11:48 +0000 (19:11 +0000)]
Stay bound to the most current active scorer. am: b1365852cc
am: d79019a616

Change-Id: Ib3c7a4cdaea80ad4ac84c6baa92d879396c0f483

7 years agoClear and restore the calling ID. am: 29ed4a99bf
Jeremy Joslin [Thu, 22 Dec 2016 19:10:46 +0000 (19:10 +0000)]
Clear and restore the calling ID. am: 29ed4a99bf
am: 3588b8d44c

Change-Id: I43b6f2899b5d82d4781937766907d6d7afa6b2bd

7 years agoMerge "Make users of MtpServer fill in DeviceInfo field values"
Alex Klyubin [Thu, 22 Dec 2016 19:10:00 +0000 (19:10 +0000)]
Merge "Make users of MtpServer fill in DeviceInfo field values"
am: 933ea68aca

Change-Id: Iacecf43819f8cd6c0e8df7a53105e0538075c188

7 years agoresolve merge conflicts of febd982 to stage-aosp-master am: 5c53fdb893
Alex Klyubin [Thu, 22 Dec 2016 19:06:09 +0000 (19:06 +0000)]
resolve merge conflicts of febd982 to stage-aosp-master am: 5c53fdb893
am: b824658494

Change-Id: Ic1dd2aef96889f0f68a55093cfb04b4d90f34818

7 years agoMerge "Fix failing WifiNetworkScoreCacheTest."
Sundeep Ghuman [Thu, 22 Dec 2016 19:05:44 +0000 (19:05 +0000)]
Merge "Fix failing WifiNetworkScoreCacheTest."
am: 5e055b6a18

Change-Id: I52e23144730acc15c943fa6485a872a88ee0a787

7 years agoMerge "Cherrypick: Define the calculateRankingScore method and Key."
Sundeep Ghuman [Thu, 22 Dec 2016 19:04:22 +0000 (19:04 +0000)]
Merge "Cherrypick: Define the calculateRankingScore method and Key."
am: 425af45d02

Change-Id: Ib61f91087967f1b026cd2ba77175ccf47943bc53

7 years agoMerge changes I40f055df,I562713df
Jeremy Joslin [Thu, 22 Dec 2016 19:02:45 +0000 (19:02 +0000)]
Merge changes I40f055df,I562713df
am: 4a04c07df4

Change-Id: Ie951518a0a472691d1cd8b90a025e3a67b1acd53

7 years agoStay bound to the most current active scorer.
Jeremy Joslin [Thu, 22 Dec 2016 19:02:38 +0000 (19:02 +0000)]
Stay bound to the most current active scorer.
am: b1365852cc

Change-Id: I8313d23450b47f23f73eb050e6b4244bc0d37622

7 years agoClear and restore the calling ID.
Jeremy Joslin [Thu, 22 Dec 2016 19:01:43 +0000 (19:01 +0000)]
Clear and restore the calling ID.
am: 29ed4a99bf

Change-Id: Ie5752ca772e6f5c8fed8092d23e0604f44598b24

7 years agoresolve merge conflicts of febd982 to stage-aosp-master
Alex Klyubin [Thu, 22 Dec 2016 19:01:13 +0000 (19:01 +0000)]
resolve merge conflicts of febd982 to stage-aosp-master
am: 5c53fdb893

Change-Id: Ib0878f0f17c3799ff9ffb92d7e85904fc91fdab7

7 years agoMerge "Fix exploit where can hide the fact that a location was mocked am: a206a0f17e...
Tom O'Neill [Thu, 22 Dec 2016 18:35:18 +0000 (18:35 +0000)]
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

Change-Id: I4a11e981e063c370d358175d2d1f6396db65ec38

7 years agoFix exploit where can hide the fact that a location was mocked am: a206a0f17e am...
Tom O'Neill [Thu, 22 Dec 2016 18:35:08 +0000 (18:35 +0000)]
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

Change-Id: Ia0f60d68b8eda909c39984a0052ee38141dd5a71

7 years agoFix exploit where can hide the fact that a location was mocked am: a206a0f17e am...
Tom O'Neill [Thu, 22 Dec 2016 18:33:42 +0000 (18:33 +0000)]
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

Change-Id: Ifa88d999c4686e8bf262b822809f37ce5ed0fef6

7 years agoMerge "Add attribute, theme values for error text color"
Alan Viverette [Thu, 22 Dec 2016 18:25:19 +0000 (18:25 +0000)]
Merge "Add attribute, theme values for error text color"

7 years agoMerge "Allow Settings tiles to use content provider data."
Shahriyar Amini [Thu, 22 Dec 2016 18:21:40 +0000 (18:21 +0000)]
Merge "Allow Settings tiles to use content provider data."

7 years agoresolve merge conflicts of febd982 to stage-aosp-master
Alex Klyubin [Thu, 22 Dec 2016 18:20:23 +0000 (10:20 -0800)]
resolve merge conflicts of febd982 to stage-aosp-master

Change-Id: I40c27e3159b8f7acd60c6fa42509bb23d146b937

7 years agoMerge "DO NOT MERGE: Add API to indicate carrier networks." into nyc-mr2-dev am:...
Pankaj Kanwar [Thu, 22 Dec 2016 18:15:53 +0000 (18:15 +0000)]
Merge "DO NOT MERGE: Add API to indicate carrier networks." into nyc-mr2-dev am: 683dbf1fc6
am: b4aa5f6e13  -s ours

Change-Id: I613932ff02241d062008aa943cd8db5f098c78ff

7 years agoMerge "Fix exploit where can hide the fact that a location was mocked am: a206a0f17e...
Android Build Merger (Role) [Thu, 22 Dec 2016 18:15:30 +0000 (18:15 +0000)]
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

7 years agoDO NOT MERGE: Add API to indicate carrier networks. am: 9f47a5d85e
pkanwar [Thu, 22 Dec 2016 18:14:57 +0000 (18:14 +0000)]
DO NOT MERGE: Add API to indicate carrier networks. am: 9f47a5d85e
am: aa4d204be7  -s ours

Change-Id: Ibd92cbc56cac770496cf052aabdcf1950bcc474d

7 years agoFix exploit where can hide the fact that a location was mocked am: a206a0f17e am...
Tom O'Neill [Thu, 22 Dec 2016 18:14:47 +0000 (18:14 +0000)]
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

Change-Id: I6f4da4dfbadd0b484019b918dff8b161cec2c1ed

7 years agoFix exploit where can hide the fact that a location was mocked am: a206a0f17e am...
Tom O'Neill [Thu, 22 Dec 2016 18:14:42 +0000 (18:14 +0000)]
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

Change-Id: I1b83d758c57b21c574de55e4de3a80283d9b7f56

7 years agoFix exploit where can hide the fact that a location was mocked am: a206a0f17e am...
Tom O'Neill [Thu, 22 Dec 2016 18:09:50 +0000 (18:09 +0000)]
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

Change-Id: I6a73e11687db11cd0d6814999e955c20fe7b8ad5

7 years agoFix exploit where can hide the fact that a location was mocked am: a206a0f17e am...
Tom O'Neill [Thu, 22 Dec 2016 18:09:48 +0000 (18:09 +0000)]
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

Change-Id: I0795fffc9f7f79f14038cfb6386bbe308b879db5

7 years agoMerge "DO NOT MERGE: Add API to indicate carrier networks." into nyc-mr2-dev
Pankaj Kanwar [Thu, 22 Dec 2016 18:04:47 +0000 (18:04 +0000)]
Merge "DO NOT MERGE: Add API to indicate carrier networks." into nyc-mr2-dev
am: 683dbf1fc6

Change-Id: If1e5f0f82e18608990500d41211a49e9acbef51f

7 years agoFix exploit where can hide the fact that a location was mocked am: a206a0f17e am...
Tom O'Neill [Thu, 22 Dec 2016 18:04:44 +0000 (18:04 +0000)]
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

Change-Id: I46c1bf565b04175c8c97c9faeceed55bda41dbde

7 years agoDO NOT MERGE: Add API to indicate carrier networks.
pkanwar [Thu, 22 Dec 2016 18:04:42 +0000 (18:04 +0000)]
DO NOT MERGE: Add API to indicate carrier networks.
am: 9f47a5d85e

Change-Id: Ib0ed3283a55ec285cafa1f120a8545956e27c242

7 years agoFix exploit where can hide the fact that a location was mocked am: a206a0f17e am...
Tom O'Neill [Thu, 22 Dec 2016 17:59:47 +0000 (17:59 +0000)]
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

Change-Id: I8c94a06f5fa722312436484609bafcb0585d6d18

7 years agoMerge "DO NOT MERGE: Add API to indicate carrier networks." into nyc-mr2-dev
Pankaj Kanwar [Thu, 22 Dec 2016 17:59:08 +0000 (17:59 +0000)]
Merge "DO NOT MERGE: Add API to indicate carrier networks." into nyc-mr2-dev

7 years agoFix exploit where can hide the fact that a location was mocked am: a206a0f17e am...
Tom O'Neill [Thu, 22 Dec 2016 17:54:44 +0000 (17:54 +0000)]
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

Change-Id: I9168d45717c26e71bb356dd7304276e23c519bd9

7 years agoFix exploit where can hide the fact that a location was mocked am: a206a0f17e am...
Tom O'Neill [Thu, 22 Dec 2016 17:44:46 +0000 (17:44 +0000)]
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

Change-Id: I14fcacaede569580c8ca8e5bbbebb408ddcce76a

7 years agoFix exploit where can hide the fact that a location was mocked am: a206a0f17e am...
Tom O'Neill [Thu, 22 Dec 2016 17:39:18 +0000 (17:39 +0000)]
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

Change-Id: I965c900e266a9189c595612cef6ddac839498949

7 years agoFix exploit where can hide the fact that a location was mocked am: a206a0f17e am...
Tom O'Neill [Thu, 22 Dec 2016 17:34:11 +0000 (17:34 +0000)]
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

Change-Id: I25e43680e464c5169e8a5b9e8151b0dab2d2cf86

7 years agoFix exploit where can hide the fact that a location was mocked am: a206a0f17e am...
Tom O'Neill [Thu, 22 Dec 2016 17:29:05 +0000 (17:29 +0000)]
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

Change-Id: I61d4b25ee0264397693f30e2091997c058d0c5fc

7 years agoFix exploit where can hide the fact that a location was mocked am: a206a0f17e am...
Tom O'Neill [Thu, 22 Dec 2016 17:23:39 +0000 (17:23 +0000)]
Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b am: 1684e5f344
am: d28eef0cc2

Change-Id: If937d91cee2bb06406cf3cd1ae6ac3402a51e88d

7 years agoFix exploit where can hide the fact that a location was mocked am: a206a0f17e am...
Tom O'Neill [Thu, 22 Dec 2016 17:19:10 +0000 (17:19 +0000)]
Fix exploit where can hide the fact that a location was mocked am: a206a0f17e am: d417e54872 am: 3380a77516 am: 0a8978f04b
am: 1684e5f344

Change-Id: I0ebd2856e2e2f3793273ba952b44dc77e85b021e