OSDN Git Service
Nate Fischer [Tue, 8 Aug 2017 21:10:59 +0000 (21:10 +0000)]
Merge "WebView: update SafeBrowsing documentation" into oc-mr1-dev
am:
2ddac82335
Change-Id: I26963a3715fa0ea6222a5b68880456bdb1a6cdb0
Nate Fischer [Tue, 8 Aug 2017 21:00:59 +0000 (21:00 +0000)]
Merge "WebView: update SafeBrowsing documentation" into oc-mr1-dev
Makoto Onuki [Tue, 8 Aug 2017 20:55:56 +0000 (20:55 +0000)]
Merge "Don't retain a bitmap unnecessarily" into oc-mr1-dev
am:
8ede87ded8
Change-Id: I3bfdd696cfd7abb1cb9ff04d93b7ebe3953280c9
TreeHugger Robot [Tue, 8 Aug 2017 20:40:32 +0000 (20:40 +0000)]
Merge "Don't retain a bitmap unnecessarily" into oc-mr1-dev
Pavel Grafov [Tue, 8 Aug 2017 20:21:24 +0000 (20:21 +0000)]
Merge "Mark profile password key as critical." into oc-mr1-dev
am:
072b71f73f
Change-Id: Id82d2c48b4463b9d0ec56e260e0f86a7d3b1f5e1
Pavel Grafov [Tue, 8 Aug 2017 20:11:09 +0000 (20:11 +0000)]
Merge "Mark profile password key as critical." into oc-mr1-dev
Philip P. Moltmann [Tue, 8 Aug 2017 19:57:56 +0000 (19:57 +0000)]
Merge "Revert session-transfer change" into oc-mr1-dev
am:
7bec053dff
Change-Id: I0e9f40dccf423899b48ba8af9f2c266d6f32dc1f
Philip P. Moltmann [Tue, 8 Aug 2017 19:49:13 +0000 (19:49 +0000)]
Merge "Revert session-transfer change" into oc-mr1-dev
Sundeep Ghuman [Tue, 8 Aug 2017 19:47:52 +0000 (19:47 +0000)]
Merge "Refactor WifiTracker sStaleScanResults." into oc-mr1-dev
am:
a5a660a84d
Change-Id: Id3804ecaf51b18731d21dc8ff4f592bfcaa3095c
Wei Wang [Tue, 8 Aug 2017 19:38:00 +0000 (19:38 +0000)]
Merge "Shutdown: Continue shutdown with BLE only mode" into oc-mr1-dev
am:
23c0668a3f
Change-Id: Ib9ae218442f87cd3b09520e8c106b95ec2d2a947
TreeHugger Robot [Tue, 8 Aug 2017 19:35:36 +0000 (19:35 +0000)]
Merge "Refactor WifiTracker sStaleScanResults." into oc-mr1-dev
jackqdyulei [Tue, 8 Aug 2017 19:35:24 +0000 (19:35 +0000)]
Merge "Update string for not charging." into oc-mr1-dev
am:
ed0c5cf48f
Change-Id: Ic91cca4e7babe179d13a82f850b634c98d55ff8c
Wei Wang [Tue, 8 Aug 2017 19:28:59 +0000 (19:28 +0000)]
Merge "Shutdown: Continue shutdown with BLE only mode" into oc-mr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 19:27:29 +0000 (19:27 +0000)]
Merge "Update string for not charging." into oc-mr1-dev
Takashi Furukawa [Tue, 8 Aug 2017 18:30:55 +0000 (18:30 +0000)]
Merge "Cherry-pick: Add null check for Wi-Fi command" into oc-mr1-dev
am:
552d35cb4f
Change-Id: I04ea51eee6ad1030844a720132a3e67b007cb19f
Makoto Onuki [Tue, 8 Aug 2017 17:24:59 +0000 (10:24 -0700)]
Don't retain a bitmap unnecessarily
Due to a limitation in the GC, LazyTaskWriterThread would always retain
the last item it processed. Extract the second half into a separate
method to clarify the scope of the variable 'item' to the GC.
Bug:
64438652
Test: Launch several apps and check with ahat
Change-Id: Ie7357927ae61a8731285d14743187a2d811fbf8c
TreeHugger Robot [Tue, 8 Aug 2017 18:23:52 +0000 (18:23 +0000)]
Merge "Cherry-pick: Add null check for Wi-Fi command" into oc-mr1-dev
Philip P. Moltmann [Tue, 8 Aug 2017 17:49:38 +0000 (10:49 -0700)]
Revert session-transfer change
This reverts:
5d74493f64493cd506d7458b810095259287f623
94deaf7725c418ec1950d810ab86f0d157ddf518
Bug:
64467704
Test: none, 100% revert
Change-Id: I6534c19c594dadfa41457725988485a67f0ed45f
Fyodor Kupolov [Tue, 8 Aug 2017 16:55:10 +0000 (16:55 +0000)]
Merge "API Review update for SQLiteDatabase" into oc-mr1-dev
am:
3102245b62
Change-Id: I0997e70779456c1181d7750c1daa539afbc8dc0e
Fyodor Kupolov [Tue, 8 Aug 2017 16:46:24 +0000 (16:46 +0000)]
Merge "API Review update for SQLiteDatabase" into oc-mr1-dev
Sundeep Ghuman [Mon, 7 Aug 2017 18:21:38 +0000 (11:21 -0700)]
Refactor WifiTracker sStaleScanResults.
In ag/
2580164, in order to minimize changes, we used mutable static
state in WifiTracker to control cache eviction. This breaks a certain
flow in SetupWizard. This change reverts sStaleScanResults to an
instance member and then pipes the value into the AccessPoint update
call to control cache eviction instead of relying on error prone use of
mutable static state.
Bug:
63479352
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
&&
runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java
Manual: See bug
Change-Id: Ia6d79c1904294da69841cbdf6eafbf42fa70f2d0
Android Build Merger (Role) [Tue, 8 Aug 2017 16:25:52 +0000 (16:25 +0000)]
Merge "Merge "Always populate the ApplicationInfo object" into oc-dr1-dev am:
bb6653c404 am:
eebd877904" into oc-mr1-dev-plus-aosp
Todd Kennedy [Tue, 8 Aug 2017 16:24:34 +0000 (16:24 +0000)]
Merge "Always populate the ApplicationInfo object" into oc-dr1-dev am:
bb6653c404
am:
eebd877904
Change-Id: If2743b679e9ba52e680f79349656629facb9cd0a
Todd Kennedy [Tue, 8 Aug 2017 16:22:15 +0000 (16:22 +0000)]
Merge "Always populate the ApplicationInfo object" into oc-dr1-dev am:
bb6653c404
am:
1f3c3376e6
Change-Id: Ie15dabd5cf3f53b447565a5a6472c32a7f645588
Todd Kennedy [Tue, 8 Aug 2017 16:16:06 +0000 (16:16 +0000)]
Merge "Always populate the ApplicationInfo object" into oc-dr1-dev
am:
bb6653c404
Change-Id: I4e0dbda0e13e5419abfa25e2719d8fdcea0fa047
Hugo Benichi [Tue, 8 Aug 2017 16:16:06 +0000 (16:16 +0000)]
Merge "Merge "NetworkStats: more robust subtraction for deltas" into oc-dr1-dev am:
5e24152e33" into oc-mr1-dev
am:
279c26fa24
Change-Id: Id85a409a2d3cc12e53f977f94f7b5a306115a09a
Todd Kennedy [Tue, 8 Aug 2017 16:16:05 +0000 (16:16 +0000)]
Merge "Always populate the ApplicationInfo object" into oc-dr1-dev
am:
bb6653c404
Change-Id: I7224af4db28368292609a6c7728bcfd9a299b784
Android Build Merger (Role) [Tue, 8 Aug 2017 16:12:29 +0000 (16:12 +0000)]
Merge "Merge "NetworkStats: more robust subtraction for deltas" into oc-dr1-dev am:
5e24152e33 am:
43581b8759" into oc-mr1-dev-plus-aosp
Pavel Grafov [Tue, 8 Aug 2017 15:53:32 +0000 (16:53 +0100)]
Mark profile password key as critical.
Currently it is erased when keystore for user 0 is cleared, e.g.
when the user clears data for Settings app.
Bug:
64467610
Bug:
35929605
Test: Manually cleared Settings data.
Test: Manually cleared credentials from Settings.
Change-Id: I7e8753a1bf53f5d68d4738a4eb84faa890f026cc
Hugo Benichi [Tue, 8 Aug 2017 16:10:52 +0000 (16:10 +0000)]
Merge "NetworkStats: more robust subtraction for deltas" into oc-dr1-dev am:
5e24152e33
am:
43581b8759
Change-Id: I67d5dc4b52b254748ff17fe1e16c2eeb1d03c30d
TreeHugger Robot [Tue, 8 Aug 2017 16:08:48 +0000 (16:08 +0000)]
Merge "Always populate the ApplicationInfo object" into oc-dr1-dev
Todd Kennedy [Tue, 8 Aug 2017 16:06:17 +0000 (16:06 +0000)]
Merge "Add native bindings for getNamesForUids" into oc-mr1-dev
am:
8c18e1faf8
Change-Id: If0d1dc60455c961215454a5b2edcb59c0097add4
Android Build Merger (Role) [Tue, 8 Aug 2017 16:03:17 +0000 (16:03 +0000)]
Merge "Merge "NetworkStats: more robust subtraction for deltas" into oc-dr1-dev am:
5e24152e33" into oc-mr1-dev
Hugo Benichi [Tue, 8 Aug 2017 16:01:10 +0000 (16:01 +0000)]
Merge "NetworkStats: more robust subtraction for deltas" into oc-dr1-dev
am:
5e24152e33
Change-Id: Id6040a899653c585d298b7be7208f5cba997f665
Hugo Benichi [Tue, 8 Aug 2017 16:01:07 +0000 (16:01 +0000)]
Merge "NetworkStats: more robust subtraction for deltas" into oc-dr1-dev
am:
5e24152e33
Change-Id: I2ac0bc3914cb65ae8ee27921856d698dc59624b2
TreeHugger Robot [Tue, 8 Aug 2017 15:58:41 +0000 (15:58 +0000)]
Merge "Add native bindings for getNamesForUids" into oc-mr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 15:52:39 +0000 (15:52 +0000)]
Merge "NetworkStats: more robust subtraction for deltas" into oc-dr1-dev
Todd Lee [Tue, 8 Aug 2017 15:36:05 +0000 (15:36 +0000)]
Merge "Device Default theming updates for Wear" into oc-mr1-dev
am:
faa01fb370
Change-Id: Iac1d92b1bd1571ef5f9ee93db7732ac947845d98
Todd Lee [Tue, 8 Aug 2017 15:31:30 +0000 (15:31 +0000)]
Merge "Device Default theming updates for Wear" into oc-mr1-dev
Android Build Merger (Role) [Tue, 8 Aug 2017 13:06:37 +0000 (13:06 +0000)]
Merge "Merge "Update colour to match toasts." into oc-dr1-dev am:
91866c65a5 am:
ede09428f6 -s ours" into oc-mr1-dev-plus-aosp
Kenny Guy [Tue, 8 Aug 2017 13:04:09 +0000 (13:04 +0000)]
Merge "Update colour to match toasts." into oc-dr1-dev am:
91866c65a5
am:
ede09428f6 -s ours
Change-Id: If05e756f102dc74cc3f46a03eed0fc53f954f15c
Kenny Guy [Tue, 8 Aug 2017 13:03:57 +0000 (13:03 +0000)]
Merge "Update colour to match toasts." into oc-dr1-dev am:
91866c65a5 -s ours
am:
c209e50d67 -s ours
Change-Id: I0f97b893f1c421b29cd95c60f91dcda4d4e95e7d
Kenny Guy [Tue, 8 Aug 2017 12:58:32 +0000 (12:58 +0000)]
Merge "Update colour to match toasts." into oc-dr1-dev
am:
91866c65a5
Change-Id: Ia29014e839bfcf345e8efa56d8ec2906f80b1e38
Kenny Guy [Tue, 8 Aug 2017 12:58:21 +0000 (12:58 +0000)]
Merge "Update colour to match toasts." into oc-dr1-dev
am:
91866c65a5 -s ours
Change-Id: I40dd9ae63195b5f00741facc5b589f66513f1015
Kenny Guy [Tue, 8 Aug 2017 12:49:32 +0000 (12:49 +0000)]
Merge "Update colour to match toasts." into oc-dr1-dev
Adrian Roos [Tue, 8 Aug 2017 12:02:27 +0000 (12:02 +0000)]
Merge "FRP: Enable credential-based factory reset protection by default" into oc-mr1-dev
am:
956491b867
Change-Id: Ib8dd7a7a1805f9a2b00525ae9bd6ebcbc572f2fa
TreeHugger Robot [Tue, 8 Aug 2017 11:53:46 +0000 (11:53 +0000)]
Merge "FRP: Enable credential-based factory reset protection by default" into oc-mr1-dev
Android Build Merger (Role) [Tue, 8 Aug 2017 11:19:20 +0000 (11:19 +0000)]
Merge "Merge "AOD: Follow-up to I0fa53616db09be98d33ea7d06b38d8ff3037707f" into oc-dr1-dev am:
d58c6978a7 am:
8201ed151c" into oc-mr1-dev-plus-aosp
Adrian Roos [Tue, 8 Aug 2017 11:16:54 +0000 (11:16 +0000)]
Merge "AOD: Follow-up to I0fa53616db09be98d33ea7d06b38d8ff3037707f" into oc-dr1-dev am:
d58c6978a7
am:
9e14ef5c67
Change-Id: I42494b9ee5ffae3bc9bdf0b2451eef36c42881a6
Adrian Roos [Tue, 8 Aug 2017 11:16:47 +0000 (11:16 +0000)]
Merge "AOD: Follow-up to I0fa53616db09be98d33ea7d06b38d8ff3037707f" into oc-dr1-dev am:
d58c6978a7
am:
8201ed151c
Change-Id: I08e16bbc83aad8953ab3d0a6067f64157bef3cb2
Adrian Roos [Tue, 8 Aug 2017 11:11:48 +0000 (11:11 +0000)]
Merge "AOD: Follow-up to I0fa53616db09be98d33ea7d06b38d8ff3037707f" into oc-dr1-dev
am:
d58c6978a7
Change-Id: I077bc4252e9129960d20109920aa5783c46e0e2d
Adrian Roos [Tue, 8 Aug 2017 11:11:47 +0000 (11:11 +0000)]
Merge "AOD: Follow-up to I0fa53616db09be98d33ea7d06b38d8ff3037707f" into oc-dr1-dev
am:
d58c6978a7
Change-Id: Id181cefb682aba4ff3066e9f08fe77db424f8b0d
TreeHugger Robot [Tue, 8 Aug 2017 11:05:53 +0000 (11:05 +0000)]
Merge "AOD: Follow-up to I0fa53616db09be98d33ea7d06b38d8ff3037707f" into oc-dr1-dev
Android Build Merger (Role) [Tue, 8 Aug 2017 11:05:15 +0000 (11:05 +0000)]
Merge "Merge "ScrimController: Wait with clearing wakup animation until done" into oc-dr1-dev am:
6e4de6ccdf am:
aac5431f6b" into oc-mr1-dev-plus-aosp
Adrian Roos [Tue, 8 Aug 2017 11:03:17 +0000 (11:03 +0000)]
Merge "ScrimController: Wait with clearing wakup animation until done" into oc-dr1-dev am:
6e4de6ccdf
am:
aac5431f6b
Change-Id: I810bf53ff9c6b222fc01886b042c4d0f1661011b
Adrian Roos [Tue, 8 Aug 2017 11:03:14 +0000 (11:03 +0000)]
Merge "ScrimController: Wait with clearing wakup animation until done" into oc-dr1-dev am:
6e4de6ccdf
am:
3d8fd6e4b9
Change-Id: Idea0d06f3b548f99c6504044a193db42368381c8
Adrian Roos [Tue, 8 Aug 2017 10:57:18 +0000 (10:57 +0000)]
Merge "ScrimController: Wait with clearing wakup animation until done" into oc-dr1-dev
am:
6e4de6ccdf
Change-Id: I55938f50f29289e1dcc51be18561d0819caa2b9b
Adrian Roos [Tue, 8 Aug 2017 10:57:18 +0000 (10:57 +0000)]
Merge "ScrimController: Wait with clearing wakup animation until done" into oc-dr1-dev
am:
6e4de6ccdf
Change-Id: I1eb1c997c551461ff09efd1f3ea35276cbb4d43d
TreeHugger Robot [Tue, 8 Aug 2017 10:48:47 +0000 (10:48 +0000)]
Merge "ScrimController: Wait with clearing wakup animation until done" into oc-dr1-dev
Matthew Ng [Tue, 8 Aug 2017 10:29:54 +0000 (10:29 +0000)]
Merge "Recents scroll backwards (accessibility) if clear all button invisible" into oc-mr1-dev
am:
249acda3b6
Change-Id: I63621b117c7e16777662adeba71dd58bcefdf701
Matthew Ng [Tue, 8 Aug 2017 10:28:48 +0000 (10:28 +0000)]
Merge "Scrolling recents to next/prev page focuses next/prev node" into oc-mr1-dev
am:
c648e90bdd
Change-Id: I356bb7efc3a8fe3f58d708921e94d8ff22b10598
TreeHugger Robot [Tue, 8 Aug 2017 10:21:15 +0000 (10:21 +0000)]
Merge "Recents scroll backwards (accessibility) if clear all button invisible" into oc-mr1-dev
TreeHugger Robot [Tue, 8 Aug 2017 10:21:15 +0000 (10:21 +0000)]
Merge "Scrolling recents to next/prev page focuses next/prev node" into oc-mr1-dev
Narayan Kamath [Tue, 8 Aug 2017 09:15:41 +0000 (09:15 +0000)]
Merge "system_server : trigger runtime restart when we're close to the soft FD limit." into oc-mr1-dev
am:
365ce730bd
Change-Id: Ib0bfbbd43de5ba7cc4cf550c4e5463529ddeff5b
Android Build Merger (Role) [Tue, 8 Aug 2017 09:11:31 +0000 (09:11 +0000)]
Merge "Merge "app link handling under restricted mobile data" into oc-dr1-dev am:
93bf6200eb am:
a40b8b7431" into oc-mr1-dev-plus-aosp
Narayan Kamath [Tue, 8 Aug 2017 09:09:27 +0000 (09:09 +0000)]
Merge "system_server : trigger runtime restart when we're close to the soft FD limit." into oc-mr1-dev
fionaxu [Tue, 8 Aug 2017 09:08:42 +0000 (09:08 +0000)]
Merge "app link handling under restricted mobile data" into oc-dr1-dev am:
93bf6200eb
am:
aa73a69d3a
Change-Id: Idbfec034c44a355ddcf702bbfffea8107a48f702
fionaxu [Tue, 8 Aug 2017 09:08:42 +0000 (09:08 +0000)]
Merge "app link handling under restricted mobile data" into oc-dr1-dev am:
93bf6200eb
am:
a40b8b7431
Change-Id: Iff48615957699f5ccf14bf092a7ed9766637524e
fionaxu [Tue, 8 Aug 2017 09:02:26 +0000 (09:02 +0000)]
Merge "app link handling under restricted mobile data" into oc-dr1-dev
am:
93bf6200eb
Change-Id: Ic662de15a4cd95a77f509f1aaa56ea3bf6ae4b35
fionaxu [Tue, 8 Aug 2017 09:02:23 +0000 (09:02 +0000)]
Merge "app link handling under restricted mobile data" into oc-dr1-dev
am:
93bf6200eb
Change-Id: I1a506e9f8dae6fd76c74c3f9d7f93c40ce64a387
Hugo Benichi [Tue, 8 Aug 2017 09:01:19 +0000 (09:01 +0000)]
Merge "DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies" am:
c06dbc114f -s ours am:
607f74b317 -s ours am:
082a9fa173
am:
c9ef02ca17
Change-Id: I6c4f680e2fc5615c11be8659333ec78a440ef158
TreeHugger Robot [Tue, 8 Aug 2017 08:57:16 +0000 (08:57 +0000)]
Merge "app link handling under restricted mobile data" into oc-dr1-dev
Hugo Benichi [Tue, 8 Aug 2017 08:55:42 +0000 (08:55 +0000)]
Merge "DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies" am:
c06dbc114f -s ours am:
607f74b317 -s ours
am:
082a9fa173
Change-Id: If6ad00b1ee146f73ee62a5a7d5e3992ee29b6fd2
Hugo Benichi [Tue, 8 Aug 2017 08:48:56 +0000 (08:48 +0000)]
Merge "DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies" am:
c06dbc114f -s ours
am:
607f74b317 -s ours
Change-Id: I78b9a3639321a15a26eff3abd4c80a9d84d9229c
Hugo Benichi [Tue, 8 Aug 2017 08:40:40 +0000 (08:40 +0000)]
Merge "DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies"
am:
c06dbc114f -s ours
Change-Id: Idfc34008bf7d9c636ee67fed3f07552be688052d
Treehugger Robot [Tue, 8 Aug 2017 08:30:03 +0000 (08:30 +0000)]
Merge "DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies"
Hugo Benichi [Tue, 8 Aug 2017 07:53:41 +0000 (07:53 +0000)]
Merge "Connectivity OWNERS: let owners modify Android.mk" am:
05be68698b am:
a22fbf4534 am:
db554dfdfa
am:
86e04cb370
Change-Id: I6366148e3da573aa95e5b8e3016eab55e56efe23
Hugo Benichi [Tue, 8 Aug 2017 07:47:07 +0000 (07:47 +0000)]
Merge "Fix flaky IpPrefixTest." am:
2cbce2cb27 -s ours am:
7d752a872d -s ours am:
ffcc739a39 -s ours
am:
a432741940 -s ours
Change-Id: I0d7ce75411072adb90c449d71c48b163c06ee290
Hugo Benichi [Tue, 8 Aug 2017 07:46:56 +0000 (07:46 +0000)]
Merge "Connectivity OWNERS: let owners modify Android.mk" am:
05be68698b am:
a22fbf4534
am:
db554dfdfa
Change-Id: I68339b6b5efab5ac8fe72bbbd7c96da59bc24b2e
Hugo Benichi [Tue, 8 Aug 2017 07:40:11 +0000 (07:40 +0000)]
Merge "Fix flaky IpPrefixTest." am:
2cbce2cb27 -s ours am:
7d752a872d -s ours
am:
ffcc739a39 -s ours
Change-Id: I64b9214694132f874d5546b4ade1917524db50d7
Hugo Benichi [Tue, 8 Aug 2017 07:40:02 +0000 (07:40 +0000)]
Merge "Connectivity OWNERS: let owners modify Android.mk" am:
05be68698b
am:
a22fbf4534
Change-Id: I64895a50baca163588ce863f7fb93fad31d7f55b
Hugo Benichi [Tue, 8 Aug 2017 07:34:42 +0000 (07:34 +0000)]
Merge "Fix flaky IpPrefixTest." am:
2cbce2cb27 -s ours
am:
7d752a872d -s ours
Change-Id: I216b50a8d0f51f2f731b17598b205a7b0ad65324
Hugo Benichi [Tue, 8 Aug 2017 07:34:39 +0000 (07:34 +0000)]
Merge "Connectivity OWNERS: let owners modify Android.mk"
am:
05be68698b
Change-Id: Iff94ca7089c074cc44f8e09cbce01f741c0b5c67
Hugo Benichi [Tue, 8 Aug 2017 07:32:09 +0000 (07:32 +0000)]
Merge "Add OWNERS to com.android.server.net" am:
0a00151bd1 am:
24f5d8f866 am:
847647b96b
am:
5eea8365da
Change-Id: Id173ca5a2e3d3cc817b55b6f55b29959f9a8ced1
Hugo Benichi [Tue, 8 Aug 2017 07:28:32 +0000 (07:28 +0000)]
Merge "Fix flaky IpPrefixTest."
am:
2cbce2cb27 -s ours
Change-Id: Iabc8a365a6c18c19754da7ddfcc0385eb5b0f768
Hugo Benichi [Tue, 8 Aug 2017 07:27:06 +0000 (07:27 +0000)]
Merge "Add OWNERS to com.android.server.net" am:
0a00151bd1 am:
24f5d8f866
am:
847647b96b
Change-Id: Ia8593f827788d8b19366694fccaeeb79105995d2
Hugo Benichi [Tue, 8 Aug 2017 07:21:41 +0000 (07:21 +0000)]
Merge "Add OWNERS to com.android.server.net" am:
0a00151bd1
am:
24f5d8f866
Change-Id: Id6986ccea642c2e78e6b7493cec553a9fe53971f
Hugo Benichi [Tue, 8 Aug 2017 07:20:07 +0000 (07:20 +0000)]
Merge "Connectivity OWNERS: let owners modify Android.mk"
Treehugger Robot [Tue, 8 Aug 2017 07:16:48 +0000 (07:16 +0000)]
Merge "Fix flaky IpPrefixTest."
Hugo Benichi [Tue, 8 Aug 2017 07:16:12 +0000 (07:16 +0000)]
Merge "Add OWNERS to com.android.server.net"
am:
0a00151bd1
Change-Id: Ib9938dd15a173d459ca67e5dc19430da57c29115
Treehugger Robot [Tue, 8 Aug 2017 07:07:25 +0000 (07:07 +0000)]
Merge "Add OWNERS to com.android.server.net"
Hugo Benichi [Fri, 4 Aug 2017 03:12:25 +0000 (12:12 +0900)]
DO NOT MERGE Fix some broken tests in frameworks-net with native dependencies
Rational for do not merge: the list of native libraries needed in
Android.mk is not consistent at the moment for aosp master and for
internal branches. Furthermore it is not consistent within internal
branches either. This patch only attempts to fix the tests of the
branches where it matters for development. Otherwise the cost of merge
conflicts makes it undesirable.
Test: All tests in runtest frameworks-net pass.
Merged-In: Ie0b8baa38ca39e92fbd698ebcead86dac0a67708
(cherry pick from commit
99e8ab6e46eec5dbd1b059b3732672d537b3cf34)
Change-Id: Ic732b3dafc3497235e455b8748ac4f99cf02b221
Hugo Benichi [Mon, 7 Aug 2017 01:27:04 +0000 (10:27 +0900)]
Add OWNERS to com.android.server.net
Test: build
Change-Id: I9236489814103ab20b077ebfc30155dcdb66d411
Wei Wang [Mon, 7 Aug 2017 22:35:13 +0000 (15:35 -0700)]
Shutdown: Continue shutdown with BLE only mode
Bug:
64213593
Test: shutdown no timeout
Change-Id: I5007e7cfc00ab22fce3b6ef13bacbcc951197b9e
Sungsoo Lim [Tue, 8 Aug 2017 06:25:02 +0000 (06:25 +0000)]
Merge "Start ARC action when setSystemAudioMode" into oc-mr1-dev
am:
3c8b5d1cf2
Change-Id: Ic285348252030d6bf443ecec7458b20810ee9cf4
TreeHugger Robot [Tue, 8 Aug 2017 06:18:56 +0000 (06:18 +0000)]
Merge "Start ARC action when setSystemAudioMode" into oc-mr1-dev
Bookatz [Tue, 8 Aug 2017 06:11:30 +0000 (06:11 +0000)]
Merge "Bump parcel version to reset batterystats" into oc-mr1-dev
am:
26e02181a0
Change-Id: I5bbd8149000295ffdbad32a8e1877669e7642005
TreeHugger Robot [Tue, 8 Aug 2017 06:03:18 +0000 (06:03 +0000)]
Merge "Bump parcel version to reset batterystats" into oc-mr1-dev
Hugo Benichi [Thu, 10 Nov 2016 13:45:56 +0000 (22:45 +0900)]
Fix flaky IpPrefixTest.
Test: IpPrefixTest passes
Bug:
32561414
Merged-In: Ib4bffe9d33a6d4f5c2bd97798073de0f66d77645
(cherry pick from commit
32c687040301cb3601fd110281a742159a963aa9)
Change-Id: Ibaf11aae9b13af868bebff820c9e7615b63c8eb2
Hugo Benichi [Tue, 8 Aug 2017 01:46:57 +0000 (10:46 +0900)]
Connectivity OWNERS: let owners modify Android.mk
Since per-file overwrites the directory default, just allowing
build.master@android.com for Android.mk with a per-file rule prevents
the owners of the directory to modify Android.mk files without bypassing
OWNERS check in gerrit.
This patch fixes this issue for Connectivity OWNERS files by explicitly
listing Connectivity members for a few Android.mk files.
Test: build
Change-Id: I9c2a2519c3e7dd27e66334b090e074968b408cbc
OSDN Git Service
