OSDN Git Service
Jeff Sharkey [Tue, 20 Dec 2016 01:14:35 +0000 (01:14 +0000)]
Merge "Remove ~1/3 of the installd calls at boot."
am:
5bc305b97c
Change-Id: Ia6af8d920971118f108320d08b15cbe3da59b28a
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
Jeremy Joslin [Mon, 19 Dec 2016 22:07:20 +0000 (22:07 +0000)]
Merge "Fix ScanResult array parceling."
am:
5fdc86fb27
Change-Id: I25e509ea057370c4380764c47808c0dbde85a6fc
Treehugger Robot [Mon, 19 Dec 2016 21:57:05 +0000 (21:57 +0000)]
Merge "Fix ScanResult array parceling."
Joe LaPenna [Mon, 19 Dec 2016 21:01:26 +0000 (21:01 +0000)]
Merge "Remove "final" from ResultCallback."
am:
b60d7b334c
Change-Id: I3b6679368418af3992007f58d47c544cf7a1b1ed
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
Michael Rosenfeld [Sat, 17 Dec 2016 02:10:53 +0000 (02:10 +0000)]
Merge "Clean up local hprofs"
am:
9ab94e15c7
Change-Id: Ie99cc29ef321ec7276535b28ae4b7eaf828410da
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 23:07:42 +0000 (23:07 +0000)]
Merge "Bluetooth: fix issues re-enabling after crash"
am:
e2c22e38d5
Change-Id: I6722c1b8d839918e2ce7918f5f7b8583a14c1ded
Marie Janssen [Fri, 16 Dec 2016 22:56:58 +0000 (22:56 +0000)]
Merge "Bluetooth: fix issues re-enabling after crash"
Philip P. Moltmann [Fri, 16 Dec 2016 22:51:11 +0000 (22:51 +0000)]
Merge "Increment vers of PrintRecommendationService"
am:
08bff42ef4
Change-Id: Ie98d6f58dbb4d29e27200aa1b9829372930a0fa3
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"
Vitalii Tomkiv [Fri, 16 Dec 2016 22:35:54 +0000 (22:35 +0000)]
Merge changes Ic85892b4,I627e47c6
am:
d995c94426
Change-Id: If036b0f5b8497667a9c2a916ec74d482def2aed5
Vitalii Tomkiv [Fri, 16 Dec 2016 22:35:49 +0000 (22:35 +0000)]
Make sure Zygote is running at process priority 0 after VM has started.
am:
1e52ce48a6
Change-Id: Ia1f511d294a9c718534a4a0b8ad747ef58a98b52
Todd Kjos [Fri, 16 Dec 2016 22:35:08 +0000 (22:35 +0000)]
Revert "Add boost to increase the load on newly-forked zygote processes."
am:
8175f0955a
Change-Id: I6f61c45f690647c860e0ceb140857e53bc253f00
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."
Torne (Richard Coles) [Fri, 16 Dec 2016 21:38:17 +0000 (21:38 +0000)]
Merge "Add the webview zygote socket to the zygote whitelist."
am:
f8882ae834
Change-Id: I02d08d8f91567b8bd6709137f98f87550c13f145
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
Joe LaPenna [Fri, 16 Dec 2016 20:35:53 +0000 (20:35 +0000)]
Merge "Set com.android.networkrecommendation as the default network recommendation service."
am:
0b4df21aac
Change-Id: Ia955fd0d980a5ddcdb5ae6880c7a380251819f44
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:38:43 +0000 (19:38 +0000)]
Merge changes Ia4bec085,I59095f2a
am:
733d007279
Change-Id: Id0f0746af66b4f2e0352e2a0dde9d3f27e23f84c
Tamas Berghammer [Fri, 16 Dec 2016 19:38:38 +0000 (19:38 +0000)]
Enable logwrapper functionality on user builds
am:
0ca16fa584
Change-Id: Ic18991f9a59f05356fcbcc65acc79be43fc68542
Tamas Berghammer [Fri, 16 Dec 2016 19:37:57 +0000 (19:37 +0000)]
Zygote: Add invoke-with to zygote protocol
am:
b8f7c351b9
Change-Id: I79db6f759b02ef612364fc857102615d51900cd9
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
Andreas Gampe [Fri, 16 Dec 2016 18:44:54 +0000 (18:44 +0000)]
Merge "NativeLibraryHelper: Minor fixes"
am:
c1536f0d10
Change-Id: I81e69315c5f74341ddf3472263462f8fdf935797
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
Polina Bondarenko [Fri, 16 Dec 2016 10:37:21 +0000 (10:37 +0000)]
Merge "Make TelephonyManager APIs public:"
am:
441bfc6718
Change-Id: I968c8232c746027123beac6481161019e1dc64a5
Treehugger Robot [Fri, 16 Dec 2016 10:29:03 +0000 (10:29 +0000)]
Merge "Make TelephonyManager APIs public:"
Colin Cross [Fri, 16 Dec 2016 08:57:55 +0000 (08:57 +0000)]
Merge "Move libandroid_runtime headers into frameworks/base/core/jni"
am:
541845908c
Change-Id: Ia15d168a42bd0290e7cdeb7d19c98210890ed095
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
Treehugger Robot [Fri, 16 Dec 2016 08:46:58 +0000 (08:46 +0000)]
Merge "Move libandroid_runtime headers into frameworks/base/core/jni"
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