Commit Graph

279584 Commits

Author SHA1 Message Date
Hugo Benichi
4c2371db6b Merge "DO NOT MERGE Unit tests for NetworkNotificationManager" am: 216a4e7655 -s ours
am: feca77b884  -s ours

Change-Id: I847fe5f04ebf8b5634c3ae0974e69d50cef9df76
2017-01-20 07:55:35 +00:00
Hugo Benichi
feca77b884 Merge "DO NOT MERGE Unit tests for NetworkNotificationManager"
am: 216a4e7655  -s ours

Change-Id: I05fe9095395df00b96df3cbe3a6e4f31a160e0b5
2017-01-20 07:51:31 +00:00
Hugo Benichi
216a4e7655 Merge "DO NOT MERGE Unit tests for NetworkNotificationManager" 2017-01-20 07:44:30 +00:00
Erik Kline
2d49de42b8 Merge "BroadcastReceiver refactoring" am: 73a57bb9da
am: bcdd7475e5

Change-Id: I213f5af2393d3fc353114f30205b3378d3f169a5
2017-01-20 06:33:39 +00:00
Erik Kline
bcdd7475e5 Merge "BroadcastReceiver refactoring"
am: 73a57bb9da

Change-Id: Iafb0aa75c564aeb4c0181ef0dbacc6de4527480a
2017-01-20 06:29:36 +00:00
Erik Kline
73a57bb9da Merge "BroadcastReceiver refactoring" 2017-01-20 06:23:36 +00:00
Hugo Benichi
55b5f0f9eb DO NOT MERGE Unit tests for NetworkNotificationManager
Test: new unit test, no functional changes.
Bug: 32198726

(cherry picked from commit 74264329da)

Change-Id: I123de68de9ae353b95edce89eb570cfbb5f8d9a3
2017-01-20 15:08:38 +09:00
Erik Kline
2e88b5e674 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
2017-01-20 13:06:03 +09:00
Chen Xu
923046251b Merge "Initial change on carrier signal filtering" am: bfdce89f36
am: 1507930691

Change-Id: I2edbdbd65fd90215b39e1b5f4a888c9df119b841
2017-01-20 03:54:22 +00:00
Chen Xu
1507930691 Merge "Initial change on carrier signal filtering"
am: bfdce89f36

Change-Id: I8746998d2554d6161766ca29779dc7efabc5b802
2017-01-20 03:39:15 +00:00
Chen Xu
bfdce89f36 Merge "Initial change on carrier signal filtering" 2017-01-20 03:16:52 +00:00
Jeremy Joslin
5418f151cc Merge "Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED." am: b5b00857eb
am: 0af25e62c9

Change-Id: Ied883055a0b85a1df53491a88f6bd7eac594c5f5
2017-01-20 02:21:00 +00:00
Jeremy Joslin
0af25e62c9 Merge "Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED."
am: b5b00857eb

Change-Id: I54a69f11284efb07ee6be58650d7a246540010dc
2017-01-20 02:11:47 +00:00
Jeremy Joslin
ec630d0bf0 Merge "Pass more data through the recommendation request." am: 00514f1dc0
am: ddfbe07e96

Change-Id: Ib831f420dd6ca976f9ce72476028b18ea61e2211
2017-01-20 02:02:03 +00:00
Treehugger Robot
b5b00857eb Merge "Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED." 2017-01-20 02:00:42 +00:00
Jeremy Joslin
ddfbe07e96 Merge "Pass more data through the recommendation request."
am: 00514f1dc0

Change-Id: I97e11e876bcb7ccdb55a333b31f9970ae5edd001
2017-01-20 01:52:38 +00:00
Treehugger Robot
00514f1dc0 Merge "Pass more data through the recommendation request." 2017-01-20 01:44:20 +00:00
Svet Ganov
7751660b2a Use separate switch ops for runtime permissions
am: e710a6fc66

Change-Id: Iac7d5e7f80ddbcafea3b1d26860e3cb0b46b6bd5
2017-01-20 01:41:20 +00:00
Jeremy Joslin
c4982553b9 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
2017-01-19 16:21:25 -08:00
Jeremy Joslin
122957b0b0 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
2017-01-19 16:14:21 -08:00
Jeremy Joslin
40f432a56b Merge "Have requestRecommendation return a CompletableFuture." am: f48d0bb2dc
am: 887ee2c32a

Change-Id: Ia9252f5375da2a4292293a7d895ec3cbd0c9203e
2017-01-19 23:46:45 +00:00
Jeremy Joslin
887ee2c32a Merge "Have requestRecommendation return a CompletableFuture."
am: f48d0bb2dc

Change-Id: I409c6c46144cbbfc147df7c3d3e251bd6b5fbe62
2017-01-19 23:37:46 +00:00
Treehugger Robot
f48d0bb2dc Merge "Have requestRecommendation return a CompletableFuture." 2017-01-19 23:25:51 +00:00
Jeremy Joslin
5ee0e8aa05 Merge "Replace the RequestRecommendationCaller if the timeout changes." am: f604580a58
am: 600b816fe6

Change-Id: I0756a2f72df6a9a41bd0c405155318c693d34546
2017-01-19 23:21:35 +00:00
Jeremy Joslin
9a6c1bb795 Merge changes I6ff80178,I03875cf1,I8d210b68 am: 5d942c1352
am: f5e4912fa2

Change-Id: I97104593be351ea75fa5307b9bcc0904b406c27b
2017-01-19 23:14:33 +00:00
Jeremy Joslin
00ccf31dbd New setting for recommendation request timeout. am: 44e2b84b27
am: 820ad03ba8

Change-Id: Ib4999e09073c74bb4594ce2e744032d3349dce94
2017-01-19 23:13:19 +00:00
Jeremy Joslin
61a4bd412d Implemented the async recommendation request call. am: bc1308a3be
am: 08031e0d0e

Change-Id: Idc136d72820fbf7c1d747068d87c505ec7e3cc5c
2017-01-19 23:12:24 +00:00
Jeremy Joslin
600b816fe6 Merge "Replace the RequestRecommendationCaller if the timeout changes."
am: f604580a58

Change-Id: I07c14f02c9f20122a7154df31ee745b1a3b43e88
2017-01-19 23:11:28 +00:00
Jeremy Joslin
428e6cd1db Async network recommendation requests. am: cb925074d3
am: c9d378e212

Change-Id: I66ea5246f35e6665c1ffb01e6314293a59f6acca
2017-01-19 23:11:08 +00:00
Jeremy Joslin
f5e4912fa2 Merge changes I6ff80178,I03875cf1,I8d210b68
am: 5d942c1352

Change-Id: I6f56b3fa03de6d848ca92693f43ba80ede33a0f2
2017-01-19 23:05:10 +00:00
Jeremy Joslin
820ad03ba8 New setting for recommendation request timeout.
am: 44e2b84b27

Change-Id: I8fd6e0c75d22d0f83db414a389c4d8caaf745469
2017-01-19 23:05:02 +00:00
Jeremy Joslin
08031e0d0e Implemented the async recommendation request call.
am: bc1308a3be

Change-Id: I8cd3365a053527c8f4da6c35b1c646281eda74be
2017-01-19 23:03:56 +00:00
Jeremy Joslin
c9d378e212 Async network recommendation requests.
am: cb925074d3

Change-Id: I9e3ac1f778d6e9bfe817225423f80540230633e3
2017-01-19 23:03:06 +00:00
Treehugger Robot
f604580a58 Merge "Replace the RequestRecommendationCaller if the timeout changes." 2017-01-19 23:02:53 +00:00
Treehugger Robot
5d942c1352 Merge changes I6ff80178,I03875cf1,I8d210b68
* changes:
  New setting for recommendation request timeout.
  Implemented the async recommendation request call.
  Async network recommendation requests.
2017-01-19 22:55:16 +00:00
Kazuki Kobayashi
8bf5945c3f Merge "Fix clipping for date and time on QS" am: a5f968806e
am: 6cad668a25

Change-Id: I19ae46145d788db06e64b1b1737b7c30ae53f7f0
2017-01-19 22:30:05 +00:00
Kazuki Kobayashi
6cad668a25 Merge "Fix clipping for date and time on QS"
am: a5f968806e

Change-Id: I75c89c14ba9fe723ce47bff9061c716aee225735
2017-01-19 22:25:23 +00:00
Treehugger Robot
a5f968806e Merge "Fix clipping for date and time on QS" 2017-01-19 22:17:35 +00:00
Jeremy Joslin
88f50a5a08 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
2017-01-19 13:31:16 -08:00
Rebecca Silberstein
d3ff73eba4 Merge "SystemServer: cherry-pick p2p service start" am: 4c937464eb
am: 392f7d789c

Change-Id: I737b1307f4c42b8c88974418e3b6dab6b117509f
2017-01-19 21:31:06 +00:00
Rebecca Silberstein
392f7d789c Merge "SystemServer: cherry-pick p2p service start"
am: 4c937464eb

Change-Id: I6f851c4e157150cab541d9a991cc1b7fe736eb7c
2017-01-19 21:26:00 +00:00
Jeremy Joslin
8b9226b487 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
2017-01-19 13:25:50 -08:00
Rebecca Silberstein
4c937464eb Merge "SystemServer: cherry-pick p2p service start" 2017-01-19 21:21:23 +00:00
Jeremy Joslin
44e2b84b27 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
2017-01-19 13:18:22 -08:00
Jeremy Joslin
bc1308a3be 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
2017-01-19 13:18:21 -08:00
Jeremy Joslin
cb925074d3 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
2017-01-19 13:18:21 -08:00
yuanhao
1a34a41268 Merge "Fixed NPE in canAddMoreManagedProfiles" am: a83222e4fb
am: 8d3a8b1327

Change-Id: I8a5f9b7fcf46d2a801446fabece327ddceec3add
2017-01-19 19:05:54 +00:00
yuanhao
8d3a8b1327 Merge "Fixed NPE in canAddMoreManagedProfiles"
am: a83222e4fb

Change-Id: Icd63296061485d29a95fa6c6735a8c1a91099afc
2017-01-19 19:00:55 +00:00
Treehugger Robot
a83222e4fb Merge "Fixed NPE in canAddMoreManagedProfiles" 2017-01-19 18:53:25 +00:00
Tyler Gunn
d70e5d9317 Merge "Adding self-managed connection service APIs." am: 3a7253a09d
am: 2155be0218

Change-Id: I75319e09f352905ffa45194086b11711f9070c70
2017-01-19 18:34:53 +00:00