OSDN Git Service
Colin Cross [Fri, 16 Dec 2016 08:57:51 +0000 (08:57 +0000)]
Move libandroid_runtime headers into frameworks/base/core/jni
am:
71044fe7e5
Change-Id: I70e7c0ca02a2783ab2c32a9d067ba75092fd81c6
Tamas Berghammer [Fri, 16 Dec 2016 00:48:21 +0000 (00:48 +0000)]
Merge "Install all files from the lib directory for debuggable apps"
am:
c0cc7c646c
Change-Id: Idc3b17fa4044ab0dd50fa141f1ec5ec8a47810b0
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 [Fri, 16 Dec 2016 00:01:24 +0000 (00:01 +0000)]
Merge "Assist app is not launched when long-pressing on Home key"
am:
1e41bb4887
Change-Id: I3d88e9116c45cec013c4b7a3bb3f53480f0f2af6
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"
Shinji Sogo [Thu, 15 Dec 2016 22:32:03 +0000 (22:32 +0000)]
Merge "[HS2.0] Need to compare with not only FQDN but SSID"
am:
69e7f9683d
Change-Id: I7ce35b895d24b013169aa30b794fb524bac09990
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:38:07 +0000 (20:38 +0000)]
Merge "HwBinder: Remove use of IHw class."
am:
11ec22ab2a
Change-Id: Icbeb3bb7548b00c5e28f689c761a4de425e1bd74
dcashman [Thu, 15 Dec 2016 20:32:54 +0000 (20:32 +0000)]
Merge "Split mac_permissions.xml into plat and non-plat components."
am:
a1c9c860a9
Change-Id: I11397c898e5cf7b0dd4a300646b409d28eb00b59
Martijn Coenen [Thu, 15 Dec 2016 20:28:48 +0000 (20:28 +0000)]
Merge "HwBinder: Remove use of IHw class."
dcashman [Thu, 15 Dec 2016 20:27:27 +0000 (20:27 +0000)]
Split mac_permissions.xml into plat and non-plat components.
am:
b1cc4f8ca4
Change-Id: I4c3d3a9c088c4cfc75f5503966390030e1375305
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:22:06 +0000 (12:22 +0000)]
Merge "Have IpManager track L2-L4 signaling traffic required for IP connectivity."
am:
80ff5ecd4a
Change-Id: If85702e1cc44967841ab91d723aa627862bcda21
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:24:52 +0000 (11:24 +0000)]
Merge "API updated for ICU4J 58.1"
am:
9e3b160fc3
Change-Id: If8d8b9708217442bf23f092ef2e1bfd235926aff
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
Colin Cross [Thu, 15 Dec 2016 07:01:01 +0000 (07:01 +0000)]
Merge changes I4968d5aa,Ieb34d79a,Idc073536
am:
c2f9ae35e6
Change-Id: Icd7cc5949d1388a5f928561dc0eea8a7df91b1b9
Colin Cross [Thu, 15 Dec 2016 07:00:54 +0000 (07:00 +0000)]
Move hwui private headers to frameworks/base/libs/hwui/private
am:
19def9943a
Change-Id: Ic26ef842f58a9db61e7ee12b3d4d858fc24cfbc8
Colin Cross [Thu, 15 Dec 2016 07:00:07 +0000 (07:00 +0000)]
Convert libstorage to Android.bp
am:
3ac2be93a9
Change-Id: Ia1d78149bfedcc7e8959d557ac3a239a77c04924
Colin Cross [Thu, 15 Dec 2016 06:59:18 +0000 (06:59 +0000)]
Move libstorage includes into frameworks/base/lib/storage
am:
e78f853e46
Change-Id: Icac09a62152f11cf7a8d5ce5ffe9011949e17ec0
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
Erik Kline [Thu, 15 Dec 2016 05:25:48 +0000 (05:25 +0000)]
Merge "More correct startup and shutdown procedures."
am:
618d4215a2
Change-Id: I4844130b04ded0fc913593081d07a6052bdc0e42
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
George Burgess IV [Wed, 14 Dec 2016 23:34:23 +0000 (23:34 +0000)]
Merge "Fix a memory leak."
am:
1715678a89
Change-Id: Ia005c534ef0e62e3efd6f59954cd2850349c7672
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 20:03:54 +0000 (20:03 +0000)]
Merge "Add ability to set supported audio routes on phone accounts and connection"
am:
d11261dcc9
Change-Id: I002d1d32e6c0fb69c99047a19ca07f4326ec5323
Jeremy Joslin [Wed, 14 Dec 2016 20:02:45 +0000 (20:02 +0000)]
Merge "Add an IPC for requesting network scores."
am:
e89ed4a001
Change-Id: I23bee3f29d3b3f71da6103e23afafc2df128ab75
Marie Janssen [Wed, 14 Dec 2016 20:01:39 +0000 (20:01 +0000)]
Merge "Bluetooth: log message improvements"
am:
f34bdf7676
Change-Id: Ic89c59257559d95119829fa4157dbb763124e86f
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:59:23 +0000 (16:59 +0000)]
Merge "Revert "Remove AmrInputStream""
am:
e2d8581529
Change-Id: I55615b328bedf67819d076ccb21b9bc1f13a07a8
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 15:02:20 +0000 (15:02 +0000)]
Merge "Copy core-junit files into legacy-test."
am:
69e363f506
Change-Id: I95f3c2005e87f86f7014f6bf693eae7212f54a73
Paul Duffin [Wed, 14 Dec 2016 15:02:16 +0000 (15:02 +0000)]
Copy core-junit files into legacy-test.
am:
cd7c34d8bf
Change-Id: I672fa4b006b04db5a4c8f86793f1c891bc55754a
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:35:44 +0000 (13:35 +0000)]
Merge "Copy junit-runner files into test-runner."
am:
3e24af3eb7
Change-Id: I55ec07039052bf6030a16bfa0cbeedc8690809f7
Paul Duffin [Wed, 14 Dec 2016 13:30:03 +0000 (13:30 +0000)]
Copy junit-runner files into test-runner.
am:
eef35dd29a
Change-Id: I974279917ae3451abf44143161ac945f4153768f
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
Erik Kline [Wed, 14 Dec 2016 07:59:59 +0000 (07:59 +0000)]
Merge "Stop setting net.hostname"
am:
06178a39f8
Change-Id: Id03d2f8bf6fa8b447c5f32d3d2a51faef193ba62
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
Erik Kline [Wed, 14 Dec 2016 03:22:12 +0000 (03:22 +0000)]
Merge "DHCPv4 anonymity profile: support skipping hostname option"
am:
eef38717b9
Change-Id: Id0eff1bdb60f1895fa6dd6c619071994efd79939
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:22:14 +0000 (23:22 +0000)]
Merge "Remove AmrInputStream"
am:
70b262b0f2
Change-Id: I46f8cf7847982e8ab590c9016472fea93aa4a27b
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
Jeremy Joslin [Tue, 13 Dec 2016 16:13:44 +0000 (16:13 +0000)]
Merge "Make the onRequestRecommendation() method async."
am:
fbeacb02c0
Change-Id: I9b98480499c2366eee06de163b561c4583e475d2
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:42:50 +0000 (13:42 +0000)]
Merge "API changes for updating Locale to OpenJDK8u60, part 2"
am:
c35137ce36
Change-Id: Ibbf80ffe75bdbbc5da343e139bd80bc70afe4794
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:23:15 +0000 (02:23 +0000)]
Merge "Copy WifiNetworkScoreCache into frameworks/base. Add tests."
am:
a895081335
Change-Id: I779eabea94d67d01ac29b49a68456daf9dd19013
Sundeep Ghuman [Tue, 13 Dec 2016 02:18:21 +0000 (02:18 +0000)]
Copy WifiNetworkScoreCache into frameworks/base. Add tests.
am:
46169f946b
Change-Id: Id3ce970efaea32d0d0a2fa5594b91628e2f3d1df
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:36:54 +0000 (00:36 +0000)]
Merge "Add trace category for adb."
am:
6968d90dc5
Change-Id: Id542769172f3d40221a6b20ea8af1db5a70abfd1
Felipe Leme [Tue, 13 Dec 2016 00:30:21 +0000 (00:30 +0000)]
Merge "DO NOT MERGE: Migrate NetworkPolicyManagerServiceTest to JUnit 4."
am:
ff93f927e4 -s ours
Change-Id: I9cf0ed46073b2cf8af33e61df77aa7c0ec168344
Josh Gao [Tue, 13 Dec 2016 00:28:09 +0000 (00:28 +0000)]
Merge "Add trace category for adb."
Jerry Zhang [Tue, 13 Dec 2016 00:26:33 +0000 (00:26 +0000)]
Merge "Modify UsbDeviceManager stack to allow MtpServer to use FunctionFS drivers."
am:
1975240f17
Change-Id: I4b6532719b848ba4b595c8069ecbbd42e855382b
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."
Felipe Leme [Mon, 12 Dec 2016 23:12:25 +0000 (23:12 +0000)]
Merge "DO NOT MERGE: Fixed NetworkPolicyManagerServiceTest."
am:
d0fdf7aba3 -s ours
Change-Id: I3720f2e2fd0c78c9d45e0b26e7157902a32fae76
sghuman [Mon, 12 Dec 2016 23:07:22 +0000 (23:07 +0000)]
Merge "Fix erroneous constructor in ScoredNetwork.java"
am:
9d55f43719
Change-Id: I6f24c92a9638f91197a4d17bfdc3fbeeede3daf4
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:34:39 +0000 (21:34 +0000)]
Merge "DO NOT MERGE Add Bluetooth toggle prompts - framework"
am:
47e1f497c0 -s ours
Change-Id: Ifa6abd776e6752c0eb1ac0bc41d51f9ebdddc490
Joe LaPenna [Mon, 12 Dec 2016 21:28:29 +0000 (21:28 +0000)]
Merge "Add simplified_network_settings_bool to CarrierConfigManager."
am:
9b430e0395
Change-Id: Ib14979d168f4e37ab2f8de0737abe94cc6c8b16d
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:42:22 +0000 (19:42 +0000)]
Merge "Catch all exceptions from installd, log codes."
am:
9a10ca3f4c
Change-Id: Iee50cdea3115ff868f8ae29b7e0d0ab590a7cc34
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:33:43 +0000 (17:33 +0000)]
Merge "Track BufferIterator changes in libcore"
am:
021e8ff2af
Change-Id: Id6cb26d1af8a3e35af52ae0f070fdab8a38c8e69
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
Erik Kline [Mon, 12 Dec 2016 08:29:14 +0000 (08:29 +0000)]
Merge "Stop setting net.dns{1234} system properties."
am:
7552e2de9d
Change-Id: I9b31b281896995943ce8217c3230867db380a841
Treehugger Robot [Mon, 12 Dec 2016 08:16:35 +0000 (08:16 +0000)]
Merge "Stop setting net.dns{1234} system properties."