277661 Commits

Author SHA1 Message Date
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 74264329da5c52fbbafc1d20457056fdeabe19dc)

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
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
wonyoung.lee
17e1d9844d unbindBackupAgent and initialize inFullBackup
the package has full backup failed (transport rejected) and broadcast discarded by app.inFullBackup

Test: example package : com.lge.clock
      1) push txt file over 25Mb size to data/data/com.lge.clock/shared_prefs/
      2) adb shell bmgr fullbackup com.lge.clock
      3) fullbackup failed by quota_exceeded and not happened alarm receive.

Change-Id: Ic475abb0fe779757dc3d7949cf52977ab8760a04
2017-01-20 02:18:27 +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
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
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
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
600b816fe6 Merge "Replace the RequestRecommendationCaller if the timeout changes."
am: f604580a58

Change-Id: I07c14f02c9f20122a7154df31ee745b1a3b43e88
2017-01-19 23:11:28 +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
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
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
Torbjorn Eklund
3ff6c5659d Vodafone SIMs should treat Spain as roaming
Since there are unnecessary "config_operatorConsideredNonRoaming" values
in the following file, UE mistakenly recognizes all Spain network as
non-roaming when Vodafone sim from Spain is inserted. Fix the issue by
removing the values.
 - core/res/res/values-mcc214-mnc01/config.xml

Bug: 30147413
Change-Id: I75b3f4a112a625a80824516bb6ea06a43a4567da
2017-01-20 06:06:28 +09: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
2155be0218 Merge "Adding self-managed connection service APIs."
am: 3a7253a09d

Change-Id: I5d7aa094d71e40bc2ce8e6d051c757a82d9c6083
2017-01-19 18:29:54 +00:00
Treehugger Robot
3a7253a09d Merge "Adding self-managed connection service APIs." 2017-01-19 18:23:34 +00:00
Jeff Sharkey
6b662722f0 Merge "Follow installd API changes."
am: 915f279556

Change-Id: Ib362db25a0393e859909e06a00dbb0c655fd4b47
2017-01-19 16:21:54 +00:00
Jeff Sharkey
915f279556 Merge "Follow installd API changes." 2017-01-19 16:16:03 +00:00
Polina Bondarenko
d5cfe6cdf1 Make TelephonyManager#get/setAllowedCarriers system api
Make TelephonyManager#get/setAllowedCarriers system api under
PackageManager#FEATURE_TELEPHONY_CARRIERLOCK feature flag.

Bug: 33480084
Test: cts

Merged-In: I1ce77a9e3801bd4003b52887d0a36866e5a5b81a

Change-Id: I1ce77a9e3801bd4003b52887d0a36866e5a5b81a
2017-01-19 16:43:29 +01:00
Przemyslaw Szczepaniak
0823ed394b Merge "Track libcore java.util.logging update to ojdk8u60"
am: 76edc3b8a5

Change-Id: I0598b566f4d02a6d14c6be86f917bcef48bbf748
2017-01-19 14:16:56 +00:00
Przemyslaw Szczepaniak
76edc3b8a5 Merge "Track libcore java.util.logging update to ojdk8u60" 2017-01-19 14:11:13 +00:00
Orion Hodson
a08d67495c Merge "API: Unhide dalvik.system.InMemoryDexClassLoader"
am: e5c3aed8dc

Change-Id: I90cd3d3b09000bd3e1961a63d95eede19f0bd12e
2017-01-19 13:43:05 +00:00
Orion Hodson
e5c3aed8dc Merge "API: Unhide dalvik.system.InMemoryDexClassLoader" 2017-01-19 13:35:52 +00:00
Paul Duffin
ab62fd67d8 Merge "Prepare for removal of legacy-test from default targets"
am: c74ccf1588

Change-Id: Id4876a2597171ac78062acf8194fce1af6d50b77
2017-01-19 11:40:22 +00:00
Treehugger Robot
c74ccf1588 Merge "Prepare for removal of legacy-test from default targets" 2017-01-19 11:32:11 +00:00
Erik Kline
c822d054a3 Merge "Try to deduplicate observer iteration code"
am: c8223d0874

Change-Id: I89c4fe6c7c669b7e84c67d0bed9cc97da09cffd0
2017-01-19 11:18:47 +00:00
Treehugger Robot
c8223d0874 Merge "Try to deduplicate observer iteration code" 2017-01-19 11:10:21 +00:00
Erik Kline
9b986734e4 Merge "Eschew unspecified IP addresses for DNS servers"
am: 0ac7232b7c

Change-Id: Id82777e6760c36e8f8dd59b447fa5862c295d59b
2017-01-19 09:46:09 +00:00
Paul Duffin
ccb0445027 Prepare for removal of legacy-test from default targets
In preparation for removing junit classes from the Android API
the legacy-test target will be removed from the
TARGET_DEFAULT_JAVA_LIBRARIES. This change adds explicit
dependencies on junit and/or legacy-android-test to ensure that
modules will compile properly once it is removed.

(cherry picked from 6387604f9e672ece85e07c4bcbd7be396867f06f)

Bug: 30188076
Test: make checkbuild
Merged-In: I13e88297731253420e4e5f5291d503f13a39a156
Change-Id: I58446eb8c45d8ac2bcdbc9fa40d1321e811bdd4b
2017-01-19 09:43:05 +00:00
Treehugger Robot
0ac7232b7c Merge "Eschew unspecified IP addresses for DNS servers" 2017-01-19 09:38:27 +00:00
Erik Kline
b2cfdfbbb0 Try to deduplicate observer iteration code
Later on, registerObserver() can take a handler argument and
invokeForAllObservers() can be updated to post to it when
provided.

Test: as follows
    - built (bullhead)
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 32163131
Change-Id: Ibc32079e1084e2e43f7826fe6b2bdbb83c482e26
2017-01-19 18:05:27 +09:00