OSDN Git Service
TreeHugger Robot [Wed, 28 Dec 2016 00:41:31 +0000 (00:41 +0000)]
Merge "Fix settings shell command"
TreeHugger Robot [Wed, 28 Dec 2016 00:33:12 +0000 (00:33 +0000)]
Merge "Add VisualVoicemailService"
TreeHugger Robot [Wed, 28 Dec 2016 00:02:47 +0000 (00:02 +0000)]
Merge "Make classes non-final so mockito can mock them."
Adrian Roos [Tue, 27 Dec 2016 23:57:55 +0000 (23:57 +0000)]
Merge "Ambient Display: Fix race with coloring and redaction" into nyc-mr2-dev am:
02f07cce35
am:
99a921a272
Change-Id: Ic2cb9f827131aeb44a330e51516401bc0808e8d5
Adrian Roos [Tue, 27 Dec 2016 23:56:47 +0000 (23:56 +0000)]
Ambient Display: Fix race with coloring and redaction am:
e5726a2082
am:
dff956b0e0
Change-Id: I18d7da64d56f70923926df6231472a2c3a909f15
Adrian Roos [Tue, 27 Dec 2016 23:49:53 +0000 (23:49 +0000)]
Merge "Ambient Display: Fix race with coloring and redaction" into nyc-mr2-dev
am:
02f07cce35
Change-Id: I3890e276ab985977f7e02d77c91c403700c254d6
Adrian Roos [Tue, 27 Dec 2016 23:49:46 +0000 (23:49 +0000)]
Ambient Display: Fix race with coloring and redaction
am:
e5726a2082
Change-Id: I9c2c42692f01b7665fb11d6e0f47c707d3c630fc
Adrian Roos [Tue, 27 Dec 2016 23:37:27 +0000 (23:37 +0000)]
Merge "Keyguard: Don't lock on SIM removed during shutdown" into nyc-mr2-dev am:
52133e6916
am:
656f7e2090
Change-Id: Ibb71a72da783a03bb9fe96c8dc968402ce45b38a
Adrian Roos [Tue, 27 Dec 2016 23:36:56 +0000 (23:36 +0000)]
Merge "Ambient Display: Fix race with coloring and redaction" into nyc-mr2-dev
Adrian Roos [Tue, 27 Dec 2016 23:36:15 +0000 (23:36 +0000)]
Keyguard: Don't lock on SIM removed during shutdown am:
1f8025adf2
am:
c30dc190ba
Change-Id: Ic0b38d7d66f702241ee1d9df7e433076cc40485e
Adrian Roos [Tue, 27 Dec 2016 23:29:54 +0000 (23:29 +0000)]
Merge "Keyguard: Don't lock on SIM removed during shutdown" into nyc-mr2-dev
am:
52133e6916
Change-Id: I9fe96a428c918f1fc250b021ddd4d1c6fbdd061b
Adrian Roos [Tue, 27 Dec 2016 23:29:47 +0000 (23:29 +0000)]
Keyguard: Don't lock on SIM removed during shutdown
am:
1f8025adf2
Change-Id: I22b34aa27c6540bf661081950a51eb275894c032
Adrian Roos [Tue, 27 Dec 2016 23:20:43 +0000 (23:20 +0000)]
Merge "Keyguard: Don't lock on SIM removed during shutdown" into nyc-mr2-dev
Svetoslav Ganov [Tue, 27 Dec 2016 23:04:24 +0000 (15:04 -0800)]
Fix settings shell command
Test: run shell commands and verified result
Change-Id: I24e87a0efa9330a5872d300e17083d320fcc0573
Fan Zhang [Tue, 27 Dec 2016 21:13:00 +0000 (13:13 -0800)]
Make classes non-final so mockito can mock them.
Bug:
33341275
Test: RunSettingsRoboTests
Change-Id: If83180d7caf3af29c9d0dcdc20d557d8d9827c74
Jean-Michel Trivi [Tue, 27 Dec 2016 19:48:33 +0000 (19:48 +0000)]
Merge "Do not translate system-reserved stream type names"
Selim Cinek [Tue, 27 Dec 2016 19:30:06 +0000 (19:30 +0000)]
Merge "DO NOT MERGE Revert "Add Brightness setting for VR Mode."" into nyc-mr2-dev am:
cbb057d3da
am:
cbffdfabea -s ours
Change-Id: I325c4da2f9a6605f7c9edb4b95d5f12770849e14
Selim Cinek [Tue, 27 Dec 2016 19:29:00 +0000 (19:29 +0000)]
DO NOT MERGE Revert "Add Brightness setting for VR Mode." am:
966045d070
am:
7e5cff0167 -s ours
Change-Id: Id97065997a9e4d296c7b86fb910fc0b86e2feef4
Selim Cinek [Tue, 27 Dec 2016 19:22:10 +0000 (19:22 +0000)]
Merge "DO NOT MERGE Revert "Add Brightness setting for VR Mode."" into nyc-mr2-dev
am:
cbb057d3da
Change-Id: I2c4f83b83dfa685c8b838b9206e26231a0b9aac0
Selim Cinek [Tue, 27 Dec 2016 19:22:04 +0000 (19:22 +0000)]
DO NOT MERGE Revert "Add Brightness setting for VR Mode."
am:
966045d070
Change-Id: Ib1be78a47f5947f4fcc6eabc2f6af76523690ed9
TreeHugger Robot [Tue, 27 Dec 2016 19:08:55 +0000 (19:08 +0000)]
Merge "DO NOT MERGE Revert "Add Brightness setting for VR Mode."" into nyc-mr2-dev
TreeHugger Robot [Tue, 27 Dec 2016 19:02:19 +0000 (19:02 +0000)]
Merge "Revert "Add Brightness setting for VR Mode.""
Selim Cinek [Tue, 27 Dec 2016 11:06:35 +0000 (11:06 +0000)]
DO NOT MERGE Revert "Add Brightness setting for VR Mode."
This reverts commit
84980c7a93e93e7134c0198212e222e11eb5ccbd.
Bug:
33895226
Bug:
30984614
Change-Id: I2652e77512bc870190e2172a629abac9341b2c4f
Ian Pedowitz [Tue, 27 Dec 2016 17:33:57 +0000 (17:33 +0000)]
Revert "Add Brightness setting for VR Mode."
This reverts commit
c7e853f51110b9b6893d526f1f7340b2966f928a.
Bug:
33895226
Bug:
30984614
Change-Id: Icca320e02651b7dd7b8db84ab414f41edee32760
Adrian Roos [Tue, 27 Dec 2016 18:12:13 +0000 (10:12 -0800)]
Keyguard: Don't lock on SIM removed during shutdown
Fixes a glitch where the SIM is considered removed because
we turn off the radio during shutdown.
Change-Id: Id783114f557b87051b833ea84cecc862f910c6ca
Fixes:
33788000
Jorim Jaggi [Tue, 27 Dec 2016 16:44:55 +0000 (16:44 +0000)]
Merge "Fix window transformation related issue" am:
8760e60da5 am:
1200cfb48d am:
a4a4cfc8f5
am:
8d4fa7f6b6
Change-Id: Icd2d42a026c4f514cc3efbd5883fcf4a0ee7d0e2
Jorim Jaggi [Tue, 27 Dec 2016 16:37:50 +0000 (16:37 +0000)]
Merge "Fix window transformation related issue" am:
8760e60da5 am:
1200cfb48d
am:
a4a4cfc8f5
Change-Id: Ib6a4dcb09317891decacff94340ac8b015b8db74
Jorim Jaggi [Tue, 27 Dec 2016 16:32:24 +0000 (16:32 +0000)]
Merge "Fix window transformation related issue" am:
8760e60da5
am:
1200cfb48d
Change-Id: I6a105898193544119e3ca7a911faed67e46e539d
Jorim Jaggi [Tue, 27 Dec 2016 16:23:49 +0000 (16:23 +0000)]
Merge "Fix window transformation related issue"
am:
8760e60da5
Change-Id: I686b637ea76402c4d4c666b60ece83755a24a5d1
Jorim Jaggi [Tue, 27 Dec 2016 16:08:43 +0000 (16:08 +0000)]
Merge "Fix window transformation related issue"
Jean-Michel Trivi [Mon, 26 Dec 2016 23:20:21 +0000 (15:20 -0800)]
New player type values for Open SL ES
Define new player types to describe the two types of AudioPlayer
in OpenSL ES: those with a buffer queue source, those that
play from a given URI or FD.
Add a warning in the interface description of AudioService
that changes should be reflected in the native interface too.
Test: make, NDK tests to follow
Bug:
30955183
Change-Id: I7b530ea6e3b13f238f662ce8b9612e7df574a9c5
Jean-Michel Trivi [Fri, 23 Dec 2016 01:11:12 +0000 (17:11 -0800)]
Do not translate system-reserved stream type names
Do not translate the names of stream types that are reserved
for the internal workings of the audio system, and are
never meant to be read by the end user.
Also fix the string for STREAM_TTS.
Test: make
Bug:
33790976
Change-Id: Ied97b1ad38ad90911ac41ed277a618bc50c531c4
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
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
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
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
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
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
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
Santos Cordon [Thu, 22 Dec 2016 23:58:05 +0000 (23:58 +0000)]
Add Brightness setting for VR Mode.
am:
84980c7a93
Change-Id: I4a9c3db7bdf73e673cf8b2409404339df94086c2
Santos Cordon [Thu, 22 Dec 2016 23:49:16 +0000 (23:49 +0000)]
Merge "Add Brightness setting for VR Mode." into nyc-mr2-dev
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
Santos Cordon [Thu, 22 Dec 2016 23:08:51 +0000 (23:08 +0000)]
Merge "Add Brightness setting for VR Mode."
TreeHugger Robot [Thu, 22 Dec 2016 22:39:40 +0000 (22:39 +0000)]
Merge "Adjust tooltip layout"
Jean-Michel Trivi [Thu, 22 Dec 2016 22:08:17 +0000 (22:08 +0000)]
Merge "Notification of playback activity"
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"
TreeHugger Robot [Thu, 22 Dec 2016 21:59:17 +0000 (21:59 +0000)]
Merge "Switch to HIDL service based HAL"
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
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
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
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
Treehugger Robot [Thu, 22 Dec 2016 21:29:56 +0000 (21:29 +0000)]
Merge "Add simplified_network_settings_bool to CarrierConfig."
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
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
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
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
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
TreeHugger Robot [Thu, 22 Dec 2016 21:11:35 +0000 (21:11 +0000)]
Merge "Restoring last focused view when teleporting to a cluster."
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
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
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
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
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
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
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
Alex Klyubin [Thu, 22 Dec 2016 20:56:56 +0000 (20:56 +0000)]
Merge "resolve merge conflicts of
b53d984 to master"
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
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
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
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
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
Treehugger Robot [Thu, 22 Dec 2016 20:41:01 +0000 (20:41 +0000)]
Merge "HwBinder: fail gracefully for device w/o hwbinder"
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
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
Meng Wang [Thu, 22 Dec 2016 20:03:39 +0000 (20:03 +0000)]
Merge "Add API for reporting IMS registration failures"
TreeHugger Robot [Thu, 22 Dec 2016 20:01:56 +0000 (20:01 +0000)]
Merge "Add simplified_network_settings_bool to CarrierConfig."
Alex Klyubin [Thu, 22 Dec 2016 20:00:24 +0000 (12:00 -0800)]
resolve merge conflicts of
b53d984 to master
Change-Id: I3fe63a5c0193c720b8ec4ca53834096de8433f26
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Alex Klyubin [Thu, 22 Dec 2016 19:20:26 +0000 (11:20 -0800)]
resolve merge conflicts of
a9888fc to master
Change-Id: I6ad00bf5bc1b18406b7fc8969c35bf7970fd1967
Sundeep Ghuman [Thu, 22 Dec 2016 19:16:13 +0000 (19:16 +0000)]
Merge "Fix failing WifiNetworkScoreCacheTest." am:
5e055b6a18
am:
80f1e2e52a
Change-Id: I08fe2e52a4926dc3d2fae02bf90c3fcf5b60ee82
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
Jeremy Joslin [Thu, 22 Dec 2016 19:12:47 +0000 (19:12 +0000)]
Merge changes I40f055df,I562713df am:
4a04c07df4
am:
8eff13b521
Change-Id: I758eaa79b9707073fcfea1454e59c48c58a80e4d
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
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
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
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
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
OSDN Git Service
