OSDN Git Service
Erik Kline [Tue, 24 Jan 2017 08:00:48 +0000 (08:00 +0000)]
Merge "All upstream mobile connection management is now in UpstreamNetworkMonitor"
am:
c1987487a2
Change-Id: I2b7e0f63c8198c8fde52396f989c16d795e612a8
Treehugger Robot [Tue, 24 Jan 2017 07:54:20 +0000 (07:54 +0000)]
Merge "All upstream mobile connection management is now in UpstreamNetworkMonitor"
Erik Kline [Mon, 23 Jan 2017 07:42:01 +0000 (16:42 +0900)]
All upstream mobile connection management is now in UpstreamNetworkMonitor
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Change-Id: Ifbd430d5bf2d2191469c9810ad8f073506abde46
Chen Xu [Tue, 24 Jan 2017 02:39:55 +0000 (02:39 +0000)]
Merge "support suw and post-suw cases for default app"
am:
9fc8d99c76
Change-Id: I7a451bf2cfdfd6db65208a46db9d664039297ace
Chen Xu [Tue, 24 Jan 2017 02:30:58 +0000 (02:30 +0000)]
Merge "support suw and post-suw cases for default app"
fionaxu [Mon, 23 Jan 2017 06:43:41 +0000 (22:43 -0800)]
support suw and post-suw cases for default app
- our default carrier actions might not compatible with suw since data might be disabled
without surfacing users with an option to activate inside SuW.
- instead, skip carrier actions during setupwizard and schedule a job to resume carrier actions if needed when exit suw.
- use jobscheduler to monitor provision bit instead of keep the app running and listen for content change asynchronously.
Bug:
30958215
Test: Manual
Change-Id: Ie4004b46405b914158f585059d332f4e694053f3
Jeremy Joslin [Mon, 23 Jan 2017 21:31:21 +0000 (21:31 +0000)]
Merge "Mark the INetworkScoreCache as oneway."
am:
edadb3efc3
Change-Id: I3b71e154f49b354ead2bf734da4a94e332f87a33
Treehugger Robot [Mon, 23 Jan 2017 21:22:10 +0000 (21:22 +0000)]
Merge "Mark the INetworkScoreCache as oneway."
Brad Ebinger [Mon, 23 Jan 2017 19:23:35 +0000 (19:23 +0000)]
Merge "Deprecate old TelecomManager actions"
am:
d1ab15a1af
Change-Id: Id76db43d6cc4477a328698e049558ef936a4fe1d
Brad Ebinger [Mon, 23 Jan 2017 19:09:11 +0000 (19:09 +0000)]
Merge "Deprecate old TelecomManager actions"
Jeremy Joslin [Mon, 23 Jan 2017 18:51:41 +0000 (10:51 -0800)]
Mark the INetworkScoreCache as oneway.
Test: built & run
Bug:
34522097
Change-Id: I7d2075febe6c3cdc24b56df255f8ba59e13322bf
thecrazyskull [Mon, 23 Jan 2017 17:35:11 +0000 (17:35 +0000)]
Merge "LocalDisplayAdapter: don't crash when no color modes available"
am:
24218db904
Change-Id: I89d080a00fb87c73c2af1604f617706f0f60f32b
Treehugger Robot [Mon, 23 Jan 2017 17:25:10 +0000 (17:25 +0000)]
Merge "LocalDisplayAdapter: don't crash when no color modes available"
Polina Bondarenko [Mon, 23 Jan 2017 17:10:05 +0000 (17:10 +0000)]
Merge "Make TelephonyManager#get/setAllowedCarriers system api"
am:
6d064d8780
Change-Id: I8f9b1c8e9ce1fda6cd03cd0dd459ead8837bd90d
Treehugger Robot [Mon, 23 Jan 2017 17:01:24 +0000 (17:01 +0000)]
Merge "Make TelephonyManager#get/setAllowedCarriers system api"
Robin Lee [Mon, 23 Jan 2017 16:47:58 +0000 (16:47 +0000)]
Merge "Disable always-on VPN in factoryReset"
am:
63c14e0ab6
Change-Id: I021b288e3db17ddefbea3645fd282e3ee123a6e8
Robin Lee [Mon, 23 Jan 2017 16:40:05 +0000 (16:40 +0000)]
Merge "Disable always-on VPN in factoryReset"
thecrazyskull [Sun, 18 Dec 2016 17:48:20 +0000 (12:48 -0500)]
LocalDisplayAdapter: don't crash when no color modes available
Test: none
Change-Id: Ic11b5b66864fdd97b290722cba534b2aa38ac054
Erik Kline [Mon, 23 Jan 2017 12:20:35 +0000 (12:20 +0000)]
Merge "Move TetheringConfiguration out to its own file"
am:
5a45170f95 -s ours
Change-Id: I6a6bc4b2679432dd539d6b6930d7a32229fab363
Erik Kline [Sat, 21 Jan 2017 05:33:56 +0000 (14:33 +0900)]
Move TetheringConfiguration out to its own file
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net
- vanilla tethering works
- changing from no dun requirement to dun shows dun required
Bug:
32163131
Change-Id: I488449570dff057311b37335923ce6a199b363b7
Erik Kline [Mon, 23 Jan 2017 10:56:35 +0000 (10:56 +0000)]
Merge "Move TetheringConfiguration out to its own file"
Erik Kline [Sat, 21 Jan 2017 05:33:56 +0000 (14:33 +0900)]
Move TetheringConfiguration out to its own file
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net
- vanilla tethering works
- changing from no dun requirement to dun shows dun required
Bug:
32163131
Change-Id: I488449570dff057311b37335923ce6a199b363b7
Erik Kline [Mon, 23 Jan 2017 10:53:11 +0000 (10:53 +0000)]
Merge "Add test for updateMobileRequiresDun()"
am:
7f018500dc
Change-Id: Ic7b984105e2c245a992446e15d11dd19e4671a57
Treehugger Robot [Mon, 23 Jan 2017 10:44:19 +0000 (10:44 +0000)]
Merge "Add test for updateMobileRequiresDun()"
Erik Kline [Mon, 23 Jan 2017 06:55:16 +0000 (15:55 +0900)]
Add test for updateMobileRequiresDun()
This test validates that when a mobile upstream has been requested
changing the "DUN required" state results in updating the requested
network appropriately.
Test: as follows
- built
- flashed
- booted
- runtest frameworks-test passes
Bug:
32163131
Change-Id: Ia3a1f6493ea348eb75e334344468a980206f618f
Erik Kline [Mon, 23 Jan 2017 07:13:56 +0000 (07:13 +0000)]
Merge "More concisely export whether we have a "tetherable configuration""
am:
1b2a1b911d
Change-Id: I5f9717c9dab6b39f1fbf2186107b2a1f3f2d4f8f
Treehugger Robot [Mon, 23 Jan 2017 07:04:21 +0000 (07:04 +0000)]
Merge "More concisely export whether we have a "tetherable configuration""
Erik Kline [Mon, 23 Jan 2017 04:01:58 +0000 (13:01 +0900)]
More concisely export whether we have a "tetherable configuration"
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
- vanilla WiFi-to-mobile tethering works
Bug:
32163131
Change-Id: I20dd36b5bf7fc55a639c76ea4bdb55b650654881
Amin Shaikh [Sat, 21 Jan 2017 05:27:06 +0000 (05:27 +0000)]
Merge "Add Setting for curating saved open networks."
am:
b3b665de22
Change-Id: I3c65f39dc4f38f1c6c00a240f519cb0b0cf1a916
Treehugger Robot [Sat, 21 Jan 2017 05:17:41 +0000 (05:17 +0000)]
Merge "Add Setting for curating saved open networks."
Erik Kline [Sat, 21 Jan 2017 04:57:34 +0000 (04:57 +0000)]
Merge "Move several config elements into TetheringConfiguration class"
am:
8d35276910
Change-Id: I0eb196a4b61e460db24271d6805177641ad3fc9b
Erik Kline [Sat, 21 Jan 2017 04:57:29 +0000 (04:57 +0000)]
Move several config elements into TetheringConfiguration class
am:
3e7566572e
Change-Id: Ic053965b54eed0afc9a4785ce80ef1fab281493a
Erik Kline [Sat, 21 Jan 2017 04:49:10 +0000 (04:49 +0000)]
Merge "Move several config elements into TetheringConfiguration class"
Erik Kline [Sat, 21 Jan 2017 04:43:27 +0000 (04:43 +0000)]
Merge "Address a few unittest comments."
am:
9c3a298748
Change-Id: I2d41cdbe05653bcbed9d3b38b440c06b98006809
Erik Kline [Sat, 21 Jan 2017 04:36:27 +0000 (04:36 +0000)]
Merge "Address a few unittest comments."
Amin Shaikh [Fri, 20 Jan 2017 01:38:23 +0000 (17:38 -0800)]
Add Setting for curating saved open networks.
Bug:
34392914
Test: make
Change-Id: Icd17753af6b0efdb35d1060b16029a53fdf4e605
Merged-In: Icd17753af6b0efdb35d1060b16029a53fdf4e605
Amin Shaikh [Fri, 20 Jan 2017 23:18:02 +0000 (23:18 +0000)]
Merge "Add additional fields to RecommendationRequest."
am:
b8f0e69ef0
Change-Id: I9a50c8aca36cf740abbc62af6879b4e6ea736855
Treehugger Robot [Fri, 20 Jan 2017 23:04:54 +0000 (23:04 +0000)]
Merge "Add additional fields to RecommendationRequest."
Rebecca Silberstein [Fri, 20 Jan 2017 23:00:13 +0000 (23:00 +0000)]
Merge "SystemServer: reorder wifi services start"
am:
10c514d9de
Change-Id: I3a918b707932084759701103c683fffed0e16cee
Rebecca Silberstein [Fri, 20 Jan 2017 22:51:35 +0000 (22:51 +0000)]
Merge "SystemServer: reorder wifi services start"
Jeff Sharkey [Fri, 20 Jan 2017 22:50:49 +0000 (22:50 +0000)]
Merge "Add Binder support for Parcelable exceptions."
am:
a2ef6b5741
Change-Id: Ide766c0220e86b7661af83551354b3a498297ed8
Jeff Sharkey [Fri, 20 Jan 2017 22:45:03 +0000 (22:45 +0000)]
Merge "Add Binder support for Parcelable exceptions."
Amin Shaikh [Fri, 20 Jan 2017 01:24:41 +0000 (17:24 -0800)]
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
Erik Kline [Tue, 17 Jan 2017 06:06:35 +0000 (15:06 +0900)]
Address a few unittest comments.
Test: as follows
- built (bullhead)
- flashed
- booted
- runtest frameworks-net passes
Bug:
32163131
Change-Id: I8f6002243031dceff60b3d6d377b9e25f239eb23
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 [Tue, 17 Jan 2017 04:42:19 +0000 (13:42 +0900)]
Move several config elements into TetheringConfiguration class
Encapsulate the following config elements:
- all interface name regular expressions
- specification of preferred upstreams
- downstream DHCPv4 ranges
- default IPv4 (and IPv6) DNS servers
Test: as follows
- builds
- flashed (bullhead)
- runtest frameworks-net passes
Bug:
32163131
Change-Id: Ife4871c0b89d2d52e2cc9238e0606b428287521c
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 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: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: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
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
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:11:47 +0000 (02:11 +0000)]
Merge "Check for REQUEST_NETWORK_SCORES instead of BROADCAST_NETWORK_PRIVILEGED."
am:
b5b00857eb
Change-Id: I54a69f11284efb07ee6be58650d7a246540010dc
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
Treehugger Robot [Fri, 20 Jan 2017 01:44:19 +0000 (01:44 +0000)]
Merge "Pass more data through the recommendation request."
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 [Thu, 19 Jan 2017 23:37:46 +0000 (23:37 +0000)]
Merge "Have requestRecommendation return a CompletableFuture."
am:
f48d0bb2dc
Change-Id: I409c6c46144cbbfc147df7c3d3e251bd6b5fbe62
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: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: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: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"
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: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
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:29:54 +0000 (18:29 +0000)]
Merge "Adding self-managed connection service APIs."
am:
3a7253a09d
Change-Id: I5d7aa094d71e40bc2ce8e6d051c757a82d9c6083
Treehugger Robot [Thu, 19 Jan 2017 18:23:33 +0000 (18:23 +0000)]
Merge "Adding self-managed connection service APIs."
Jeff Sharkey [Thu, 19 Jan 2017 16:21:54 +0000 (16:21 +0000)]
Merge "Follow installd API changes."
am:
915f279556
Change-Id: Ib362db25a0393e859909e06a00dbb0c655fd4b47
Jeff Sharkey [Thu, 19 Jan 2017 16:16:02 +0000 (16:16 +0000)]
Merge "Follow installd API changes."
Polina Bondarenko [Thu, 12 Jan 2017 20:10:38 +0000 (21:10 +0100)]
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
Przemyslaw Szczepaniak [Thu, 19 Jan 2017 14:16:56 +0000 (14:16 +0000)]
Merge "Track libcore java.util.logging update to ojdk8u60"
am:
76edc3b8a5
Change-Id: I0598b566f4d02a6d14c6be86f917bcef48bbf748
Przemyslaw Szczepaniak [Thu, 19 Jan 2017 14:11:12 +0000 (14:11 +0000)]
Merge "Track libcore java.util.logging update to ojdk8u60"
Orion Hodson [Thu, 19 Jan 2017 13:43:05 +0000 (13:43 +0000)]
Merge "API: Unhide dalvik.system.InMemoryDexClassLoader"
am:
e5c3aed8dc
Change-Id: I90cd3d3b09000bd3e1961a63d95eede19f0bd12e
Orion Hodson [Thu, 19 Jan 2017 13:35:50 +0000 (13:35 +0000)]
Merge "API: Unhide dalvik.system.InMemoryDexClassLoader"
Paul Duffin [Thu, 19 Jan 2017 11:40:22 +0000 (11:40 +0000)]
Merge "Prepare for removal of legacy-test from default targets"
am:
c74ccf1588
Change-Id: Id4876a2597171ac78062acf8194fce1af6d50b77
Treehugger Robot [Thu, 19 Jan 2017 11:32:10 +0000 (11:32 +0000)]
Merge "Prepare for removal of legacy-test from default targets"
Erik Kline [Thu, 19 Jan 2017 11:18:47 +0000 (11:18 +0000)]
Merge "Try to deduplicate observer iteration code"
am:
c8223d0874
Change-Id: I89c4fe6c7c669b7e84c67d0bed9cc97da09cffd0