Felipe Leme
9f0030a98a
Merge "DO NOT MERGE: Fixed NetworkPolicyManagerServiceTest."
...
am: d0fdf7aba3
2016-12-12 23:12:25 +00:00
sghuman
eaed9ef0b7
Merge "Fix erroneous constructor in ScoredNetwork.java"
...
am: 9d55f43719
2016-12-12 23:07:22 +00:00
Treehugger Robot
d0fdf7aba3
Merge "DO NOT MERGE: Fixed NetworkPolicyManagerServiceTest."
2016-12-12 23:00:18 +00:00
sghuman
9d55f43719
Merge "Fix erroneous constructor in ScoredNetwork.java"
2016-12-12 22:53:19 +00:00
Sundeep Ghuman
23f98ebe33
Fix erroneous constructor in ScoredNetwork.java
...
Test: Unit tests in ag/310934.
Change-Id: I0075b15f59796872ea9779c04373563607d2f883
2016-12-12 14:36:03 -08:00
Felipe Leme
4ef40087be
DO NOT MERGE: Fixed NetworkPolicyManagerServiceTest.
...
NetworkPolicyManagerServiceTest had many tests there were @Suppressed
because they were obsolete and harder to fix using Easymocks.
This CL replaced EasyMock by Mockito and re-enabled most tests, although
some tests were removed because:
- It's underlying logic changed too much that.
- It would be hard to mock all external entities they interact with.
- They are covered by CTS tests.
Bug: 30764608
Test: runtest --path
frameworks/base/services/tests/servicestests/src/com/android/server/NetworkPolicyManagerServiceTest.java
(cherry picked from commit I53ff86fc9b64cb058846f1aefa244771630d9e1e)
Change-Id: Ia9cdb780cb0917477b310dc38d2e39731d6a7609
2016-12-12 14:18:39 -08:00
Marie Janssen
964f769d63
Merge "DO NOT MERGE Add Bluetooth toggle prompts - framework"
...
am: 47e1f497c0
2016-12-12 21:34:39 +00:00
Joe LaPenna
2bc66bf601
Merge "Add simplified_network_settings_bool to CarrierConfigManager."
...
am: 9b430e0395
2016-12-12 21:28:29 +00:00
Marie Janssen
47e1f497c0
Merge "DO NOT MERGE Add Bluetooth toggle prompts - framework"
2016-12-12 21:27:23 +00:00
Treehugger Robot
9b430e0395
Merge "Add simplified_network_settings_bool to CarrierConfigManager."
2016-12-12 21:14:57 +00:00
Jeff Sharkey
6f7b136b40
Merge "Catch all exceptions from installd, log codes."
...
am: 9a10ca3f4c
2016-12-12 19:42:22 +00:00
Jeff Sharkey
9a10ca3f4c
Merge "Catch all exceptions from installd, log codes."
2016-12-12 19:30:23 +00:00
Joe LaPenna
2b22ae3b87
Add simplified_network_settings_bool to CarrierConfigManager.
...
BUG: 33111931
Test: runtest carrierconfig-unit
Change-Id: I3da3048afcf1547c46db5c76ff68165246faa77a
2016-12-12 19:27:16 +00:00
Svetoslav Ganov
c2ac5bde6f
DO NOT MERGE Add Bluetooth toggle prompts - framework
...
If permission review is enabled toggling bluetoth on or off
results in a user prompt to collect consent. This applies
only to legacy apps, i.e. ones that don't support runtime
permissions as they target SDK 22.
Also added a configuration resource which controls whether
permission review mode is enabled. By default it is not and
an OEM can change this via an overlay. For now we also keep
the old mechanism to toggle review mode via a build property
which is still used and will be removed when clients have
transitioned.
bug:28715749
Change-Id: I77bca2305f9d0f20034b2c8fc5b58e0565d5e617
2016-12-12 09:50:24 -08:00
Neil Fuller
4ff3c27817
Merge "Track BufferIterator changes in libcore"
...
am: 021e8ff2af
2016-12-12 17:33:43 +00:00
Neil Fuller
021e8ff2af
Merge "Track BufferIterator changes in libcore"
2016-12-12 17:23:18 +00:00
Jeff Sharkey
447a3ac16b
Catch all exceptions from installd, log codes.
...
Now that installd is throwing both SecurityException and
IllegalArgumentException, it's time that we turned all these
into InstallerException.
Also extend ServiceSpecificException to include the contained
errorCode value when printing.
Test: builds, boots, apps install/uninstall fine
Bug: 13758960, 30944031
Change-Id: Ic9c1e99ae87f4442402ef528bf352c7978572c85
2016-12-12 10:16:32 -07:00
Erik Kline
c715ea8458
Merge "Stop setting net.dns{1234} system properties."
...
am: 7552e2de9d
2016-12-12 08:29:14 +00:00
Treehugger Robot
7552e2de9d
Merge "Stop setting net.dns{1234} system properties."
2016-12-12 08:16:35 +00:00
Jeff Sharkey
3dae5ca9d6
Merge "Remove DEXOPT_OTA flag."
...
am: 8584db972c
2016-12-10 23:06:56 +00:00
Jeff Sharkey
104fd011b2
Merge "Final push of installd to Binder; goodbye socket!"
...
am: 1950377f91
2016-12-10 23:01:59 +00:00
Jeff Sharkey
8584db972c
Merge "Remove DEXOPT_OTA flag."
2016-12-10 22:57:22 +00:00
Jeff Sharkey
1950377f91
Merge "Final push of installd to Binder; goodbye socket!"
2016-12-10 22:54:52 +00:00
Michael Rosenfeld
dc017c4e49
Merge "Copy preload2.jar to build artifacts"
...
am: 64583c332a
2016-12-10 01:01:13 +00:00
Michael Rosenfeld
64583c332a
Merge "Copy preload2.jar to build artifacts"
2016-12-10 00:48:52 +00:00
Michael Rosenfeld
d19ea14f30
Copy preload2.jar to build artifacts
...
Test: local build
Bug: 33492076
Change-Id: I76de648cd1947e49278a678a4c6f1dce8092bbd4
2016-12-09 16:16:54 -08:00
Jeff Sharkey
4f05cd8900
Remove DEXOPT_OTA flag.
...
Test: builds, boots
Bug: 13758960, 30944031
Change-Id: I266a39c6dc7948f784580e4ef1cf0bb8ee27d0e7
2016-12-09 17:09:30 -07:00
Jeremy Joslin
4150ec18e9
Merge "Update registerNetworkScoreCache() to accept a filter type."
...
am: a511a07fa3
2016-12-10 00:06:37 +00:00
Treehugger Robot
a511a07fa3
Merge "Update registerNetworkScoreCache() to accept a filter type."
2016-12-09 23:56:35 +00:00
Jeff Sharkey
740f523b25
Final push of installd to Binder; goodbye socket!
...
Move last two straggling installd commands to Binder and destroy the
socket-based communication channel forever.
Test: builds, boots, apps install fine, pre-OTA dexopt works
Bug: 13758960, 30944031
Change-Id: I9afb9f71858febde34a94f53839b2986493b68a0
2016-12-09 15:30:34 -07:00
Jeremy Joslin
823db059e4
Update registerNetworkScoreCache() to accept a filter type.
...
Defined a new IntDef in NetworkScoreManager named CacheUpdateFilter
with 3 values. Caches must be registered with a filter value and will
only receive updates based on their registered filter. Actual
filtering implementation will follow.
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
BUG: 32912120
Change-Id: I3ce0bee171e6405176358479fa8a532fd5193824
Merged-In: I8940e0ed1a7bbcb5a81fb3b6a7fafe4fbbc33875
2016-12-09 13:15:15 -08:00
Jeff Sharkey
35cbe8ffb0
Merge "Prepare to move dexopt calls to Binder."
...
am: d7b144a5e9
2016-12-09 16:53:46 +00:00
Jeff Sharkey
d7b144a5e9
Merge "Prepare to move dexopt calls to Binder."
2016-12-09 16:42:25 +00:00
Paul Duffin
28b617bdea
Merge "Move android.test classes from core/java to legacy-test/src"
...
am: 2761ed124a
2016-12-09 15:05:06 +00:00
Neil Fuller
5ba69e46ed
Track BufferIterator changes in libcore
...
Addition of a new method pos().
Bug: 31008728
Test: make
Change-Id: Id5fcb13104a8580ffaa7d4f8d3c473fe14ac5ccd
2016-12-09 14:59:26 +00:00
Paul Duffin
2761ed124a
Merge "Move android.test classes from core/java to legacy-test/src"
2016-12-09 14:56:37 +00:00
Hugo Benichi
4180078d0d
Merge "Removing bogus file added by mistake"
...
am: a44c833042
2016-12-09 10:58:21 +00:00
Przemyslaw Szczepaniak
104e268a14
Merge "Track libcore change 547177ca5c312f84fb22e6e7bf12f54129034e5d"
...
am: 4ee94a6a9b
2016-12-09 10:54:03 +00:00
Treehugger Robot
a44c833042
Merge "Removing bogus file added by mistake"
2016-12-09 10:50:11 +00:00
Przemyslaw Szczepaniak
4ee94a6a9b
Merge "Track libcore change 547177ca5c312f84fb22e6e7bf12f54129034e5d"
2016-12-09 10:46:19 +00:00
Lorenzo Colitti
1a2fa0f372
Merge changes from topic 'framework-net-aosp'
...
am: ab4c79bd96
2016-12-09 09:48:51 +00:00
Hugo Benichi
9f65f04157
DO NOT MERGE: frameworks-test: adding missing @SmallTest
...
am: cfcc1cb7bf
2016-12-09 09:36:16 +00:00
Hugo Benichi
d84f932680
DO NOT MERGE: Netd events: record connect() success/errno
...
am: 5d0f28c7fd
2016-12-09 09:34:51 +00:00
Lorenzo Colitti
50c77cb9c0
DO NOT MERGE: Add missing dependency.
...
am: 744b02069d
2016-12-09 09:34:11 +00:00
Tony Mak
118071a481
DO NOT MERGE: Show notification for always-on app VPN
...
am: de7f7d195e
2016-12-09 09:33:28 +00:00
Stephen Chen
3f5785260e
DO NOT MERGE: Implement metered tracking for NetworkStats summary queries.
...
am: 963e8ddf6d
2016-12-09 09:32:43 +00:00
Hugo Benichi
a452f24e30
DO NOT MERGE: NetworkMonitor: send one DNS probe per web probe
...
am: 2a43b208cc
2016-12-09 09:31:59 +00:00
Hugo Benichi
9908c161ca
DO NOT MERGE: NetworkMonitor metrics: add first validation information
...
am: 21680fd25d
2016-12-09 09:31:16 +00:00
Hugo Benichi
0d95fc9552
DO NOT MERGE: APF: also drop any ICMPv6 RSs
...
am: 02428988ad
2016-12-09 09:30:09 +00:00
Hugo Benichi
a30ae5542b
DO NOT MERGE: ConnectivityServiceTest: fix testAvoidBadWifiSettings
...
am: 53d83d5142
2016-12-09 09:29:11 +00:00
