OSDN Git Service
Ta-wei Yen [Fri, 20 Jan 2017 18:38:31 +0000 (18:38 +0000)]
Merge "Add voicemail backup/restore columns" into nyc-mr2-dev
am:
c1a1348b99
Change-Id: Ifd5116c2d8e44d6f16d6abd76d41fe5aebb28a24
Ta-wei Yen [Fri, 20 Jan 2017 18:38:23 +0000 (18:38 +0000)]
Add voicemail backup/restore columns
am:
f48d5ce630
Change-Id: I2dd76b4107b9e7c75595fa3c49dcda74cebd2a09
Ta-wei Yen [Fri, 20 Jan 2017 18:31:41 +0000 (18:31 +0000)]
Merge "Add voicemail backup/restore columns" into nyc-mr2-dev
Fyodor Kupolov [Fri, 20 Jan 2017 18:23:20 +0000 (18:23 +0000)]
Merge "[DO NOT MERGE] Do not report boot timings on first boot or runtime restart" into nyc-mr2-dev
am:
1dcfc423cd
Change-Id: I00117f3c0ac6d9bae5650dceea182790ed43bb1c
Fyodor Kupolov [Fri, 20 Jan 2017 18:23:16 +0000 (18:23 +0000)]
[DO NOT MERGE] Do not report boot timings on first boot or runtime restart
am:
83a218c416
Change-Id: Ib503ffb8d0d718aa6af4b420cc71e32a033e658b
Fyodor Kupolov [Fri, 20 Jan 2017 18:17:58 +0000 (18:17 +0000)]
Merge "[DO NOT MERGE] Do not report boot timings on first boot or runtime restart" into nyc-mr2-dev
Fyodor Kupolov [Thu, 19 Jan 2017 20:11:32 +0000 (12:11 -0800)]
[DO NOT MERGE] Do not report boot timings on first boot or runtime restart
During first boot after OTA, additional dexopting has to be done
during PM initialization. Timings for OTA are reported separately,
so we should ignore first boot to avoid skewing the metrics.
The following metrics were updated:
- framework_locked_boot_completed
- framework_boot_completed
Cherry-picked from commit
1d87e40d4214a7f6d20a58d6f27cca174f0d974e
Test: manual
Bug:
32807863
Change-Id: I9d545cf38118f45f3f13597df2949d0ae4abd26a
Erik Kline [Fri, 20 Jan 2017 10:21:20 +0000 (10:21 +0000)]
Merge "Refactor to SimChangeListener class" am:
a12217012e am:
74247b4ee8
am:
6dacd5ecf2
Change-Id: Ia80e64c9f1188953aa4d9687bc7b0b0659de968a
Erik Kline [Fri, 20 Jan 2017 10:16:56 +0000 (10:16 +0000)]
Merge "Refactor to SimChangeListener class" am:
a12217012e
am:
74247b4ee8
Change-Id: I59dc854bd74eb8ba6addae90a4a87453868b5368
Erik Kline [Fri, 20 Jan 2017 10:14:50 +0000 (10:14 +0000)]
Merge "Address comments from previous change (320592)" am:
e7cb6c3761 am:
b6f606b59f
am:
454a408717
Change-Id: I374c8c63e4fb3310c3c50cc531a65005991c2fe2
Erik Kline [Fri, 20 Jan 2017 10:13:08 +0000 (10:13 +0000)]
Merge "Refactor to SimChangeListener class"
am:
a12217012e
Change-Id: I863f0b23251a0ebd18a76cf08e1ff0f2cee9cda3
Erik Kline [Fri, 20 Jan 2017 10:10:52 +0000 (10:10 +0000)]
Merge "Address comments from previous change (320592)" am:
e7cb6c3761
am:
b6f606b59f
Change-Id: Icc5aa3d6cafd9829e65a0e82523727a9aba4ade5
Treehugger Robot [Fri, 20 Jan 2017 10:05:50 +0000 (10:05 +0000)]
Merge "Refactor to SimChangeListener class"
Erik Kline [Fri, 20 Jan 2017 10:04:51 +0000 (10:04 +0000)]
Merge "Address comments from previous change (320592)"
am:
e7cb6c3761
Change-Id: I3266a02a4a2fd76c4bb2f1a744103add63307e26
Treehugger Robot [Fri, 20 Jan 2017 09:57:26 +0000 (09:57 +0000)]
Merge "Address comments from previous change (320592)"
Lorenzo Colitti [Fri, 20 Jan 2017 09:02:50 +0000 (09:02 +0000)]
Merge "Don't loop forever on zero-length ICMPv6 ND options." am:
e7128b10a8 am:
113d5f8f40
am:
6bcbb16630
Change-Id: I38ba45068c00c0948f561a788a7015ed250d62b6
Lorenzo Colitti [Fri, 20 Jan 2017 08:58:47 +0000 (08:58 +0000)]
Merge "Don't loop forever on zero-length ICMPv6 ND options." am:
e7128b10a8
am:
113d5f8f40
Change-Id: Ic2d6596d14f6176a823fd66b400af8515617c66d
Lorenzo Colitti [Fri, 20 Jan 2017 08:54:42 +0000 (08:54 +0000)]
Merge "Don't loop forever on zero-length ICMPv6 ND options."
am:
e7128b10a8
Change-Id: If2260dd2b1bdaf2619cee668f8c2ef81e9dcfdce
Treehugger Robot [Fri, 20 Jan 2017 08:47:17 +0000 (08:47 +0000)]
Merge "Don't loop forever on zero-length ICMPv6 ND options."
Erik Kline [Tue, 17 Jan 2017 08:31:26 +0000 (17:31 +0900)]
Refactor to SimChangeListener class
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameswork-net passes
- tested wifi-to-mobile tethering, including SIM remove/insert
Bug:
32163131
Change-Id: I6aac9a8f34cfd0079a4433471ec08b9b1ec0d754
Hugo Benichi [Fri, 20 Jan 2017 07:59:43 +0000 (07:59 +0000)]
Merge "DO NOT MERGE Unit tests for NetworkNotificationManager" am:
216a4e7655 -s ours am:
feca77b884 -s ours
am:
4c2371db6b
Change-Id: I78a3f6ffb4e1906906bf218dd11c8f65c5d3c96b
Hugo Benichi [Fri, 20 Jan 2017 07:55:35 +0000 (07:55 +0000)]
Merge "DO NOT MERGE Unit tests for NetworkNotificationManager" am:
216a4e7655 -s ours
am:
feca77b884 -s ours
Change-Id: I847fe5f04ebf8b5634c3ae0974e69d50cef9df76
Hugo Benichi [Fri, 20 Jan 2017 07:51:31 +0000 (07:51 +0000)]
Merge "DO NOT MERGE Unit tests for NetworkNotificationManager"
am:
216a4e7655 -s ours
Change-Id: I05fe9095395df00b96df3cbe3a6e4f31a160e0b5
Hugo Benichi [Fri, 20 Jan 2017 07:44:29 +0000 (07:44 +0000)]
Merge "DO NOT MERGE Unit tests for NetworkNotificationManager"
Erik Kline [Fri, 20 Jan 2017 07:31:29 +0000 (16:31 +0900)]
Address comments from previous change (320592)
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
- vanilla wifi-to-mobile tethering works
Bug:
32163131
Change-Id: I8788cb0d93606a2893c3dbc4f22e72f450f319b8
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
(cherry picked from commit
2f157c421a9fa15660b8f1bc0c64b1ebb45fa64a)
Change-Id: Icc03f0fcbf40d87e0b9c69e1172802ffcc85531b
Erik Kline [Fri, 20 Jan 2017 06:37:37 +0000 (06:37 +0000)]
Merge "BroadcastReceiver refactoring" am:
73a57bb9da am:
bcdd7475e5
am:
2d49de42b8
Change-Id: I7c1c3ff3a278c536f2483ce5bd58360ab3bbe2cf
Erik Kline [Fri, 20 Jan 2017 06:33:39 +0000 (06:33 +0000)]
Merge "BroadcastReceiver refactoring" am:
73a57bb9da
am:
bcdd7475e5
Change-Id: I213f5af2393d3fc353114f30205b3378d3f169a5
Erik Kline [Fri, 20 Jan 2017 06:29:36 +0000 (06:29 +0000)]
Merge "BroadcastReceiver refactoring"
am:
73a57bb9da
Change-Id: Iafb0aa75c564aeb4c0181ef0dbacc6de4527480a
Erik Kline [Fri, 20 Jan 2017 06:23:35 +0000 (06:23 +0000)]
Merge "BroadcastReceiver refactoring"
Hugo Benichi [Wed, 7 Dec 2016 05:49:55 +0000 (14:49 +0900)]
DO NOT MERGE Unit tests for NetworkNotificationManager
Test: new unit test, no functional changes.
Bug:
32198726
(cherry picked from commit
74264329da5c52fbbafc1d20457056fdeabe19dc)
Change-Id: I123de68de9ae353b95edce89eb570cfbb5f8d9a3
Jiaquan He [Fri, 20 Jan 2017 04:26:48 +0000 (04:26 +0000)]
Merge "2D Recents: round task thumbnails properly." into nyc-mr2-dev
am:
fb764b7035
Change-Id: Idd44a0786190fa84e4c7020a7deb76fb28c333b6
Jiaquan He [Fri, 20 Jan 2017 04:26:40 +0000 (04:26 +0000)]
2D Recents: round task thumbnails properly.
am:
90f4f5290b
Change-Id: Ice4ac5f7e32e9d209af2bec53530d8f425609ca2
Chen Xu [Fri, 20 Jan 2017 04:13:03 +0000 (04:13 +0000)]
Merge "Initial change on carrier signal filtering" am:
bfdce89f36 am:
1507930691
am:
923046251b
Change-Id: I0762a7787c4136de027f8ee5def592bc85be25b6
Erik Kline [Wed, 18 Jan 2017 02:57:45 +0000 (11:57 +0900)]
BroadcastReceiver refactoring
All registerReceiver() calls now specify to be run on the tethering
master state machine's handler. Eventually, some of the locking might
be removed (requires careful review, later).
Also: slightly refactor StateReceiver for readability
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
- vanilla tethering from WiFi to mobile works
Bug:
32163131
Change-Id: I39844f6e1608179ebeb41668a6db8a4e44d30ecf
TreeHugger Robot [Fri, 20 Jan 2017 04:05:27 +0000 (04:05 +0000)]
Merge "2D Recents: round task thumbnails properly." into nyc-mr2-dev
Chen Xu [Fri, 20 Jan 2017 03:54:22 +0000 (03:54 +0000)]
Merge "Initial change on carrier signal filtering" am:
bfdce89f36
am:
1507930691
Change-Id: I2edbdbd65fd90215b39e1b5f4a888c9df119b841
Chen Xu [Fri, 20 Jan 2017 03:39:15 +0000 (03:39 +0000)]
Merge "Initial change on carrier signal filtering"
am:
bfdce89f36
Change-Id: I8746998d2554d6161766ca29779dc7efabc5b802
Chen Xu [Fri, 20 Jan 2017 03:16:51 +0000 (03:16 +0000)]
Merge "Initial change on carrier signal filtering"
Jeremy Joslin [Fri, 20 Jan 2017 02:35:50 +0000 (02:35 +0000)]
Merge "Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED." am:
b5b00857eb am:
0af25e62c9
am:
5418f151cc
Change-Id: I74ce97c93e640a601e811b571f37fe1fed114391
Ta-wei Yen [Fri, 20 Jan 2017 00:20:43 +0000 (16:20 -0800)]
Add voicemail backup/restore columns
BACKED_UP and RESTORED are required for dialer voicemail backup/restore
feature for N MR2. As there are no API bump the fields will be hidden
in NMR2. These fields will be made public in O.
ARCHIVED and IS_OMTP_VOICEMAIL is not used for NMR2, but added in
advance to avoid multiple database upgrades.
IS_OMTP_VOICEMAIL will be used in O to dedupe multiple apps implementing
VisualVoicemailService. All voicemail inserted by the service should
set this field to 1. The UI should only display voicemails with this
field set to 1 when the source_package is also the current active
VisualVoicemailService, as other sources represents the same source of
truth(the carrier) but is outdated.
For example, the query should be
WHERE (is_omtp_voicemail == 0) OR
(is_omtp_voicemail == 1 AND source_package = "current.vvm.package")
Test: VoicemailProviderTest
Bug:
34463609
Change-Id: I0f3e58fabff2102adf5bc29d81dac46c7e71d410
Jeremy Joslin [Fri, 20 Jan 2017 02:21:00 +0000 (02:21 +0000)]
Merge "Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED." am:
b5b00857eb
am:
0af25e62c9
Change-Id: Ied883055a0b85a1df53491a88f6bd7eac594c5f5
Jeremy Joslin [Fri, 20 Jan 2017 02:11:47 +0000 (02:11 +0000)]
Merge "Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED."
am:
b5b00857eb
Change-Id: I54a69f11284efb07ee6be58650d7a246540010dc
Jeremy Joslin [Fri, 20 Jan 2017 02:07:53 +0000 (02:07 +0000)]
Merge "Pass more data through the recommendation request." am:
00514f1dc0 am:
ddfbe07e96
am:
ec630d0bf0
Change-Id: I20ce25072262a7aef36b9fdaa317210283ca495f
Jeremy Joslin [Fri, 20 Jan 2017 02:02:03 +0000 (02:02 +0000)]
Merge "Pass more data through the recommendation request." am:
00514f1dc0
am:
ddfbe07e96
Change-Id: Ib831f420dd6ca976f9ce72476028b18ea61e2211
Treehugger Robot [Fri, 20 Jan 2017 02:00:42 +0000 (02:00 +0000)]
Merge "Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED."
Jeremy Joslin [Fri, 20 Jan 2017 01:52:38 +0000 (01:52 +0000)]
Merge "Pass more data through the recommendation request."
am:
00514f1dc0
Change-Id: I97e11e876bcb7ccdb55a333b31f9970ae5edd001
Android Build Merger (Role) [Fri, 20 Jan 2017 01:48:12 +0000 (01:48 +0000)]
Merge "Use separate switch ops for runtime permissions am:
e710a6fc66 am:
a2bbc26979" into nyc-mr2-dev-plus-aosp
Svet Ganov [Fri, 20 Jan 2017 01:47:17 +0000 (01:47 +0000)]
Use separate switch ops for runtime permissions am:
e710a6fc66
am:
7751660b2a
Change-Id: Ib85eea6690b89cd4e5d8817fbea0845d9cdd0f45
Svet Ganov [Fri, 20 Jan 2017 01:47:14 +0000 (01:47 +0000)]
Use separate switch ops for runtime permissions am:
e710a6fc66
am:
a2bbc26979
Change-Id: I490613902b0c068fd95d3d9d8a4695769ca1e582
Treehugger Robot [Fri, 20 Jan 2017 01:44:19 +0000 (01:44 +0000)]
Merge "Pass more data through the recommendation request."
Svet Ganov [Fri, 20 Jan 2017 01:41:20 +0000 (01:41 +0000)]
Use separate switch ops for runtime permissions
am:
e710a6fc66
Change-Id: Iac7d5e7f80ddbcafea3b1d26860e3cb0b46b6bd5
Svet Ganov [Fri, 20 Jan 2017 01:41:11 +0000 (01:41 +0000)]
Use separate switch ops for runtime permissions
am:
e710a6fc66
Change-Id: I86cd237bffdde972de69b91fa086ac5f5ec349e8
Jiaquan He [Fri, 20 Jan 2017 01:25:14 +0000 (01:25 +0000)]
2D Recents: handle keyboard config changes.
am:
44db90262e
Change-Id: I3b2594016b11c01671fd0f9e45ec3f0c673709fd
Jeremy Joslin [Wed, 18 Jan 2017 23:12:01 +0000 (15:12 -0800)]
Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED.
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
BUG:
33752149
Change-Id: I559e8f47c5edb491ea7cd0d03010736c81fcee9b
Merged-In: If261cf25c227eeeb4155e43afd9354e6ff8df3b4
Jeremy Joslin [Wed, 18 Jan 2017 19:55:17 +0000 (11:55 -0800)]
Pass more data through the recommendation request.
Expanding the API so it can accept the WiFi config of the currently
connected network (if any) and the set of connectable WiFi
configurations. Also renamed currentRecommendedWifiConfig to
defaultWifiConfig so the name was more representative of the
parameter's purpose and added more documentation throughout.
Test: adb shell am instrument -e class android.net.RecommendationRequestTest -w com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Test: adb shell am instrument -w com.android.networkrecommendation.tests/android.support.test.runner.AndroidJUnitRunner
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Bug:
34387385
Change-Id: Ib8c3cab8f92b5c9da806070d32412f688690f82f
Merged-In: I1089b70303b0396def7e6bf3737fdc67e40c9dcd
Jeremy Joslin [Fri, 20 Jan 2017 00:02:14 +0000 (00:02 +0000)]
Merge "Have requestRecommendation return a CompletableFuture." am:
f48d0bb2dc am:
887ee2c32a
am:
40f432a56b
Change-Id: I6936bd7bd64ae5da665ece4d9f401849feceed3e
Jiaquan He [Mon, 9 Jan 2017 23:50:35 +0000 (15:50 -0800)]
2D Recents: round task thumbnails properly.
Test: Checked that on local sw600dp devices, task views are rounded with
8dp. Also checked that Recents works properly on phones.
Bug:
32101881
Change-Id: I6f7a09a12c3e3f1f7270bed1ae25b291fadfb8f2
Jeremy Joslin [Thu, 19 Jan 2017 23:46:45 +0000 (23:46 +0000)]
Merge "Have requestRecommendation return a CompletableFuture." am:
f48d0bb2dc
am:
887ee2c32a
Change-Id: Ia9252f5375da2a4292293a7d895ec3cbd0c9203e
Jeremy Joslin [Thu, 19 Jan 2017 23:37:46 +0000 (23:37 +0000)]
Merge "Have requestRecommendation return a CompletableFuture."
am:
f48d0bb2dc
Change-Id: I409c6c46144cbbfc147df7c3d3e251bd6b5fbe62
Jiaquan He [Thu, 19 Jan 2017 23:23:56 +0000 (15:23 -0800)]
2D Recents: handle keyboard config changes.
While attaching or detaching a physical keyboard, we should handle the
configuration change in RecentsActivity, so that the activity isn't
relaunched and causes abnormal behaviors.
Test: Checked that while keyboard is attached or detached, Recents
behaves normally.
Bug:
32101881
Change-Id: Ibd185aeb48b31dbde032e235fdcaa17fbcdd9c8a
Jeremy Joslin [Thu, 19 Jan 2017 23:29:23 +0000 (23:29 +0000)]
Merge "Replace the RequestRecommendationCaller if the timeout changes." am:
f604580a58 am:
600b816fe6
am:
5ee0e8aa05
Change-Id: Icc0d7b46f0777fd998c5fae5b5796bd99cac5ace
Treehugger Robot [Thu, 19 Jan 2017 23:25:50 +0000 (23:25 +0000)]
Merge "Have requestRecommendation return a CompletableFuture."
Jeremy Joslin [Thu, 19 Jan 2017 23:24:16 +0000 (23:24 +0000)]
Merge changes I6ff80178,I03875cf1,I8d210b68 am:
5d942c1352 am:
f5e4912fa2
am:
9a6c1bb795
Change-Id: Ic00047a933a33ca51fcb770694d1f41ba7a09484
Jeremy Joslin [Thu, 19 Jan 2017 23:23:20 +0000 (23:23 +0000)]
New setting for recommendation request timeout. am:
44e2b84b27 am:
820ad03ba8
am:
00ccf31dbd
Change-Id: If14705a0e4c41dbd40ae90b46b37e5ad2b6e5c4b
Jeremy Joslin [Thu, 19 Jan 2017 23:22:20 +0000 (23:22 +0000)]
Implemented the async recommendation request call. am:
bc1308a3be am:
08031e0d0e
am:
61a4bd412d
Change-Id: I53549134c264ff5d282d1e6d5138581c9f5bcb5b
Jeremy Joslin [Thu, 19 Jan 2017 23:21:35 +0000 (23:21 +0000)]
Merge "Replace the RequestRecommendationCaller if the timeout changes." am:
f604580a58
am:
600b816fe6
Change-Id: I0756a2f72df6a9a41bd0c405155318c693d34546
Jeremy Joslin [Thu, 19 Jan 2017 23:21:09 +0000 (23:21 +0000)]
Async network recommendation requests. am:
cb925074d3 am:
c9d378e212
am:
428e6cd1db
Change-Id: Ifb0d27a912c2ca82d6dc18b513e1bc12c0215df1
Jeremy Joslin [Thu, 19 Jan 2017 23:14:33 +0000 (23:14 +0000)]
Merge changes I6ff80178,I03875cf1,I8d210b68 am:
5d942c1352
am:
f5e4912fa2
Change-Id: I97104593be351ea75fa5307b9bcc0904b406c27b
Jeremy Joslin [Thu, 19 Jan 2017 23:13:19 +0000 (23:13 +0000)]
New setting for recommendation request timeout. am:
44e2b84b27
am:
820ad03ba8
Change-Id: Ib4999e09073c74bb4594ce2e744032d3349dce94
Jeremy Joslin [Thu, 19 Jan 2017 23:12:24 +0000 (23:12 +0000)]
Implemented the async recommendation request call. am:
bc1308a3be
am:
08031e0d0e
Change-Id: Idc136d72820fbf7c1d747068d87c505ec7e3cc5c
Jeremy Joslin [Thu, 19 Jan 2017 23:11:28 +0000 (23:11 +0000)]
Merge "Replace the RequestRecommendationCaller if the timeout changes."
am:
f604580a58
Change-Id: I07c14f02c9f20122a7154df31ee745b1a3b43e88
Jeremy Joslin [Thu, 19 Jan 2017 23:11:08 +0000 (23:11 +0000)]
Async network recommendation requests. am:
cb925074d3
am:
c9d378e212
Change-Id: I66ea5246f35e6665c1ffb01e6314293a59f6acca
Jeremy Joslin [Thu, 19 Jan 2017 23:05:10 +0000 (23:05 +0000)]
Merge changes I6ff80178,I03875cf1,I8d210b68
am:
5d942c1352
Change-Id: I6f56b3fa03de6d848ca92693f43ba80ede33a0f2
Jeremy Joslin [Thu, 19 Jan 2017 23:05:02 +0000 (23:05 +0000)]
New setting for recommendation request timeout.
am:
44e2b84b27
Change-Id: I8fd6e0c75d22d0f83db414a389c4d8caaf745469
Jeremy Joslin [Thu, 19 Jan 2017 23:03:56 +0000 (23:03 +0000)]
Implemented the async recommendation request call.
am:
bc1308a3be
Change-Id: I8cd3365a053527c8f4da6c35b1c646281eda74be
Jeremy Joslin [Thu, 19 Jan 2017 23:03:06 +0000 (23:03 +0000)]
Async network recommendation requests.
am:
cb925074d3
Change-Id: I9e3ac1f778d6e9bfe817225423f80540230633e3
Treehugger Robot [Thu, 19 Jan 2017 23:02:52 +0000 (23:02 +0000)]
Merge "Replace the RequestRecommendationCaller if the timeout changes."
Treehugger Robot [Thu, 19 Jan 2017 22:55:16 +0000 (22:55 +0000)]
Merge changes I6ff80178,I03875cf1,I8d210b68
* changes:
New setting for recommendation request timeout.
Implemented the async recommendation request call.
Async network recommendation requests.
Kazuki Kobayashi [Thu, 19 Jan 2017 22:35:02 +0000 (22:35 +0000)]
Merge "Fix clipping for date and time on QS" am:
a5f968806e am:
6cad668a25
am:
8bf5945c3f
Change-Id: Ia811eba9511d385e74668a97db11df3b8d0e9315
Kazuki Kobayashi [Thu, 19 Jan 2017 22:30:05 +0000 (22:30 +0000)]
Merge "Fix clipping for date and time on QS" am:
a5f968806e
am:
6cad668a25
Change-Id: I19ae46145d788db06e64b1b1737b7c30ae53f7f0
Kazuki Kobayashi [Thu, 19 Jan 2017 22:25:23 +0000 (22:25 +0000)]
Merge "Fix clipping for date and time on QS"
am:
a5f968806e
Change-Id: I75c89c14ba9fe723ce47bff9061c716aee225735
Treehugger Robot [Thu, 19 Jan 2017 22:17:35 +0000 (22:17 +0000)]
Merge "Fix clipping for date and time on QS"
Rebecca Silberstein [Thu, 19 Jan 2017 21:36:03 +0000 (21:36 +0000)]
Merge "SystemServer: cherry-pick p2p service start" am:
4c937464eb am:
392f7d789c
am:
d3ff73eba4
Change-Id: I9427fd6c760c58c6caf65800fbbfbaf2c35e3335
Jeremy Joslin [Wed, 18 Jan 2017 22:21:56 +0000 (14:21 -0800)]
Have requestRecommendation return a CompletableFuture.
Reworked the new requestRecommendation call to return a
CompletableFuture instead of using a custom callback.
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Bug:
33784158
Change-Id: Ib12f0674d45ad6e2e21449bc3665467b3c20f49d
Merged-In: If24a94eb6289cb1952052b2cc3bc7856ce2192a5
Rebecca Silberstein [Thu, 19 Jan 2017 21:31:06 +0000 (21:31 +0000)]
Merge "SystemServer: cherry-pick p2p service start" am:
4c937464eb
am:
392f7d789c
Change-Id: I737b1307f4c42b8c88974418e3b6dab6b117509f
Rebecca Silberstein [Thu, 19 Jan 2017 21:26:00 +0000 (21:26 +0000)]
Merge "SystemServer: cherry-pick p2p service start"
am:
4c937464eb
Change-Id: I6f851c4e157150cab541d9a991cc1b7fe736eb7c
Jeremy Joslin [Tue, 17 Jan 2017 23:48:13 +0000 (15:48 -0800)]
Replace the RequestRecommendationCaller if the timeout changes.
The timeout associated with a TimedRemoteCaller can't be changed
after creation so we have to create a new instance anytime the
timeout changes (which shouldn't be too often). The instance is
stored and retrieved from an AtomicReference to avoid concurrency
issues.
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Bug:
34060959
Change-Id: I52f5d617feb9b3536ff3474b5d032113e3caea5c
Merged-In: I1662ac27f7442a16d2ffd7257469f1983b7f0e5c
Rebecca Silberstein [Thu, 19 Jan 2017 21:21:23 +0000 (21:21 +0000)]
Merge "SystemServer: cherry-pick p2p service start"
Jeremy Joslin [Wed, 4 Jan 2017 01:31:23 +0000 (17:31 -0800)]
New setting for recommendation request timeout.
Added a new global setting, NETWORK_RECOMMENDATION_REQUEST_TIMEOUT_MS,
to control the maximum amount of time a recommendation request can
take.
Updated the NetworkScoreService to monitor the value and to update
its cached copy on observed changes.
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
Bug:
34060959
Change-Id: I6ff80178440794e4a5da39ee7b5164621316e7bd
Merged-In: I7650ee024e53dbc856cf20d7520a6eb252c73bdf
Jeremy Joslin [Thu, 29 Dec 2016 22:49:38 +0000 (14:49 -0800)]
Implemented the async recommendation request call.
Implemented requestAsyncRecommendation() by introducing a Handler
implementation to handle requests that time out and a OneTimeCallback
class to prevent multiple callbacks from being sent back for the same
request.
Change-Id: I03875cf1d789cbc92aa4c6b500c6b519bff8e165
Merged-In: Ida2ff860d78d86185ab9ab22232b5b6dc1e4b310
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
BUG:
33784158
Jeremy Joslin [Wed, 28 Dec 2016 23:56:46 +0000 (15:56 -0800)]
Async network recommendation requests.
Exposing a new hidden API method that allows network recommendations
to be requested asynchronously.
Test: Built & run.
BUG:
33784158
Change-Id: I8d210b686138cb42bf69185f0b2f2d25dfcb9dd1
Merged-In: I8f84b09f43a6c5fae5d8f03ec01e75c25b4b62d6
Jiaquan He [Thu, 19 Jan 2017 19:43:59 +0000 (19:43 +0000)]
Merge "Add arrow key navigation support to Grid-based Recents." into nyc-mr2-dev
am:
683ea24d6e
Change-Id: I539d11f61f54df44e8e870be15493dbd2a2042a1
Jiaquan He [Thu, 19 Jan 2017 19:43:50 +0000 (19:43 +0000)]
Add arrow key navigation support to Grid-based Recents.
am:
c0e1813944
Change-Id: I36781f21274e5c07f2e1e0d2f5d30a20982c4f24
TreeHugger Robot [Thu, 19 Jan 2017 19:36:40 +0000 (19:36 +0000)]
Merge "Add arrow key navigation support to Grid-based Recents." into nyc-mr2-dev
yuanhao [Thu, 19 Jan 2017 19:10:44 +0000 (19:10 +0000)]
Merge "Fixed NPE in canAddMoreManagedProfiles" am:
a83222e4fb am:
8d3a8b1327
am:
1a34a41268
Change-Id: Ic3673491705af125a88f66460996911244184fc8
yuanhao [Thu, 19 Jan 2017 19:05:54 +0000 (19:05 +0000)]
Merge "Fixed NPE in canAddMoreManagedProfiles" am:
a83222e4fb
am:
8d3a8b1327
Change-Id: I8a5f9b7fcf46d2a801446fabece327ddceec3add
yuanhao [Thu, 19 Jan 2017 19:00:55 +0000 (19:00 +0000)]
Merge "Fixed NPE in canAddMoreManagedProfiles"
am:
a83222e4fb
Change-Id: Icd63296061485d29a95fa6c6735a8c1a91099afc
Treehugger Robot [Thu, 19 Jan 2017 18:53:24 +0000 (18:53 +0000)]
Merge "Fixed NPE in canAddMoreManagedProfiles"
Tyler Gunn [Thu, 19 Jan 2017 18:39:50 +0000 (18:39 +0000)]
Merge "Adding self-managed connection service APIs." am:
3a7253a09d am:
2155be0218
am:
d70e5d9317
Change-Id: I20ba841ceefb5905bf81262d6c42ea4b252ba3d4