OSDN Git Service
Android Build Merger (Role) [Mon, 12 Dec 2016 19:56:48 +0000 (19:56 +0000)]
Merge "Merge "Add missing API diffs for support library 25.1.0" into nyc-mr2-dev am:
bf5c5f8981" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Mon, 12 Dec 2016 19:56:23 +0000 (19:56 +0000)]
Merge "Add missing API diffs for support library 25.1.0 am:
f11879ae94" into nyc-mr2-dev-plus-aosp
Alan Viverette [Mon, 12 Dec 2016 19:55:26 +0000 (19:55 +0000)]
Merge "Add missing API diffs for support library 25.1.0" into nyc-mr2-dev
am:
bf5c5f8981
Change-Id: Icc12887213ae18cc0bab10f4cbe0327d3a1022d2
Alan Viverette [Mon, 12 Dec 2016 19:55:20 +0000 (19:55 +0000)]
Add missing API diffs for support library 25.1.0
am:
f11879ae94
Change-Id: I40ed7b7bdd2b3016b2fa48c114c78f244552ce1e
Jeff Sharkey [Mon, 12 Dec 2016 19:55:17 +0000 (19:55 +0000)]
Merge "Catch all exceptions from installd, log codes." am:
9a10ca3f4c am:
6f7b136b40
am:
5226bbb5a6
Change-Id: I3a3903c4dfb9113bf9549504a1d9859fb6ee5687
Alan Viverette [Mon, 12 Dec 2016 19:50:47 +0000 (19:50 +0000)]
Merge "Add missing API diffs for support library 25.1.0" into nyc-mr2-dev
Jeff Sharkey [Mon, 12 Dec 2016 19:48:53 +0000 (19:48 +0000)]
Merge "Catch all exceptions from installd, log codes." am:
9a10ca3f4c
am:
6f7b136b40
Change-Id: Ia62a8a11907fe5dd4e524fbe181a094500248850
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."
Neil Fuller [Mon, 12 Dec 2016 17:45:15 +0000 (17:45 +0000)]
Merge "Track BufferIterator changes in libcore" am:
021e8ff2af am:
4ff3c27817
am:
228793a0c9
Change-Id: I86aa0f62941802a7f26957d475575bf9c92ba2ca
Neil Fuller [Mon, 12 Dec 2016 17:39:20 +0000 (17:39 +0000)]
Merge "Track BufferIterator changes in libcore" am:
021e8ff2af
am:
4ff3c27817
Change-Id: Ifc4c1ada0299b430a74d98d05b9331182adf0933
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"
Tyler Gunn [Mon, 12 Dec 2016 17:17:30 +0000 (17:17 +0000)]
Merge "Add reason code used to tell dialer when call failed due to WFC being off." into nyc-mr2-dev
am:
fd66641943
Change-Id: I65f758ab203fa539af90ed21e53abc7c1074c5ea
Tyler Gunn [Mon, 12 Dec 2016 17:17:21 +0000 (17:17 +0000)]
Add reason code used to tell dialer when call failed due to WFC being off.
am:
6adbd2bf5f
Change-Id: Id175a279bed0e80115abf1b2043a0fc1472d49f1
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
Fyodor Kupolov [Mon, 12 Dec 2016 17:15:50 +0000 (17:15 +0000)]
Merge "[DO NOT MERGE] Switch to using UMS.mUserStates" into nyc-mr2-dev
am:
3c5965d339
Change-Id: I6b9b69d289f46398599df25c13a14bec52e5dd6e
Fyodor Kupolov [Mon, 12 Dec 2016 17:15:44 +0000 (17:15 +0000)]
[DO NOT MERGE] Switch to using UMS.mUserStates
am:
7a1e682794
Change-Id: I666e7fe9602198b450c324b36d1ecebde8f1aedb
Tyler Gunn [Mon, 12 Dec 2016 17:09:35 +0000 (17:09 +0000)]
Merge "Add reason code used to tell dialer when call failed due to WFC being off." into nyc-mr2-dev
TreeHugger Robot [Mon, 12 Dec 2016 17:05:06 +0000 (17:05 +0000)]
Merge "[DO NOT MERGE] Switch to using UMS.mUserStates" into nyc-mr2-dev
Erik Kline [Mon, 12 Dec 2016 08:41:47 +0000 (08:41 +0000)]
Merge "Stop setting net.dns{1234} system properties." am:
7552e2de9d am:
c715ea8458
am:
54c56de832
Change-Id: I38d6608f64076ffa3300255eb66c51c32e590b0f
Erik Kline [Mon, 12 Dec 2016 08:35:20 +0000 (08:35 +0000)]
Merge "Stop setting net.dns{1234} system properties." am:
7552e2de9d
am:
c715ea8458
Change-Id: I7d400352de4bc11204cd1ec8c9aeda5381cd4931
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."
Jeff Sharkey [Sat, 10 Dec 2016 23:23:28 +0000 (23:23 +0000)]
Merge "Remove DEXOPT_OTA flag." am:
8584db972c am:
3dae5ca9d6
am:
91fca0f0ce
Change-Id: I7722af5c9fee1947c86c404239014d3dd500b80a
Jeff Sharkey [Sat, 10 Dec 2016 23:18:04 +0000 (23:18 +0000)]
Merge "Remove DEXOPT_OTA flag." am:
8584db972c
am:
3dae5ca9d6
Change-Id: I260245cc751aeea170e849f2520d1ab700ff503b
Jeff Sharkey [Sat, 10 Dec 2016 23:13:30 +0000 (23:13 +0000)]
Merge "Final push of installd to Binder; goodbye socket!" am:
1950377f91 am:
104fd011b2
am:
9ff67746e6
Change-Id: Idc2b65f975b80c4768280515bd35727644fb5711
Jeff Sharkey [Sat, 10 Dec 2016 23:07:59 +0000 (23:07 +0000)]
Merge "Final push of installd to Binder; goodbye socket!" am:
1950377f91
am:
104fd011b2
Change-Id: I4b2ae2329e8842def8682199c5ee8544c22c2be4
Jeff Sharkey [Sat, 10 Dec 2016 23:06:56 +0000 (23:06 +0000)]
Merge "Remove DEXOPT_OTA flag."
am:
8584db972c
Change-Id: I706f3d92b15f169f0ec877e95bac224bb90c2033
Jeff Sharkey [Sat, 10 Dec 2016 23:01:59 +0000 (23:01 +0000)]
Merge "Final push of installd to Binder; goodbye socket!"
am:
1950377f91
Change-Id: If10d4f4aafa68b78ddd9a98e8699fe008bbda49b
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 01:11:46 +0000 (01:11 +0000)]
Merge "Copy preload2.jar to build artifacts" am:
64583c332a am:
dc017c4e49
am:
6952303c28
Change-Id: I66fa8374ec9257e43b7fea02ef13ce51c2f628fc
Michael Rosenfeld [Sat, 10 Dec 2016 01:06:45 +0000 (01:06 +0000)]
Merge "Copy preload2.jar to build artifacts" am:
64583c332a
am:
dc017c4e49
Change-Id: Ic0d41a8d555b3f0b07a40ecfedd18e3e9341bed8
Michael Rosenfeld [Sat, 10 Dec 2016 01:01:13 +0000 (01:01 +0000)]
Merge "Copy preload2.jar to build artifacts"
am:
64583c332a
Change-Id: I5cb3a43c09546881872803dabefb23950c0c1c17
Michael Rosenfeld [Sat, 10 Dec 2016 00:48:52 +0000 (00:48 +0000)]
Merge "Copy preload2.jar to build artifacts"
Android Build Merger (Role) [Sat, 10 Dec 2016 00:18:37 +0000 (00:18 +0000)]
Merge changes from topic 'am-
c0ec5f28a7be4becb812fcd1d98e341c' into nyc-mr2-dev-plus-aosp
* changes:
Merge "DO NOT MERGE API for reporting IMS registration failures" into nyc-mr2-dev am:
8f1a57f943
DO NOT MERGE API for reporting IMS registration failures am:
a62a1302ee
Meng Wang [Sat, 10 Dec 2016 00:16:59 +0000 (00:16 +0000)]
Merge "DO NOT MERGE API for reporting IMS registration failures" into nyc-mr2-dev
am:
8f1a57f943
Change-Id: Iabd29c97283920bb39a33a98fe193f296f2b6b17
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
Dheeraj Shetty [Sat, 10 Dec 2016 00:16:52 +0000 (00:16 +0000)]
DO NOT MERGE API for reporting IMS registration failures
am:
a62a1302ee
Change-Id: Iad3a0ab889618cc329517b102067f5b26ed96ee0
Jeremy Joslin [Sat, 10 Dec 2016 00:16:39 +0000 (00:16 +0000)]
Merge "Update registerNetworkScoreCache() to accept a filter type." am:
a511a07fa3 am:
4150ec18e9
am:
9f38345a08
Change-Id: I13f01dbfa300463a34c34d7c49f3dc97e42391d8
Jeremy Joslin [Sat, 10 Dec 2016 00:11:12 +0000 (00:11 +0000)]
Merge "Update registerNetworkScoreCache() to accept a filter type." am:
a511a07fa3
am:
4150ec18e9
Change-Id: I589bead5cf4e9f57f21c234d7d0b5d62cdb1e2b3
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
Meng Wang [Sat, 10 Dec 2016 00:08:20 +0000 (00:08 +0000)]
Merge "DO NOT MERGE API for reporting IMS registration failures" into nyc-mr2-dev
Jeremy Joslin [Sat, 10 Dec 2016 00:06:37 +0000 (00:06 +0000)]
Merge "Update registerNetworkScoreCache() to accept a filter type."
am:
a511a07fa3
Change-Id: I51983da8fe63db15d9b38e3ebe4a20cb95cb5f13
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
Fyodor Kupolov [Mon, 5 Dec 2016 21:23:28 +0000 (13:23 -0800)]
[DO NOT MERGE] Switch to using UMS.mUserStates
UserManager.isUserUnlocked/isUserRunning/isUserUnlockingOrUnlocked now
return state from UMS.mUserStates that is pushed from ActivityManager.
Test: create managed profile using TestDPC and check Launcher3
Test: manually create unstarted managed profile and check launchers
Bug:
33232933
Change-Id: I6b619ba1880188eabdd6e3e4cc7eb60d3a22a977
Doris Liu [Fri, 9 Dec 2016 21:20:07 +0000 (21:20 +0000)]
Merge "Add API info about Keyframe and PropertyValuesHolder" into nyc-mr2-dev
am:
65734b2f66
Change-Id: I8384c369e4a529af6faf6168f0a65ea55fce2e42
Doris Liu [Fri, 9 Dec 2016 21:19:59 +0000 (21:19 +0000)]
Add API info about Keyframe and PropertyValuesHolder
am:
21b93c1f66
Change-Id: Id0e4795ad4a2aaa98dac85dd3f7ef18ab80b3f9c
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
Doris Liu [Fri, 9 Dec 2016 21:13:37 +0000 (21:13 +0000)]
Merge "Add API info about Keyframe and PropertyValuesHolder" into nyc-mr2-dev
Fyodor Kupolov [Fri, 9 Dec 2016 20:10:59 +0000 (20:10 +0000)]
Merge "[DO NOT MERGE] Increased user switch timeout to 3s" into nyc-mr2-dev
am:
8aa678b575
Change-Id: I703cb476b5e3cff50a266775ece86d954981cde0
Fyodor Kupolov [Fri, 9 Dec 2016 20:10:53 +0000 (20:10 +0000)]
[DO NOT MERGE] Increased user switch timeout to 3s
am:
2fe1990ba7
Change-Id: I0c33b2804fe41885c02567d3ed5208993b46086a
Fyodor Kupolov [Fri, 9 Dec 2016 19:58:18 +0000 (19:58 +0000)]
Merge "[DO NOT MERGE] Increased user switch timeout to 3s" into nyc-mr2-dev
Android Build Merger (Role) [Fri, 9 Dec 2016 17:35:13 +0000 (17:35 +0000)]
Merge "Merge "Fix race condition bug related to freezing apps." into cw-f-dev am:
3350ae9c82 am:
2607015861" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Fri, 9 Dec 2016 17:35:01 +0000 (17:35 +0000)]
Merge "Merge "Fix race condition bug related to freezing apps." into cw-f-dev am:
3350ae9c82 am:
ac7775f28e" into nyc-mr2-dev-plus-aosp
Jeff Sharkey [Fri, 9 Dec 2016 17:34:38 +0000 (17:34 +0000)]
Merge "Fix race condition bug related to freezing apps." into cw-f-dev am:
3350ae9c82
am:
2607015861
Change-Id: I7c00d18135567ee7bfae0cde7c4cc960bfc4bce6
Jeff Sharkey [Fri, 9 Dec 2016 17:34:30 +0000 (17:34 +0000)]
Merge "Fix race condition bug related to freezing apps." into cw-f-dev am:
3350ae9c82
am:
ac7775f28e
Change-Id: Iff322d51519896e8795a4aaa5b85ac810cea7c95
Android Build Merger (Role) [Fri, 9 Dec 2016 17:34:17 +0000 (17:34 +0000)]
Merge "Fix race condition bug related to freezing apps. am:
41d2be0f0f am:
a025a0cdec" into nyc-mr2-dev-plus-aosp
Jeff Sharkey [Fri, 9 Dec 2016 17:33:42 +0000 (17:33 +0000)]
Fix race condition bug related to freezing apps. am:
41d2be0f0f
am:
453efdc065
Change-Id: I879874943a30db52cfb91d5902126c275cf2ecac
Jeff Sharkey [Fri, 9 Dec 2016 17:33:38 +0000 (17:33 +0000)]
Fix race condition bug related to freezing apps. am:
41d2be0f0f
am:
a025a0cdec
Change-Id: Id93b2a652b53e687b0a5201957abde1efbd1037c
Jeff Sharkey [Fri, 9 Dec 2016 17:28:51 +0000 (17:28 +0000)]
Merge "Fix race condition bug related to freezing apps." into cw-f-dev
am:
3350ae9c82
Change-Id: I063eeb4d5252d5559065aaa4c6e430962b8e73de
Jeff Sharkey [Fri, 9 Dec 2016 17:28:47 +0000 (17:28 +0000)]
Merge "Fix race condition bug related to freezing apps." into cw-f-dev
am:
3350ae9c82
Change-Id: Ia1f4349217b2baca92678c74d20196a3b332f008
Jeff Sharkey [Fri, 9 Dec 2016 17:28:45 +0000 (17:28 +0000)]
Fix race condition bug related to freezing apps.
am:
41d2be0f0f
Change-Id: I0b308d992725d0ffb0643157fdad27b394ff992a
Jeff Sharkey [Fri, 9 Dec 2016 17:28:43 +0000 (17:28 +0000)]
Fix race condition bug related to freezing apps.
am:
41d2be0f0f
Change-Id: I012093b52efda2cdffa47143c40e2708007158f5
TreeHugger Robot [Fri, 9 Dec 2016 17:22:19 +0000 (17:22 +0000)]
Merge "Fix race condition bug related to freezing apps." into cw-f-dev
Jeff Sharkey [Fri, 9 Dec 2016 17:03:41 +0000 (17:03 +0000)]
Merge "Prepare to move dexopt calls to Binder." am:
d7b144a5e9 am:
35cbe8ffb0
am:
41d75809aa
Change-Id: I0b87126b4b312ef8fc3c71479d6d5725e96e6acc
Jeff Sharkey [Fri, 9 Dec 2016 16:58:48 +0000 (16:58 +0000)]
Merge "Prepare to move dexopt calls to Binder." am:
d7b144a5e9
am:
35cbe8ffb0
Change-Id: Ice3c37568ae7185dfe028d3019abf5204aa93963
Jeff Sharkey [Fri, 9 Dec 2016 16:53:46 +0000 (16:53 +0000)]
Merge "Prepare to move dexopt calls to Binder."
am:
d7b144a5e9
Change-Id: I49cce8519d5b09a646609fffc6e62ecbe1a086ef
Jeff Sharkey [Fri, 9 Dec 2016 16:42:25 +0000 (16:42 +0000)]
Merge "Prepare to move dexopt calls to Binder."
Jeff Sharkey [Fri, 9 Dec 2016 16:06:12 +0000 (09:06 -0700)]
Fix race condition bug related to freezing apps.
Consider the following situation:
1. Package is frozen.
2. We try forking the app while frozen, causing a ProcessRecord with
PID 0 to be recorded in mProcessNames. As a result of the failed
fork, removeProcessLocked() tears down that ProcessRecord, but a
special case records it into mRemovedProcesses.
3. Package is unfrozen.
4. We try forking the app, and this time it proceeds normally now
that we're unfrozen. The new valid ProcessRecord is recorded in
mProcessNames.
5. activityIdleInternalLocked() triggers a clean-up pass of
mRemovedProcesses. trimApplications() ends up cleaning up the
stale reference from (2) above *by hash key* and not *by reference*,
which causes us to remove the new valid ProcessRecord. This results
in the valid ProcessRecord in (4) becoming an orphaned PID, which
starts a chain reaction of havoc that ensues.
This issue is fixed by checking the expected ProcessRecord by value
before actually removing it, thus preventing orphaned PIDs.
Test: builds, boots, over 600 installs without orphaned PIDs
Bug:
28395549
Change-Id: I5ea1b31c3fd374ea7f5cc40ff35bb9195d9f3e2b
Paul Duffin [Fri, 9 Dec 2016 15:15:06 +0000 (15:15 +0000)]
Merge "Move android.test classes from core/java to legacy-test/src" am:
2761ed124a am:
28b617bdea
am:
7e28011fea
Change-Id: I075483114837003014a68614ce9f55a5d199ec85
Paul Duffin [Fri, 9 Dec 2016 15:10:10 +0000 (15:10 +0000)]
Merge "Move android.test classes from core/java to legacy-test/src" am:
2761ed124a
am:
28b617bdea
Change-Id: I83a6ce6c329e7eb18ee90689682c30d4a73d7f8e
Paul Duffin [Fri, 9 Dec 2016 15:05:06 +0000 (15:05 +0000)]
Merge "Move android.test classes from core/java to legacy-test/src"
am:
2761ed124a
Change-Id: I0009b93ff096456d7f5fd5f83e71fd4b9bff31db
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"
Bill Yi [Fri, 9 Dec 2016 12:13:29 +0000 (12:13 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
1e40ddc47a -s ours
Change-Id: I5af01f895553bfbf3eeb6de15d3a53e42c33f351
Bill Yi [Fri, 9 Dec 2016 12:13:26 +0000 (12:13 +0000)]
Import translations. DO NOT MERGE
am:
77deddca61 -s ours
Change-Id: Ia83dfc15cb69555451db31abf5c164357db87e3d
TreeHugger Robot [Fri, 9 Dec 2016 12:02:42 +0000 (12:02 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Hugo Benichi [Fri, 9 Dec 2016 11:07:19 +0000 (11:07 +0000)]
Merge "Removing bogus file added by mistake" am:
a44c833042 am:
4180078d0d
am:
accb2854d1
Change-Id: I510c011f5f3fc765ddda5c7a0e858e98ba341a46
Przemyslaw Szczepaniak [Fri, 9 Dec 2016 11:03:43 +0000 (11:03 +0000)]
Merge "Track libcore change
547177ca5c312f84fb22e6e7bf12f54129034e5d" am:
4ee94a6a9b am:
104e268a14
am:
b2d7fe1f22
Change-Id: Ia9cb57d270dfb9ae634fbe72f7b9c8591ade89a3
Hugo Benichi [Fri, 9 Dec 2016 11:02:54 +0000 (11:02 +0000)]
Merge "Removing bogus file added by mistake" am:
a44c833042
am:
4180078d0d
Change-Id: I9da22da1fe2458162768ddf33f42eb9e8b7f974e
Przemyslaw Szczepaniak [Fri, 9 Dec 2016 10:59:16 +0000 (10:59 +0000)]
Merge "Track libcore change
547177ca5c312f84fb22e6e7bf12f54129034e5d" am:
4ee94a6a9b
am:
104e268a14
Change-Id: I68a128d0e2efc1e960be2ffd08ac381db0640339
Hugo Benichi [Fri, 9 Dec 2016 10:58:21 +0000 (10:58 +0000)]
Merge "Removing bogus file added by mistake"
am:
a44c833042
Change-Id: I25ff74ac3e46b60da05b9ab595f87d58bb50b6c0
Przemyslaw Szczepaniak [Fri, 9 Dec 2016 10:54:03 +0000 (10:54 +0000)]
Merge "Track libcore change
547177ca5c312f84fb22e6e7bf12f54129034e5d"
am:
4ee94a6a9b
Change-Id: I93e4dc42695a35934748e4242bb36e4260cbd3ca
Lorenzo Colitti [Fri, 9 Dec 2016 10:53:48 +0000 (10:53 +0000)]
Merge changes from topic 'framework-net-aosp' am:
ab4c79bd96 am:
1a2fa0f372
am:
4925138b8a
Change-Id: Idb0e86655f5d4f835796f5ebe31da99e419d66bf
Treehugger Robot [Fri, 9 Dec 2016 10:50:10 +0000 (10:50 +0000)]
Merge "Removing bogus file added by mistake"
Przemyslaw Szczepaniak [Fri, 9 Dec 2016 10:46:18 +0000 (10:46 +0000)]
Hugo Benichi [Fri, 9 Dec 2016 10:40:12 +0000 (10:40 +0000)]
DO NOT MERGE: frameworks-test: adding missing @SmallTest am:
cfcc1cb7bf -s ours am:
9f65f04157 -s ours
am:
1ef8d5cdd8
Change-Id: Ib6a8f4b7ca365ab5cb42b9e57311228be273075a
Hugo Benichi [Fri, 9 Dec 2016 10:39:20 +0000 (10:39 +0000)]
DO NOT MERGE: Netd events: record connect() success/errno am:
5d0f28c7fd -s ours am:
d84f932680 -s ours
am:
3499968748
Change-Id: Ic83b2d46bc4d25878c70c0a02d39f14ecbeab84f
Lorenzo Colitti [Fri, 9 Dec 2016 10:38:30 +0000 (10:38 +0000)]
DO NOT MERGE: Add missing dependency. am:
744b02069d -s ours am:
50c77cb9c0 -s ours
am:
2fc1b42116
Change-Id: I4b01f3a52e858e495e9bf08e167bedd5115dd432
Tony Mak [Fri, 9 Dec 2016 10:37:38 +0000 (10:37 +0000)]
DO NOT MERGE: Show notification for always-on app VPN am:
de7f7d195e -s ours am:
118071a481 -s ours
am:
d2561167e1
Change-Id: I871444d296f0c49f587e98d1e0b760846da37c13
Stephen Chen [Fri, 9 Dec 2016 10:36:45 +0000 (10:36 +0000)]
DO NOT MERGE: Implement metered tracking for NetworkStats summary queries. am:
963e8ddf6d -s ours am:
3f5785260e -s ours
am:
aa75afd589
Change-Id: Ic0f11bdb50d43c0dd9c449ae3c784b0214b865e3
Hugo Benichi [Fri, 9 Dec 2016 10:35:18 +0000 (10:35 +0000)]
DO NOT MERGE: NetworkMonitor: send one DNS probe per web probe am:
2a43b208cc -s ours am:
a452f24e30 -s ours
am:
7092831185
Change-Id: I7a277e4f3b84b658891f81aa055d6a9f7126f2cc
Hugo Benichi [Fri, 9 Dec 2016 10:34:26 +0000 (10:34 +0000)]
DO NOT MERGE: NetworkMonitor metrics: add first validation information am:
21680fd25d -s ours am:
9908c161ca -s ours
am:
31e3ab399f
Change-Id: Ie2d4a47694be6430416594d3ea67c9363f0739cd
Hugo Benichi [Fri, 9 Dec 2016 10:33:35 +0000 (10:33 +0000)]
DO NOT MERGE: APF: also drop any ICMPv6 RSs am:
02428988ad -s ours am:
0d95fc9552 -s ours
am:
5fb6beae02
Change-Id: I6c4e0f827785f5ef84e0871ed4e6b3abbae1f825
Hugo Benichi [Fri, 9 Dec 2016 10:32:40 +0000 (10:32 +0000)]
DO NOT MERGE: ConnectivityServiceTest: fix testAvoidBadWifiSettings am:
53d83d5142 -s ours am:
a30ae5542b -s ours
am:
05236e77fe
Change-Id: Iebd06f7c03b2068314c24a14a2b38d2413b88536
Hugo Benichi [Fri, 9 Dec 2016 10:31:27 +0000 (10:31 +0000)]
DO NOT MERGE: Fix ConnectivityServiceTest testRequestBenchmark am:
cbf8ff83a8 -s ours am:
0bef352535 -s ours
am:
6d756fa472
Change-Id: I7379d8223778d3f2df97d88c0d6f291df219c579
Jeff Sharkey [Fri, 9 Dec 2016 10:30:15 +0000 (10:30 +0000)]
DO NOT MERGE: Switch over to new "time.android.com" NTP pool. am:
dda938a698 -s ours am:
7c670da7ac -s ours
am:
2d72c165af
Change-Id: I77c4de88c69aa3801d3580f01f6b6901fceb2ef9
OSDN Git Service
