OSDN Git Service
Treehugger Robot [Tue, 20 Dec 2016 03:16:31 +0000 (03:16 +0000)]
Merge "Implement the discovery of a network recommendation provider."
Jeremy Joslin [Tue, 6 Dec 2016 15:42:38 +0000 (07:42 -0800)]
Implement the discovery of a network recommendation provider.
Updated the NetworkScorerAppManager to examine the list of configured
network recommendation providers and to select the first valid
provider.
As part of this update the old logic of looking for a valid network
scorer has been removed. Scorers/recommendation providers are only
selected from the configured list now. The setActiveScorer() method
has been deprecated as a result.
The NetworkScoreService has been updated to monitor the list of
potential recommendation providers and to reevaluate the binding
whenever they change. It also monitors the new setting for
NETWORK_RECOMMENDATIONS_ENABLED to connect or disconnect from the
provider as needed.
Test: runtest frameworks-services -c com.android.server.NetworkScoreServiceTest
BUG:
33158362
Change-Id: I450981261aa5355c1c91ec2e3a0a3b58cc65316b
Merged-In: I42aeb5223da794f71f7e58cb1bdf18817200cbf2
Treehugger Robot [Tue, 20 Dec 2016 01:06:22 +0000 (01:06 +0000)]
Merge "Remove ~1/3 of the installd calls at boot."
Jeff Sharkey [Mon, 19 Dec 2016 23:39:02 +0000 (16:39 -0700)]
Remove ~1/3 of the installd calls at boot.
When preparing CE storage for an app, we always perform a second call
to extract any newly created CE directory inode. Let's simplify this
and just return the inode number from the createAppData() call.
Test: builds, boots, reads CE inodes after wipe
Bug:
33463450
Change-Id: I9b73da576800b56d7d0961dd4deb0b6a546acbe7
Treehugger Robot [Mon, 19 Dec 2016 21:57:05 +0000 (21:57 +0000)]
Merge "Fix ScanResult array parceling."
Treehugger Robot [Mon, 19 Dec 2016 20:54:13 +0000 (20:54 +0000)]
Merge "Remove "final" from ResultCallback."
Joe LaPenna [Thu, 15 Dec 2016 22:46:52 +0000 (14:46 -0800)]
Remove "final" from ResultCallback.
Removing final makes providers easier to test using mocks.
Test: Build system image.
Change-Id: Iaaa30f73226e1d0cb0e9e68faa349e86986be72d
Merged-In: Iaaa30f73226e1d0cb0e9e68faa349e86986be72d
Jeremy Joslin [Sat, 17 Dec 2016 01:48:13 +0000 (17:48 -0800)]
Fix ScanResult array parceling.
readParcelableArray() wasn't working as expected so I just parceled
the array myself.
Test: adb shell am instrument -e class android.net.RecommendationRequestTest -w com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I83939d17769930b707b8bc579542c74a05e31d19
Merged-In: I47bc31adbedea817feaa5953cb6ee48506f9c6d6
Treehugger Robot [Sat, 17 Dec 2016 01:54:34 +0000 (01:54 +0000)]
Merge "Clean up local hprofs"
Michael Rosenfeld [Fri, 16 Dec 2016 20:42:01 +0000 (12:42 -0800)]
Clean up local hprofs
* After use
* Upon failure
Test: manual tool use
Change-Id: I2669e190c3792522c121158ea2aec84fe577c9e3
Marie Janssen [Fri, 16 Dec 2016 22:56:58 +0000 (22:56 +0000)]
Merge "Bluetooth: fix issues re-enabling after crash"
Marie Janssen [Thu, 15 Dec 2016 21:51:30 +0000 (13:51 -0800)]
Bluetooth: fix issues re-enabling after crash
When Bluetooth crashes, sometimes an LE app restarts it before
ActivityManager gets a chance. In this case, the Bluetooth manager
would assume the state should be LE only and did not continue to fully
enabled.
Luckily in this case the persisted system state is also ON. Use the
persisted state as information about whether we should be fully enabled.
Test: basic sanity check, forced crash of BT
Bug:
33632976
Change-Id: I546d7abccb82a26fcca2eb70d6d7c76e9510404e
Philip P. Moltmann [Fri, 16 Dec 2016 22:36:10 +0000 (22:36 +0000)]
Merge "Increment vers of PrintRecommendationService"
Treehugger Robot [Fri, 16 Dec 2016 22:20:24 +0000 (22:20 +0000)]
Merge changes Ic85892b4,I627e47c6
* changes:
Make sure Zygote is running at process priority 0 after VM has started.
Revert "Add boost to increase the load on newly-forked zygote processes."
Treehugger Robot [Fri, 16 Dec 2016 21:25:34 +0000 (21:25 +0000)]
Merge "Add the webview zygote socket to the zygote whitelist."
Philip P. Moltmann [Fri, 16 Dec 2016 20:51:49 +0000 (12:51 -0800)]
Increment vers of PrintRecommendationService
as the Samsung PlugIn was updated.
Test: Let the service generate some recommendations
Change-Id: Ief7ea4f1dddfee92aa9fa83ff53b296ced0e3b55
Treehugger Robot [Fri, 16 Dec 2016 20:23:47 +0000 (20:23 +0000)]
Merge "Set com.android.networkrecommendation as the default network recommendation service."
Andreas Gampe [Fri, 16 Dec 2016 19:24:12 +0000 (19:24 +0000)]
Merge changes Ia4bec085,I59095f2a
* changes:
Enable logwrapper functionality on user builds
Zygote: Add invoke-with to zygote protocol
Torne (Richard Coles) [Fri, 23 Sep 2016 15:41:42 +0000 (16:41 +0100)]
Add the webview zygote socket to the zygote whitelist.
Allow the webview zygote socket to be open at time of fork, so that
webview renderers can be forked successfully.
(cherry picked from commit
a7fcb2bc2a65da3743914727adb0df89a4eb0b66)
Test: WebView functions correctly with multiprocess dev setting enabled
Bug:
21643067
Change-Id: I312846433a43a8e4548cb2f98b96b56acf9f5333
Joe LaPenna [Thu, 8 Dec 2016 00:32:51 +0000 (16:32 -0800)]
Set com.android.networkrecommendation as the default network recommendation service.
BUG:
33224286
Test: Build image and verified the config value was set.
Change-Id: Id657c28753eaa6050bb2d82e45f70f694ce7e7dd
Merged-In: Id657c28753eaa6050bb2d82e45f70f694ce7e7dd
Treehugger Robot [Fri, 16 Dec 2016 18:31:25 +0000 (18:31 +0000)]
Merge "NativeLibraryHelper: Minor fixes"
Vitalii Tomkiv [Thu, 19 May 2016 00:43:02 +0000 (17:43 -0700)]
Make sure Zygote is running at process priority 0 after VM has started.
Boosting up zygote priority before VM startup, saves ~450ms of boot time
for N9, 180ms for Nexus 5X.
(cherry picked from commit
5d551a5ac3d13706f62a86842ff6851e1d25213b)
Bug:
28866384
Test: m
Test: Device boots
Change-Id: Ic85892b408e15bbc1de7ce706f113f23974fe478
Todd Kjos [Wed, 7 Sep 2016 01:25:46 +0000 (18:25 -0700)]
Revert "Add boost to increase the load on newly-forked zygote processes."
This reverts commit
6d43a861d01ef48f37c69f96346a13d23164a585.
(cherry picked from commit
0f2ded62ae3d88ddb732df182c3bfee3e2729018)
Test: m
Test: Device boots
Change-Id: I627e47c6ead4ce2d2bffa923a32a56d06c022df7
Tamas Berghammer [Fri, 11 Nov 2016 16:08:26 +0000 (16:08 +0000)]
Enable logwrapper functionality on user builds
When an app is debuggable, check whether a script called "wrap.sh" exists
in the app's native library directory. If so, start the app using the
invoke-with functionality over the script. Weaken the invoke-with check
on the zygote side to allow the functionality for debuggable apps.
The goal of the functionality is to make malloc debug, strace and other
similar tools available for NDK based application developers.
Bug:
33668201
Test: manual - debug malloc can be enabled using the new feature
Change-Id: Ia4bec0854cf4dc08446f1671494200f54ef366ee
Tamas Berghammer [Fri, 11 Nov 2016 16:08:26 +0000 (16:08 +0000)]
Zygote: Add invoke-with to zygote protocol
Add "--invoke-with" to the zygote connection protocol. It was
already understood as an argument by the zygote.
Bug:
33668201
Test: m
Change-Id: I59095f2ac542aadff78a7ff1dded86cf5f192707
Andreas Gampe [Fri, 16 Dec 2016 00:12:39 +0000 (16:12 -0800)]
NativeLibraryHelper: Minor fixes
Skip over directories when iterating library files. Ensure correct
temp file naming.
Bug:
33668201
Test: m
Test: Device boots
Test: Manual: Install debuggable and non-debuggable apps
Change-Id: I2f0547e965d9a0c478e333a13b2db02f4eedac2c
Treehugger Robot [Fri, 16 Dec 2016 10:29:03 +0000 (10:29 +0000)]
Merge "Make TelephonyManager APIs public:"
Treehugger Robot [Fri, 16 Dec 2016 08:46:58 +0000 (08:46 +0000)]
Merge "Move libandroid_runtime headers into frameworks/base/core/jni"
Treehugger Robot [Fri, 16 Dec 2016 00:35:54 +0000 (00:35 +0000)]
Merge "Install all files from the lib directory for debuggable apps"
Adrian Roos [Thu, 15 Dec 2016 23:51:11 +0000 (23:51 +0000)]
Merge "Assist app is not launched when long-pressing on Home key"
Treehugger Robot [Thu, 15 Dec 2016 22:17:47 +0000 (22:17 +0000)]
Merge "[HS2.0] Need to compare with not only FQDN but SSID"
Martijn Coenen [Thu, 15 Dec 2016 20:28:48 +0000 (20:28 +0000)]
Merge "HwBinder: Remove use of IHw class."
Treehugger Robot [Thu, 15 Dec 2016 20:13:28 +0000 (20:13 +0000)]
Merge "Split mac_permissions.xml into plat and non-plat components."
dcashman [Wed, 14 Dec 2016 21:46:05 +0000 (13:46 -0800)]
Split mac_permissions.xml into plat and non-plat components.
Bug:
31363362
Test: Bullhead and Sailfish both build and boot without new denials.
Change-Id: Ic9523ce4b0755d6c585548f4f2b1f00e7000195b
Erik Kline [Thu, 15 Dec 2016 12:10:16 +0000 (12:10 +0000)]
Merge "Have IpManager track L2-L4 signaling traffic required for IP connectivity."
Joachim Sauer [Thu, 15 Dec 2016 11:16:39 +0000 (11:16 +0000)]
Merge "API updated for ICU4J 58.1"
Erik Kline [Wed, 19 Oct 2016 08:42:01 +0000 (17:42 +0900)]
Have IpManager track L2-L4 signaling traffic required for IP connectivity.
Test: as follows
- built and flashed
- observed logcat
- observed "dumpsys wifi ipmanager"
- runtest BlockingSocketReaderTest passes
- runtest ConnectivityPacketSummaryTest passes
Bug:
21859053
Bug:
26101306
Bug:
31742572
Bug:
31707128
Bug:
33531488
Change-Id: Ibecaf809dcc1813924b25749e8ba8eb2d4bdf114
Treehugger Robot [Thu, 15 Dec 2016 06:49:35 +0000 (06:49 +0000)]
Merge changes I4968d5aa,Ieb34d79a,Idc073536
* changes:
Move hwui private headers to frameworks/base/libs/hwui/private
Convert libstorage to Android.bp
Move libstorage includes into frameworks/base/lib/storage
Treehugger Robot [Thu, 15 Dec 2016 05:10:10 +0000 (05:10 +0000)]
Merge "More correct startup and shutdown procedures."
Erik Kline [Mon, 12 Dec 2016 12:21:40 +0000 (21:21 +0900)]
More correct startup and shutdown procedures.
During IpManager startup, anything sending messages to the state machine
must not begin doing so until after the state machine has been started.
Reorder the constructor accordingly.
During shutdown, AvoidBadWifiTracker needs to unregister the registered
BroadcastReceiver and might as well also unregister the ContentObserver.
Test: backport from internal
Bug:
33388922
Change-Id: I58e07f7ccddaab160c153bcfb69fd45f50bb8710
Treehugger Robot [Wed, 14 Dec 2016 23:23:50 +0000 (23:23 +0000)]
Merge "Fix a memory leak."
Colin Cross [Wed, 14 Dec 2016 21:29:28 +0000 (13:29 -0800)]
Move libandroid_runtime headers into frameworks/base/core/jni
Move libandroid_runtime's headers into its source directory, and export
them to modules that link against libandroid_runtime. Also fixes
one unused-paramter warning that was hidden by the use of -isystem to
include frameworks/base/include.
Bug:
33630870
Test: m -j native
Change-Id: Id6c2561d6c7d82a7ca2d183f11b1d3d3dcb42843
Colin Cross [Wed, 14 Dec 2016 21:34:20 +0000 (13:34 -0800)]
Move hwui private headers to frameworks/base/libs/hwui/private
hwui already exports most of its headers, move its private headers
into its source directory.
Bug:
33630870
Test: m -j native
Change-Id: I4968d5aaaa68d9e92c826841d20f29cef349c9d8
Colin Cross [Wed, 14 Dec 2016 21:06:07 +0000 (13:06 -0800)]
Convert libstorage to Android.bp
See build/soong/README.md for more information.
Test: m -j native
Change-Id: Ieb34d79af10e4e7cd146d0d40fd6946499dd1da0
Colin Cross [Wed, 14 Dec 2016 21:03:12 +0000 (13:03 -0800)]
Move libstorage includes into frameworks/base/lib/storage
Move the libstorage includes out of the global include path and into
frameworks/base/lib/storage/include, and export it.
Bug:
33630870
Test: m -j native
Change-Id: Idc0735360abc703496b9bc46d1a76ce8039af0d1
Hall Liu [Wed, 14 Dec 2016 19:55:00 +0000 (19:55 +0000)]
Merge "Add ability to set supported audio routes on phone accounts and connection"
Treehugger Robot [Wed, 14 Dec 2016 19:47:48 +0000 (19:47 +0000)]
Merge "Add an IPC for requesting network scores."
Treehugger Robot [Wed, 14 Dec 2016 19:47:31 +0000 (19:47 +0000)]
Merge "Bluetooth: log message improvements"
Marie Janssen [Tue, 13 Dec 2016 18:51:02 +0000 (10:51 -0800)]
Bluetooth: log message improvements
Some log improvements:
- Reduce logspam
- Use names for states in logs instead of numbers
- Be more consistent with messages
Also remove some commented out dead code.
Test: run on phone, observe more useful logs
Change-Id: I32163278e148be144c03d4e8aaf0eb761226c94c
Jeremy Joslin [Wed, 14 Dec 2016 00:11:51 +0000 (16:11 -0800)]
Add an IPC for requesting network scores.
Migrating the NetworkScoreManager.requestScores() method to use an
IPC rather than a broadcast.
Defined the new IPC in the AIDL files for NetworkScoreService and
NetworkRecommendationProvider. Added a no-op implementation in
NetworkScoreService and a full implementation in
NetworkRecommendationProvider (plus tests).
Test: adb shell am instrument -e class android.net.NetworkRecommendationProviderTest -w com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
BUG:
33593157
Change-Id: Iacf7b6d424ec3c57e8b89e5abc6bc3e8414097b9
Merged-In: I951f6186aa11ddbe5a94e374173a1fd40b2a4cce
Marco Nelissen [Wed, 14 Dec 2016 16:44:47 +0000 (16:44 +0000)]
Merge "Revert "Remove AmrInputStream""
Marco Nelissen [Wed, 14 Dec 2016 16:44:12 +0000 (16:44 +0000)]
Revert "Remove AmrInputStream"
This reverts commit
0c3518cc7724df29b790d9d81af9a105e7958cf7.
Change-Id: I250d86d2d6ce462cb5f29bc6c312d88a49ac24a4
Paul Duffin [Wed, 14 Dec 2016 14:50:55 +0000 (14:50 +0000)]
Merge "Copy core-junit files into legacy-test."
Paul Duffin [Mon, 12 Dec 2016 16:35:36 +0000 (16:35 +0000)]
Copy core-junit files into legacy-test.
The legacy-test directory contains part of the Android API and
so must maintain backwards compatibility. The junit classes that
are in the API are copied here to ensure that they do not change
when external/junit is upgraded.
Bug:
30188076
Test: make checkbuild and checked legacy-test contents
Change-Id: I6c263afc16c06abfd027334be51a41422239a189
Paul Duffin [Wed, 14 Dec 2016 13:22:39 +0000 (13:22 +0000)]
Merge "Copy junit-runner files into test-runner."
Paul Duffin [Mon, 12 Dec 2016 12:22:31 +0000 (12:22 +0000)]
Copy junit-runner files into test-runner.
The android.test.runner target forms part of the Android API and
so must maintain backwards compatibility. The junit classes that
belong in there are copied here to ensure that they do not
change when external/junit is upgraded.
Bug:
30188076
Test: make checkbuild and checked android.test.runner contents
Change-Id: I947144c47ae1c3eb361a43c39bdd03dc11b9575f
Treehugger Robot [Wed, 14 Dec 2016 07:51:00 +0000 (07:51 +0000)]
Merge "Stop setting net.hostname"
Erik Kline [Wed, 14 Dec 2016 03:06:53 +0000 (12:06 +0900)]
Stop setting net.hostname
Test: as follows
- basics:
- built
- flashed
- booted
- connect to {v4-only, dualstack, v6-only} networks
- verified expected connectivity on each
- runtest frameworks-net
Bug:
30979015
Change-Id: I65e9878c7b8eaddaba1c0e1b8566ddfa0760047f
Treehugger Robot [Wed, 14 Dec 2016 03:07:48 +0000 (03:07 +0000)]
Merge "DHCPv4 anonymity profile: support skipping hostname option"
Christine Hallstrom [Thu, 1 Dec 2016 00:06:42 +0000 (16:06 -0800)]
Add ability to set supported audio routes on phone accounts and connection
The set audio routes are used by Telecom to restrict where the audio may
be routed to. For example, an account can specify that calls may not be
routed over bluetooth headsets, which will prevent a new call from being
routed to this source.
This is a cherry-pick of abandoned ag/
1521009.
Bug:
32958838
Change-Id: Idd5e4d38b157f11454f3d991385644f2f384596e
George Burgess IV [Tue, 13 Dec 2016 23:32:00 +0000 (15:32 -0800)]
Fix a memory leak.
This was caught by clang's static analyzer. Warning:
frameworks/base/media/mca/filterfw/native/core/shader_program.cpp:1031:3:
warning: Potential leak of memory pointed to by 'attrib.owned_data'
return StoreAttribute(attrib);
Bug: None.
Test: The static analyzer no longer complains.
Change-Id: Ibef0368dfa48ba57e38019a5a3e33d5bacd847a2
Marco Nelissen [Tue, 13 Dec 2016 23:09:21 +0000 (23:09 +0000)]
Merge "Remove AmrInputStream"
Marco Nelissen [Fri, 11 Nov 2016 21:18:12 +0000 (13:18 -0800)]
Remove AmrInputStream
Bug:
32114618
Change-Id: I55328e6f003377f4d3c2ba2266844047b1422f49
Polina Bondarenko [Tue, 13 Dec 2016 17:56:41 +0000 (18:56 +0100)]
Make TelephonyManager APIs public:
TelephonyManager.getSimState(slotIdx) and
TelephonyManager.SIM_STATE_CARD_RESTRICTED.
It is needed for OobConfig app unbundling.
Bug:
33479833
Test: run cts -m CtsTelephonyTestCases
Change-Id: I375f436bc4e1dcedc0656866a0838c7bf5948422
Treehugger Robot [Tue, 13 Dec 2016 16:04:35 +0000 (16:04 +0000)]
Merge "Make the onRequestRecommendation() method async."
Tobias Thierer [Tue, 13 Dec 2016 13:36:07 +0000 (13:36 +0000)]
Merge "API changes for updating Locale to OpenJDK8u60, part 2"
Erik Kline [Tue, 13 Dec 2016 04:44:19 +0000 (13:44 +0900)]
DHCPv4 anonymity profile: support skipping hostname option
Per https://tools.ietf.org/html/rfc7844#section-3.7
When using the anonymity profile, DHCP clients SHOULD NOT send the
Host Name option.
Once the net.hostname property is removed and ensured unset via CTS
this option will no longer be sent.
Test: as follows
- build, flashed
- connected to v4-only and dualstack networks, verified v4 works
- android.net.dhcp.DhcpPacketTest passes
- setprop net.hostname "" and verified no hostname option
Bug:
30979015
Change-Id: Ieab3f04ea38e176d9147bb788742a5397762c2e4
sghuman [Tue, 13 Dec 2016 02:08:39 +0000 (02:08 +0000)]
Merge "Copy WifiNetworkScoreCache into frameworks/base. Add tests."
Jeremy Joslin [Thu, 8 Dec 2016 18:24:02 +0000 (10:24 -0800)]
Make the onRequestRecommendation() method async.
Converted the NetworkRecommendationProvider.onRequestRecommendation()
method into an async call to give implementors more flexibility.
Added unit tests for NetworkRecommendationProvider.
Test: Added NetworkRecommendationProviderTest.
BUG:
32909424
Change-Id: I8c1d2e11baa539744d77a012e85351f750523e3b
Merged-In: Iebe72f260133e9ad1946b0b75e2f69635e154ef3
Josh Gao [Tue, 13 Dec 2016 00:28:09 +0000 (00:28 +0000)]
Merge "Add trace category for adb."
Treehugger Robot [Tue, 13 Dec 2016 00:18:56 +0000 (00:18 +0000)]
Merge "DO NOT MERGE: Migrate NetworkPolicyManagerServiceTest to JUnit 4."
Jerry Zhang [Tue, 13 Dec 2016 00:12:04 +0000 (00:12 +0000)]
Merge "Modify UsbDeviceManager stack to allow MtpServer to use FunctionFS drivers."
Treehugger Robot [Mon, 12 Dec 2016 23:00:17 +0000 (23:00 +0000)]
Merge "DO NOT MERGE: Fixed NetworkPolicyManagerServiceTest."
Sundeep Ghuman [Wed, 30 Nov 2016 03:56:48 +0000 (19:56 -0800)]
Copy WifiNetworkScoreCache into frameworks/base. Add tests.
Begin process of migrating WifiNetworkScoreCache.java from System Server
(//frameworks/opt/net/wifi/service/java/com/android/server/wifi/) to a
SystemApi. This CL is a straight copy and paste of
WifiNetworkScoreCache.java. Only new code is located in
WifiNetworkScoreCacheTest.java
Bug: b/
33050254
Test: Unit tests added to cover most common use cases.
Change-Id: I7510420d293339ce7811fcf71a6efceb8d809c3a
sghuman [Mon, 12 Dec 2016 22:53:18 +0000 (22:53 +0000)]
Merge "Fix erroneous constructor in ScoredNetwork.java"
Sundeep Ghuman [Mon, 12 Dec 2016 22:36:03 +0000 (14:36 -0800)]
Fix erroneous constructor in ScoredNetwork.java
Test: Unit tests in ag/310934.
Change-Id: I0075b15f59796872ea9779c04373563607d2f883
Felipe Leme [Fri, 12 Aug 2016 22:19:40 +0000 (15:19 -0700)]
DO NOT MERGE: Migrate NetworkPolicyManagerServiceTest to JUnit 4.
BUG:
30839080
Test: runtest --path
frameworks/base/services/tests/servicestests/src/com/android/server/NetworkPolicyManagerServiceTest.java
(cherry picked from Ic192334389eed7596e1f7cb8ce98a5169262418c)
Change-Id: I90cf55ad948bbe0883473431f40201cf4206dc82
Felipe Leme [Wed, 10 Aug 2016 21:46:39 +0000 (14:46 -0700)]
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
Marie Janssen [Mon, 12 Dec 2016 21:27:23 +0000 (21:27 +0000)]
Merge "DO NOT MERGE Add Bluetooth toggle prompts - framework"
Treehugger Robot [Mon, 12 Dec 2016 21:14:56 +0000 (21:14 +0000)]
Merge "Add simplified_network_settings_bool to CarrierConfigManager."
Josh Gao [Tue, 29 Nov 2016 18:57:01 +0000 (10:57 -0800)]
Add trace category for adb.
Bug: http://b/
31289465
Test: systrace
Change-Id: I765c55c264329227556ff25655e3f00c5c3e8b54
Jeff Sharkey [Mon, 12 Dec 2016 19:30:22 +0000 (19:30 +0000)]
Merge "Catch all exceptions from installd, log codes."
Joe LaPenna [Thu, 8 Dec 2016 00:27:24 +0000 (16:27 -0800)]
Add simplified_network_settings_bool to CarrierConfigManager.
BUG:
33111931
Test: runtest carrierconfig-unit
Change-Id: I3da3048afcf1547c46db5c76ff68165246faa77a
Jerry Zhang [Mon, 24 Oct 2016 21:35:08 +0000 (14:35 -0700)]
Modify UsbDeviceManager stack to allow MtpServer to use FunctionFS drivers.
Functionfs requires MtpServer to write descriptors before the device can be
configured. This adds a new configure call that will occur only when
functions are changed (new argument added to updateUsbStateBroadcast for this)
and be called after sys.usb.config is changed but before the waitForState
call to ensure compatibility with configfs devices.
Bug:
30976142
Change-Id: I7e94a5847d3b19c0fd75139e1b15a3f2a1cea01d
Test: Manual
Svetoslav Ganov [Thu, 30 Jun 2016 00:31:44 +0000 (17:31 -0700)]
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
Neil Fuller [Mon, 12 Dec 2016 17:23:18 +0000 (17:23 +0000)]
Merge "Track BufferIterator changes in libcore"
Jeff Sharkey [Mon, 12 Dec 2016 17:15:37 +0000 (10:15 -0700)]
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
Martijn Coenen [Thu, 8 Dec 2016 09:48:19 +0000 (10:48 +0100)]
HwBinder: Remove use of IHw class.
Note that this is somewhat of a hack, until we properly
solve b/
33440494.
Bug:
33440494
Bug:
33173166
Test: mma, hidl_test, hidl_test_java
Change-Id: I7db8eb11c8c9c624f2f5ed11bef6c32f155b5a76
Treehugger Robot [Mon, 12 Dec 2016 08:16:35 +0000 (08:16 +0000)]
Merge "Stop setting net.dns{1234} system properties."
Jeff Sharkey [Sat, 10 Dec 2016 22:57:22 +0000 (22:57 +0000)]
Merge "Remove DEXOPT_OTA flag."
Jeff Sharkey [Sat, 10 Dec 2016 22:54:51 +0000 (22:54 +0000)]
Merge "Final push of installd to Binder; goodbye socket!"
Michael Rosenfeld [Sat, 10 Dec 2016 00:48:52 +0000 (00:48 +0000)]
Merge "Copy preload2.jar to build artifacts"
Michael Rosenfeld [Wed, 7 Dec 2016 19:49:34 +0000 (11:49 -0800)]
Copy preload2.jar to build artifacts
Test: local build
Bug:
33492076
Change-Id: I76de648cd1947e49278a678a4c6f1dce8092bbd4
Jeff Sharkey [Sat, 10 Dec 2016 00:08:06 +0000 (17:08 -0700)]
Remove DEXOPT_OTA flag.
Test: builds, boots
Bug:
13758960,
30944031
Change-Id: I266a39c6dc7948f784580e4ef1cf0bb8ee27d0e7
Treehugger Robot [Fri, 9 Dec 2016 23:56:34 +0000 (23:56 +0000)]
Merge "Update registerNetworkScoreCache() to accept a filter type."
Jeff Sharkey [Fri, 9 Dec 2016 21:31:26 +0000 (14:31 -0700)]
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
Jeremy Joslin [Wed, 30 Nov 2016 23:05:40 +0000 (15:05 -0800)]
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
Jeff Sharkey [Fri, 9 Dec 2016 16:42:25 +0000 (16:42 +0000)]
Merge "Prepare to move dexopt calls to Binder."
Neil Fuller [Fri, 9 Dec 2016 14:59:26 +0000 (14:59 +0000)]
Track BufferIterator changes in libcore
Addition of a new method pos().
Bug:
31008728
Test: make
Change-Id: Id5fcb13104a8580ffaa7d4f8d3c473fe14ac5ccd
Paul Duffin [Fri, 9 Dec 2016 14:56:37 +0000 (14:56 +0000)]
Merge "Move android.test classes from core/java to legacy-test/src"