OSDN Git Service
Jeff Sharkey [Fri, 20 Jan 2017 22:56:45 +0000 (22:56 +0000)]
Merge "Add Binder support for Parcelable exceptions." am:
a2ef6b5741
am:
c3fbf32011
Change-Id: Ibd977a017ce48f0791520af3500969aec0c132e5
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."
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: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 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: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: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
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: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: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: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
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
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: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
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: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: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: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"
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
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:34:53 +0000 (18:34 +0000)]
Merge "Adding self-managed connection service APIs." am:
3a7253a09d
am:
2155be0218
Change-Id: I75319e09f352905ffa45194086b11711f9070c70
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:26:23 +0000 (16:26 +0000)]
Merge "Follow installd API changes." am:
915f279556
am:
6b662722f0
Change-Id: Ia9406884d17226b10cae21fd2d98eecb9e5e7253
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."
Przemyslaw Szczepaniak [Thu, 19 Jan 2017 14:22:48 +0000 (14:22 +0000)]
Merge "Track libcore java.util.logging update to ojdk8u60" am:
76edc3b8a5
am:
0823ed394b
Change-Id: Iee0a79ac5f1770b218e6ff9e4a9f0d14c3c90378
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:47:37 +0000 (13:47 +0000)]
Merge "API: Unhide dalvik.system.InMemoryDexClassLoader" am:
e5c3aed8dc
am:
a08d67495c
Change-Id: I4ea03fd453e58737b795c9f856db6a8312fdd1a0
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"
Svet Ganov [Thu, 22 Sep 2016 02:50:14 +0000 (19:50 -0700)]
Use separate switch ops for runtime permissions
If permissions review is enabled we allow individual
control of fine graned permissions in the SMS group.
This change ensures these permissions use the
corresponding app op as a switch to allow indifidual
control.
Change-Id: I83cd78a78a8266df8324b8a10cd9e36c04ff3112
(cherry picked from commit
99e4d51584202433f1628faa3441e5ced5cf7a0f)
Paul Duffin [Thu, 19 Jan 2017 11:44:56 +0000 (11:44 +0000)]
Merge "Prepare for removal of legacy-test from default targets" am:
c74ccf1588
am:
ab62fd67d8
Change-Id: I923de1762a15fca7dc255f9dfe0ecce6f54d333c
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:22:55 +0000 (11:22 +0000)]
Merge "Try to deduplicate observer iteration code" am:
c8223d0874
am:
c822d054a3
Change-Id: Icfa3b57630a6d8d31f68f7d11d09e7ee0b97cc73
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
Treehugger Robot [Thu, 19 Jan 2017 11:10:21 +0000 (11:10 +0000)]
Merge "Try to deduplicate observer iteration code"
Erik Kline [Thu, 19 Jan 2017 09:49:43 +0000 (09:49 +0000)]
Merge "Eschew unspecified IP addresses for DNS servers" am:
0ac7232b7c
am:
9b986734e4
Change-Id: I2a3817e030adeef54012177380e886771502308c
Erik Kline [Thu, 19 Jan 2017 09:46:09 +0000 (09:46 +0000)]
Merge "Eschew unspecified IP addresses for DNS servers"
am:
0ac7232b7c
Change-Id: Id82777e6760c36e8f8dd59b447fa5862c295d59b
Paul Duffin [Tue, 10 Jan 2017 12:08:23 +0000 (12:08 +0000)]
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
Treehugger Robot [Thu, 19 Jan 2017 09:38:26 +0000 (09:38 +0000)]
Merge "Eschew unspecified IP addresses for DNS servers"
Erik Kline [Wed, 18 Jan 2017 11:54:14 +0000 (20:54 +0900)]
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
fionaxu [Fri, 18 Nov 2016 00:46:30 +0000 (16:46 -0800)]
Initial change on carrier signal filtering
- add new carrier config
- configure defaultcarrierapp as the default receiver for redirection
signal
Bug:
30958215
Test: runtest --path
frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony
Change-Id: I094c39fe21e6883d2acef8f7479b948fc77ce14e
Merged-In: CHANGE-ID I14bb1a885d1eaca9a144eb1e1caca72339d67d2e
Erik Kline [Thu, 19 Jan 2017 05:24:26 +0000 (14:24 +0900)]
Eschew unspecified IP addresses for DNS servers
Test: as follows
- built
- flashed
- booted
- runtest frameworks-wifi passes (though no test covers this code yet)
Bug:
34210527
Change-Id: I2d44445982dfb3221f7b6394daf0479c1fa8a6e1
yuanhao [Wed, 18 Jan 2017 01:54:45 +0000 (09:54 +0800)]
Fixed NPE in canAddMoreManagedProfiles
We can use the command 'adb shell pm create-user --profileOf -10000
--managed TestProfile_12345678' to reproduce the problem.
Signed-off-by: yuanhao <yuanhao@xiaomi.com>
Michael Wright [Thu, 19 Jan 2017 02:16:53 +0000 (02:16 +0000)]
Merge "Validate custom pointer icons aren't null." into cw-f-dev
am:
05b2d3eb0d
Change-Id: Ice9cc30ff6e4f3048d165e346b13f51a4fcaff2a
Michael Wright [Thu, 19 Jan 2017 02:16:45 +0000 (02:16 +0000)]
Validate custom pointer icons aren't null.
am:
35068079c8
Change-Id: I68c8a45c8bd207b82a9d82d6f2fd5c7fb85b098c
TreeHugger Robot [Thu, 19 Jan 2017 02:12:10 +0000 (02:12 +0000)]
Merge "Validate custom pointer icons aren't null." into cw-f-dev
Tao Bao [Thu, 19 Jan 2017 01:59:19 +0000 (01:59 +0000)]
Merge "Revert "RecoverySystem: Fix the issue in installPackage()."" am:
9311dbf9e4
am:
731445ebf7
Change-Id: Ia111f153277e0648ea4d3f37d7c928621cd21ca2
Tao Bao [Thu, 19 Jan 2017 01:55:47 +0000 (01:55 +0000)]
Merge "Revert "RecoverySystem: Fix the issue in installPackage().""
am:
9311dbf9e4
Change-Id: Ife949ce113387e2834f25c49d41adf4eec44bba2
Tao Bao [Thu, 19 Jan 2017 01:47:09 +0000 (01:47 +0000)]
Merge "Revert "RecoverySystem: Fix the issue in installPackage().""
Tao Bao [Tue, 17 Jan 2017 20:42:43 +0000 (12:42 -0800)]
Revert "RecoverySystem: Fix the issue in installPackage()."
This reverts commit
9f7a0acd2d383b825bcdcbef25d6b42f9875acfe.
Bug:
34350643
Bug:
34396955
Test: installPackage() doesn't cause deadlock if it doesn't call
processPackage() prior to that.
Change-Id: I1da055c86a3326ae341da1b4d5dc79ab4be256fb
Peng Xu [Thu, 19 Jan 2017 01:22:22 +0000 (01:22 +0000)]
Merge "TYPE_DYNAMIC_SENSOR_META should be wake up sensor" am:
cec2ebf676
am:
8cddb920b5
Change-Id: I60391477badc56373f231911aae4172ee8d5cdf0
Peng Xu [Thu, 19 Jan 2017 01:17:42 +0000 (01:17 +0000)]
Merge "TYPE_DYNAMIC_SENSOR_META should be wake up sensor"
am:
cec2ebf676
Change-Id: I1f66dba79c07315ca07edf65ff4e7f1135083d6e