Commit Graph

13966 Commits

Author SHA1 Message Date
Tobias Thierer
db79f383e9 Merge "API: Update Collections to OpenJDK8u60" am: 815fb54798 am: b8557c431d
am: 6a5fccdc66

Change-Id: I2636fb0fc54bbf0958b498494f4d587aa283b7d4
2017-01-25 11:44:56 +00:00
Tobias Thierer
b8557c431d Merge "API: Update Collections to OpenJDK8u60"
am: 815fb54798

Change-Id: I97f0155ed743c7bc674f0241b2b07955e8d68e56
2017-01-25 11:35:11 +00:00
Tobias Thierer
815fb54798 Merge "API: Update Collections to OpenJDK8u60" 2017-01-25 11:29:43 +00:00
Tobias Thierer
13fd56293c API: Update Collections to OpenJDK8u60
Bug: 29935305
Bug: 31896176
Test: make update-api
Change-Id: I94f0f8c6915fdc1c8151b816d0a988a07629e984
2017-01-24 12:52:11 +00:00
Joachim Sauer
e4fe6c283f Merge "Expose more ICU4J APIs." am: e5f0221f06 am: 5272231259
am: 94eb984734

Change-Id: I429dcc34cc09d8ceadb6bb6af42efce0572ed00f
2017-01-24 12:46:56 +00:00
Joachim Sauer
5272231259 Merge "Expose more ICU4J APIs."
am: e5f0221f06

Change-Id: I77e300979bdfe781ad9ab7aff5241b92491e5660
2017-01-24 12:35:30 +00:00
Joachim Sauer
e5f0221f06 Merge "Expose more ICU4J APIs." 2017-01-24 12:30:12 +00:00
Brad Ebinger
aaad10d729 Merge "Deprecate old TelecomManager actions" am: d1ab15a1af am: ee9a9babb1
am: 50315f010c

Change-Id: I89621d6f584ee743b67838a11fde212d2030900c
2017-01-23 19:38:42 +00:00
Brad Ebinger
ee9a9babb1 Merge "Deprecate old TelecomManager actions"
am: d1ab15a1af

Change-Id: Id76db43d6cc4477a328698e049558ef936a4fe1d
2017-01-23 19:23:35 +00:00
Brad Ebinger
d1ab15a1af Merge "Deprecate old TelecomManager actions" 2017-01-23 19:09:12 +00:00
Polina Bondarenko
308bcec713 Merge "Make TelephonyManager#get/setAllowedCarriers system api" am: 6d064d8780 am: cf176500e6
am: b46a93ff04

Change-Id: I8f17bef7ccde5953f5b810bd806fc51a4c69e194
2017-01-23 17:20:58 +00:00
Polina Bondarenko
cf176500e6 Merge "Make TelephonyManager#get/setAllowedCarriers system api"
am: 6d064d8780

Change-Id: I8f9b1c8e9ce1fda6cd03cd0dd459ead8837bd90d
2017-01-23 17:10:05 +00:00
Treehugger Robot
6d064d8780 Merge "Make TelephonyManager#get/setAllowedCarriers system api" 2017-01-23 17:01:25 +00:00
Amin Shaikh
17a040d48e Merge "Add Setting for curating saved open networks." am: b3b665de22 am: 2aec2f7a9c
am: 835db7f6b6

Change-Id: I5a8e3a4fc0198dbb7bf88e2bbcf0152b0b82a7fc
2017-01-21 05:38:45 +00:00
Amin Shaikh
2aec2f7a9c Merge "Add Setting for curating saved open networks."
am: b3b665de22

Change-Id: I3c65f39dc4f38f1c6c00a240f519cb0b0cf1a916
2017-01-21 05:27:06 +00:00
Amin Shaikh
8533622ae7 Add Setting for curating saved open networks.
Bug: 34392914
Test: make
Change-Id: Icd17753af6b0efdb35d1060b16029a53fdf4e605
Merged-In: Icd17753af6b0efdb35d1060b16029a53fdf4e605
2017-01-20 18:31:56 -08:00
Amin Shaikh
746a4de692 Merge "Add additional fields to RecommendationRequest." am: b8f0e69ef0 am: ac05acad45
am: b7b9c6f889

Change-Id: Ieade1643bfc4c9039d6d4f702bf3ec527679ce74
2017-01-20 23:30:39 +00:00
Amin Shaikh
ac05acad45 Merge "Add additional fields to RecommendationRequest."
am: b8f0e69ef0

Change-Id: I9a50c8aca36cf740abbc62af6879b4e6ea736855
2017-01-20 23:18:02 +00:00
Amin Shaikh
b50ade8bb0 Add additional fields to RecommendationRequest.
- Add networkId and timestamp for the last user selected network

Bug: 34467596
Test: runtest --path core/tests/coretests/src/android/net/RecommendationRequestTest.java
Change-Id: Ic81c1beede1a643cd428b6e5c57ed430a6b1ccc0
Merged-In: Ic81c1beede1a643cd428b6e5c57ed430a6b1ccc0
2017-01-20 09:37:59 -08:00
Joachim Sauer
c67148da85 Expose more ICU4J APIs.
Expose more classes/methods, mostly those added in ICU4J 57.

Additionally EthiopicCalendar is now un-hidden which was hidden
accidentally and should have been in N.

Bug: 30825380
Test: m checkapi
Change-Id: Ib3bea26a9b246401d33cc0ccc0f91768d1fe1286
2017-01-20 14:06:09 +00:00
Jeremy Joslin
261b5c4c49 Merge "Pass more data through the recommendation request." am: 00514f1dc0 am: ddfbe07e96
am: ec630d0bf0

Change-Id: I20ce25072262a7aef36b9fdaa317210283ca495f
2017-01-20 02:07:53 +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
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
Tyler Gunn
61650097ed Merge "Adding self-managed connection service APIs." am: 3a7253a09d am: 2155be0218
am: d70e5d9317

Change-Id: I20ba841ceefb5905bf81262d6c42ea4b252ba3d4
2017-01-19 18:39:50 +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
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
baa1aea5e1 Merge "Track libcore java.util.logging update to ojdk8u60" am: 76edc3b8a5 am: 0823ed394b
am: b72c17afdc

Change-Id: I84dc0804b1f9db5359d9c9d8caf0356398eab2d5
2017-01-19 14:29:13 +00: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
c61c0baeee Merge "API: Unhide dalvik.system.InMemoryDexClassLoader" am: e5c3aed8dc am: a08d67495c
am: da4cfdfbdf

Change-Id: I5bf99527268cb26f3b1cab4a24080b9598ee03d2
2017-01-19 13:52:05 +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
Tyler Gunn
f50354363c Adding self-managed connection service APIs.
1. Adding new APIs for self-managed connection services.
2. Adding Telecom package-level documentation.

Test: Manual (unit, cts pending; this is just scaffolding for now)
Bug: 34159263
Change-Id: Ic226ec8bfcb2fbcc02fe802b47499e47aab17d0a
2017-01-18 14:44:43 -08:00
Glen Kuhne
424650dd52 Merge "Unhide WifiConfiguration proxy accessors" am: c82d1ddaf4 am: d2f5fd3c42
am: 878fcfaa22

Change-Id: Ib4a59d41088ba00b21ccaeea6a9e7578c24ab8da
2017-01-18 18:57:40 +00:00
Glen Kuhne
d2f5fd3c42 Merge "Unhide WifiConfiguration proxy accessors"
am: c82d1ddaf4

Change-Id: I12e44cf9c75f76712eb2c89fbd878a7cb74ec8a9
2017-01-18 18:20:43 +00:00
Glen Kuhne
c82d1ddaf4 Merge "Unhide WifiConfiguration proxy accessors" 2017-01-18 18:08:36 +00:00
Orion Hodson
ac85c0f5c9 API: Unhide dalvik.system.InMemoryDexClassLoader
Bug: 26878838
Test: make docs
Change-Id: Ica969089dd82d1b610d6a307bb414690e736a1c7
2017-01-18 15:31:32 +00:00
Przemyslaw Szczepaniak
d71203f1a0 Track libcore java.util.logging update to ojdk8u60
Test: CtsLibcoreTestCases
Bug: 28666126
Change-Id: I3d8a7046e339a4a327e04574a4479fe2a1291d4c
2017-01-18 11:40:22 +00:00
Lorenzo Colitti
5db17efcf6 Merge changes from topic 'net-update-mr2-dev-plus-aosp' into nyc-mr2-dev-plus-aosp
* changes:
  DO NOT MERGE: Add IP conn metrics to dumpsys and bug reports
  DO NOT MERGE: Add missing dependency.
  DO NOT MERGE: Show notification for always-on app VPN
  DO NOT MERGE: Implement metered tracking for NetworkStats summary queries.
  DO NOT MERGE: ConnectivityServiceTest: fix testAvoidBadWifiSettings
  DO NOT MERGE: Fix ConnectivityServiceTest testRequestBenchmark
  DO NOT MERGE: Switch over to new "time.android.com" NTP pool.
  DO NOT MERGE: Define API for metering network stats buckets.
  DO NOT MERGE: Refactored NetworkStatsServiceTest to use Mockito instead of EasyMock.
  DO NOT MERGE: Use @Ignore to explicitly disable a @Test method.
  DO NOT MERGE: Fixed NetworkStatsServiceTest and converted it to JUnit4.
  DO NOT MERGE: ConnectivityThread: use lazy holder idiom
  DO NOT MERGE: ConnectivityManager: use ConnectivityThread looper
  DO NOT MERGE: ConnectivityManager: a simpler CallbackHandler
  DO NOT MERGE: Indicate the NsdServiceInfo attributes are only filled in for a resolved service.
  DO NOT MERGE: Add a null check for the OnStartTetheringCallback.
  DO NOT MERGE: [CS] Remove timeout event after first available
  DO NOT MERGE: ApfTest: tag tests with @SmallTest or @MediumTest
  DO NOT MERGE: Unbreak TetherInterfaceStateMachineTest.
  DO NOT MERGE: Move the connectivity tests to frameworks/base/tests/net.
  DO NOT MERGE: De-guava BroadcastInterceptingContext and move it to testutils.
  DO NOT MERGE: Move FakeSettingsProvider to a common location.
  DO NOT MERGE: ConnectivityServiceTest: mark flaky test as such
  DO NOT MERGE: Add fuzzing tests to ApfFilter RA processing
  DO NOT MERGE: Support timeouts for requestNetwork() invocations.
  DO NOT MERGE: Silence the obnoxious MTU 0 error message that occur when no MTU is specified for a given network.
2017-01-18 10:29:57 +00:00
Stephen Chen
1fee3a64b7 DO NOT MERGE: Define API for metering network stats buckets.
This is a continuation of b/26545374, since now we can also set the
metered bit with NetworkScorer. The tracking of metered state changes
will be implemented in a seperate CL.

Bug: 31015360
Bug: 26545374
Test: N/A

(cherry picked from commit 9ac251d116)

(cherry picked from commit dadf6caf9f)

Change-Id: I01ebb270c5bf7f2383e8923cce72545ca1bee118
2017-01-18 19:08:32 +09:00
Narayan Kamath
ec667adb56 Merge "API: Unhide MethodHandles API (java.lang.invoke)."
am: 71b1d50531

Change-Id: I4813654889a3a088cf8ee5dae0c5655aa520c341
2017-01-18 09:53:09 +00:00
Narayan Kamath
71b1d50531 Merge "API: Unhide MethodHandles API (java.lang.invoke)." 2017-01-18 09:46:16 +00:00
Glen Kuhne
6862d2f6c6 Unhide WifiConfiguration proxy accessors
Unhiding HttpProxy accessors in WifiConfiguration.
This change occurs in parrallel with changes that restrict updating of
WifiConfigurations with new or updated proxy info to uids
holding permission OVERRIDE_WIFI_CONFIG, or holding DeviceOwner or
ProfileOwner policies.

Bug: 14669153
Test: None
Change-Id: Id69525cfec152ea52697693f9a3bd6f86019c694
Merged-In: Id69525cfec152ea52697693f9a3bd6f86019c694
2017-01-17 15:33:12 -08:00
Ta-wei Yen
ea0e111468 Merge "Add getNetworkSpecifier() and getCarrierConfig()"
am: 68d03b23bb

Change-Id: Ib4cf1d7f986a5ed4cc761f9abc10609de0bd22ff
2017-01-17 19:47:24 +00:00
Ta-wei Yen
68d03b23bb Merge "Add getNetworkSpecifier() and getCarrierConfig()" 2017-01-17 19:38:27 +00:00
Przemyslaw Szczepaniak
6b9cd13b05 Merge "Track libcore change 7d105d591c14afd00f894e8f3483adcbee6e901a"
am: 751e3af81e

Change-Id: I6c0ebb09325ab2f37469c9d4a5408f812380efc1
2017-01-17 18:26:57 +00:00
Treehugger Robot
751e3af81e Merge "Track libcore change 7d105d591c14afd00f894e8f3483adcbee6e901a" 2017-01-17 17:55:18 +00:00
Narayan Kamath
0ad648f301 API: Unhide MethodHandles API (java.lang.invoke).
Tracks libcore change 58a12375dd5c2dc721f8d0433b5cb11737bc349d.

Test: make docs
Change-Id: I6e35fef1078d3c26a56bcea79eb2a3e993ca8714
2017-01-17 13:33:46 +00:00
Tobias Thierer
d8d1d9682d Merge "API: Update java.util.Date to OpenJDK8u60"
am: a2343a7e78

Change-Id: Ic56a141a6ffad9c0080ac3d942d2b669f8ca37d5
2017-01-17 11:05:24 +00:00