OSDN Git Service
Adam Lesinski [Tue, 23 May 2017 23:19:26 +0000 (23:19 +0000)]
Merge "Resources: fix race with creating theme" into oc-dev
am:
5f70bc89be
Change-Id: I73bb76a7ff3fe6d3e0a974b5cbaed34c632ee8ae
Adam Lesinski [Tue, 23 May 2017 23:14:11 +0000 (23:14 +0000)]
Merge "Resources: fix race with creating theme" into oc-dev
Android Build Merger (Role) [Tue, 23 May 2017 23:13:39 +0000 (23:13 +0000)]
Merge "Merge "Fix race condition triggered by quick stop/start of Dream" into cw-f-dev am:
90a6054805 am:
94b497bccc am:
27918e7ff1" into oc-dev-plus-aosp
Erik Wolsheimer [Tue, 23 May 2017 23:12:47 +0000 (23:12 +0000)]
Merge "Fix race condition triggered by quick stop/start of Dream" into cw-f-dev am:
90a6054805 am:
94b497bccc
am:
27918e7ff1
Change-Id: I315e1b6638ea86d938643674031b9cef99764da5
Erik Wolsheimer [Tue, 23 May 2017 23:10:25 +0000 (23:10 +0000)]
Merge "Fix race condition triggered by quick stop/start of Dream" into cw-f-dev am:
90a6054805 am:
94b497bccc
am:
f61df4329b
Change-Id: I4633607638c0c2a1ad05c76fc45eb6a894ff3202
Erik Wolsheimer [Tue, 23 May 2017 23:00:03 +0000 (23:00 +0000)]
Merge "Fix race condition triggered by quick stop/start of Dream" into cw-f-dev am:
90a6054805
am:
94b497bccc
Change-Id: I62ab41ed83aa92b12e7fa3c9111a6f97e6ef13ef
Erik Wolsheimer [Tue, 23 May 2017 22:58:57 +0000 (22:58 +0000)]
Merge "Fix race condition triggered by quick stop/start of Dream" into cw-f-dev am:
90a6054805
am:
94b497bccc
Change-Id: I14f0b27d9d068df1defed18cd148ee331e0e876a
Erik Wolsheimer [Tue, 23 May 2017 22:51:29 +0000 (22:51 +0000)]
Merge "Respect one-shot click effect config in VibratorService" into oc-dev
am:
95e55f5020
Change-Id: I43e326ccc04534938c558f430ce4e2015347ac5e
Erik Wolsheimer [Tue, 23 May 2017 22:51:25 +0000 (22:51 +0000)]
Merge "Fix race condition triggered by quick stop/start of Dream" into cw-f-dev
am:
90a6054805
Change-Id: I708fda61e866a891238d6dbbfc6a9b901e6da6b3
TreeHugger Robot [Tue, 23 May 2017 22:46:43 +0000 (22:46 +0000)]
Merge "Respect one-shot click effect config in VibratorService" into oc-dev
TreeHugger Robot [Tue, 23 May 2017 22:44:37 +0000 (22:44 +0000)]
Merge "Fix race condition triggered by quick stop/start of Dream" into cw-f-dev
Ruthwar Kumar Ambeer [Tue, 23 May 2017 20:57:05 +0000 (20:57 +0000)]
Merge "Consider the last inserted SIM for EmergencyAffordance" am:
65d3a457d2 am:
96926cac25
am:
c6845e017a
Change-Id: Ifd84c571e83da3dca1ef87805506570e41caad16
Jayachandran Chinnakkannu [Tue, 23 May 2017 20:51:30 +0000 (20:51 +0000)]
Merge "Fix up upstream interface types for case DUN_UNSPECIFIED" into oc-dev
am:
be67aefca2
Change-Id: Ibfee591728c5cf01d8e11b7ccf2418194d398b59
Ruthwar Kumar Ambeer [Tue, 23 May 2017 20:50:12 +0000 (20:50 +0000)]
Merge "Consider the last inserted SIM for EmergencyAffordance" am:
65d3a457d2
am:
96926cac25
Change-Id: I663415938196335bd27d9172b59d5f169a0609e3
Ruthwar Kumar Ambeer [Tue, 23 May 2017 20:43:10 +0000 (20:43 +0000)]
Merge "Consider the last inserted SIM for EmergencyAffordance"
am:
65d3a457d2
Change-Id: I3b7bfb3963b61c4589811e8c27e4f89ff501096e
Jayachandran Chinnakkannu [Tue, 23 May 2017 20:42:41 +0000 (20:42 +0000)]
Merge "Fix up upstream interface types for case DUN_UNSPECIFIED" into oc-dev
Jorim Jaggi [Tue, 23 May 2017 20:38:10 +0000 (20:38 +0000)]
Merge "Fix starting window leak when adding/removing quickly" into oc-dev
am:
3047a5ea7a
Change-Id: I0cd5b402d00c6b201d2ba598606d292d83c52e4d
Treehugger Robot [Tue, 23 May 2017 20:34:54 +0000 (20:34 +0000)]
Merge "Consider the last inserted SIM for EmergencyAffordance"
TreeHugger Robot [Tue, 23 May 2017 20:32:26 +0000 (20:32 +0000)]
Merge "Fix starting window leak when adding/removing quickly" into oc-dev
Adam Lesinski [Tue, 23 May 2017 20:14:54 +0000 (13:14 -0700)]
Resources: fix race with creating theme
Bug:
38353957
Test: none
Change-Id: Id78770b475b979635da6a4067db6269e3a1b04d6
Bryce Lee [Tue, 23 May 2017 19:56:04 +0000 (19:56 +0000)]
Merge "Revert "Disallow starting activities without new task from non-activity context."" into oc-dev
am:
367b880c02
Change-Id: I0a0d96048c0b3dd504d0c90dbf80a8299c4b96a4
Bryce Lee [Tue, 23 May 2017 19:50:21 +0000 (19:50 +0000)]
Merge "Revert "Disallow starting activities without new task from non-activity context."" into oc-dev
Bryce Lee [Tue, 23 May 2017 19:46:59 +0000 (19:46 +0000)]
Revert "Disallow starting activities without new task from non-activity context."
This reverts commit
8b49a5c0aa18f70bc59b972e888d5ad455e4d7ca.
Change-Id: I7d2da4ac72ca578942b38fccf8b151f3a2ed081f
Todd Kennedy [Tue, 23 May 2017 19:37:39 +0000 (19:37 +0000)]
Merge "Filter package manager calls" into oc-dev
am:
07c832f405
Change-Id: Ie2a7bf1da693f67d9d4a6cc2ee1e9b8ea000de29
Bryce Lee [Tue, 23 May 2017 19:35:35 +0000 (19:35 +0000)]
Merge "Add new task flag when starting chooser activity in bug report." into oc-dev
am:
2981584b12
Change-Id: Ic3e10886851b94eb79202b404368c6c7696ca986
Stan Iliev [Tue, 23 May 2017 19:29:58 +0000 (19:29 +0000)]
Merge "Fix recent apps in system UI for Skia pipeline" into oc-dev
am:
4277d8f3e6
Change-Id: Ia3b645a631ce0c43278a9adde690a851d08a8be0
TreeHugger Robot [Tue, 23 May 2017 19:26:11 +0000 (19:26 +0000)]
Merge "Filter package manager calls" into oc-dev
Bryce Lee [Tue, 23 May 2017 19:21:07 +0000 (19:21 +0000)]
Merge "Add new task flag when starting chooser activity in bug report." into oc-dev
TreeHugger Robot [Tue, 23 May 2017 19:19:34 +0000 (19:19 +0000)]
Merge "Fix recent apps in system UI for Skia pipeline" into oc-dev
Matthew Ng [Tue, 23 May 2017 17:57:26 +0000 (17:57 +0000)]
Merge "Fixed unminimizing during battery saving mode" into oc-dev
am:
5b49464dc6
Change-Id: Id5efa71298cd71bb91aa3f08fb4bfe4eff43a183
John Reck [Tue, 23 May 2017 17:51:28 +0000 (17:51 +0000)]
Merge "Improve time to texture destruction" into oc-dev
am:
1bc0286ef8
Change-Id: I93daab53961a018a2cf8d4e2d4d8300b84bb917e
TreeHugger Robot [Tue, 23 May 2017 17:44:04 +0000 (17:44 +0000)]
Merge "Fixed unminimizing during battery saving mode" into oc-dev
Daniel Nishi [Tue, 23 May 2017 17:42:43 +0000 (17:42 +0000)]
Merge "batterymeter -> just meter." into oc-dev
am:
da4c81d942
Change-Id: I6500c46fc1b0fcbe290e9d610ac6506458ab9fca
Stan Iliev [Mon, 22 May 2017 19:02:25 +0000 (15:02 -0400)]
Fix recent apps in system UI for Skia pipeline
Enable HW Bitmaps for Skia pipelines by using a readback to
convert GraphicBuffer into a raster SkImage. Both BitmapShader
and drawing HW bitmaps into a canvas are supported.
Test: recent apps work, no memory leaks, CTS graphics and
UiRendering tests passed, HWUI unit test passed
bug:
38136140
Change-Id: I23fed5febad3b1009e0417fb7e21a347a8d11b0d
Merged-In: I23fed5febad3b1009e0417fb7e21a347a8d11b0d
John Reck [Tue, 23 May 2017 17:38:36 +0000 (17:38 +0000)]
Merge "Improve time to texture destruction" into oc-dev
Daniel Nishi [Tue, 23 May 2017 17:35:14 +0000 (17:35 +0000)]
Merge "batterymeter -> just meter." into oc-dev
Dan Willemsen [Tue, 23 May 2017 17:25:09 +0000 (17:25 +0000)]
Merge "Fix makefile warning." am:
f523227a6e am:
9e317f8743
am:
1cb063d3ed
Change-Id: I83e952804b47ad50b1c8c9125ef36772f6571d69
Dan Willemsen [Tue, 23 May 2017 17:18:55 +0000 (17:18 +0000)]
Merge "Fix makefile warning." am:
f523227a6e
am:
9e317f8743
Change-Id: I8078c4dfbb3cbc55dd6d08888c67c31721a77397
Dan Willemsen [Tue, 23 May 2017 17:12:03 +0000 (17:12 +0000)]
Merge "Fix makefile warning."
am:
f523227a6e
Change-Id: I852b00eb0c562003307507d02e1dd80a7d42cf9f
Jorim Jaggi [Tue, 23 May 2017 17:11:57 +0000 (17:11 +0000)]
Merge "Fix window affecting SysUi visibility for once and all" into oc-dev
am:
6cfc8afa7a
Change-Id: I0bf707ab3ad162b1c7b868719d3347f489f51964
Winson Chung [Tue, 23 May 2017 17:06:53 +0000 (17:06 +0000)]
Merge "Fix issue with TV PIP clobbering resize on orientation change." into oc-dev
am:
921078ab31
Change-Id: Ie501b38fe561a37ab60069fae56b7b0f41f9016e
Dan Willemsen [Tue, 23 May 2017 16:58:46 +0000 (16:58 +0000)]
Merge "Fix makefile warning."
TreeHugger Robot [Tue, 23 May 2017 16:58:38 +0000 (16:58 +0000)]
Merge "Fix window affecting SysUi visibility for once and all" into oc-dev
TreeHugger Robot [Tue, 23 May 2017 16:54:44 +0000 (16:54 +0000)]
Merge "Fix issue with TV PIP clobbering resize on orientation change." into oc-dev
John Reck [Tue, 23 May 2017 16:51:19 +0000 (16:51 +0000)]
Merge "Convert Shader to NativeAllocationRegistry" into oc-dev
am:
3afc07ae7b
Change-Id: If30bf388289e5726edbb31b6b88343455e68b09c
John Reck [Tue, 23 May 2017 16:43:37 +0000 (16:43 +0000)]
Merge "Convert Shader to NativeAllocationRegistry" into oc-dev
Rob Carr [Tue, 23 May 2017 16:37:18 +0000 (16:37 +0000)]
Merge "SurfaceView: Wait to gather transparent region." into oc-dev
am:
d9bf5ecf51
Change-Id: I7690e2439276f9362f5fdeff0f789e9f1f3f7d91
Rob Carr [Tue, 23 May 2017 16:30:57 +0000 (16:30 +0000)]
Merge "SurfaceView: Wait to gather transparent region." into oc-dev
Jorim Jaggi [Tue, 23 May 2017 16:00:48 +0000 (18:00 +0200)]
Fix starting window leak when adding/removing quickly
The following race condition may happen when transferring starting
windows:
- Add thread (android.anim) calls Snapshot.create
- Remove thread (android.display!) checks that yes there is a
starting window, but no surface yet. Thus, it nulls out everything.
- Add thread returns from Snapshot.create: container.startingData
is null but startingWindow is also null. Thus, we never set
abort=true and we never set the starting window properly or remove
it properly.
Test: Some basic starting window sanity testing. Otherwise, pray
to the race condition gods.
Test: AppWindowContainerControllerTests#testAddRemoveRace
Fixes:
37888853
Change-Id: Ia287bfa52f708b36ff93ef7cd45a0d080bd4dd9c
Abodunrinwa Toki [Tue, 23 May 2017 16:10:59 +0000 (16:10 +0000)]
Merge "Fix FloatingToolbar refresh on menu changes." into oc-dev
am:
7c4998e614
Change-Id: Id7e6c2485fa3a0519b77dd64498808d255f10fbc
Abodunrinwa Toki [Tue, 23 May 2017 16:05:15 +0000 (16:05 +0000)]
Merge "Ensure FloatingActionMode has a non-null FloatingToolbar." into oc-dev
am:
76ec0575bc
Change-Id: If1353fcbfc97a752bec758763caf1188b8c0daa3
Bryce Lee [Tue, 23 May 2017 16:02:09 +0000 (09:02 -0700)]
Add new task flag when starting chooser activity in bug report.
This flag is required whenever starting an activity from a
non-activity context.
Change-Id: Ia77e6e7801d712a20d407bc2ac92e543bc287010
Fixes:
62016780
Test: Click on generated bug report notification
TreeHugger Robot [Tue, 23 May 2017 16:01:31 +0000 (16:01 +0000)]
Merge "Fix FloatingToolbar refresh on menu changes." into oc-dev
TreeHugger Robot [Tue, 23 May 2017 15:57:44 +0000 (15:57 +0000)]
Merge "Ensure FloatingActionMode has a non-null FloatingToolbar." into oc-dev
Geoffrey Pitsch [Tue, 23 May 2017 15:41:48 +0000 (15:41 +0000)]
Use channel warning development setting.
am:
507822decb
Change-Id: I3913dc37725fb9807637e9a9b0112839284bb4cd
Geoffrey Pitsch [Thu, 11 May 2017 16:57:22 +0000 (12:57 -0400)]
Use channel warning development setting.
Defaults to enabled for debuggable builds.
Bug:
37945054
Bug:
38380608
Test: manual
Change-Id: I1b67f55d507e31349908953abbf04ac764835915
Jorim Jaggi [Tue, 23 May 2017 14:05:35 +0000 (16:05 +0200)]
Fix window affecting SysUi visibility for once and all
This unforunately introduces another quasi-visibiltiy method but
I think this is the best solution, as the code is pretty clean.
Test: Navigate through, settings, make sure no flickering
Test: Launch music from notification
Test: Launch United app
Test: Go settings -> app -> settings repeadetly 100 times, make
sure light bar transition is always clean
Fixes:
38216281
Change-Id: I0b97334dea3bfef2966ad0c7dd8bbd9907f2574c
Geoffrey Pitsch [Tue, 23 May 2017 14:33:46 +0000 (14:33 +0000)]
Merge "Ignore a bunch of systemui tests until flakes are found" into oc-dev
am:
c9963a2f2a
Change-Id: I23f6c99125cc66923b2e46deb66b200cfe15a251
Geoffrey Pitsch [Tue, 23 May 2017 14:28:56 +0000 (14:28 +0000)]
Merge "Ignore a bunch of systemui tests until flakes are found" into oc-dev
Hugo Benichi [Tue, 23 May 2017 14:18:30 +0000 (14:18 +0000)]
Merge "Fix NetworkStatsObserversTest" am:
0dc35fa969 am:
25282c3e38
am:
814351c843
Change-Id: Ice4bb8de4267cba7a15a60838e165fab5ebade72
Geoffrey Pitsch [Mon, 22 May 2017 19:20:20 +0000 (15:20 -0400)]
Ignore a bunch of systemui tests until flakes are found
Test: runtest systemui
Bug:
38500852
Change-Id: I54f0e868bd9432758ff21a344631b6888bc83a4b
Andrew Scull [Tue, 23 May 2017 12:11:03 +0000 (13:11 +0100)]
Merge commit '
61ce55899d92e786fb9595052e7dcc66e8148b4c' into manual_merge_61ce55899d92
Test: Build
Change-Id: I4e5ecc3b2540f07489d3b0dbcc0626d0e5f7d3da
Hugo Benichi [Tue, 23 May 2017 11:44:33 +0000 (11:44 +0000)]
Merge "Fix NetworkStatsObserversTest" am:
0dc35fa969
am:
25282c3e38
Change-Id: I8cc0dc340d3108d74cea96487560bbc8cfa2f650
Hugo Benichi [Tue, 23 May 2017 11:37:37 +0000 (11:37 +0000)]
Merge "Fix NetworkStatsObserversTest"
am:
0dc35fa969
Change-Id: I9b4e83b4e437089ea500d82990e59558ff55e02a
Hugo Benichi [Tue, 23 May 2017 11:29:47 +0000 (11:29 +0000)]
Merge "Fix NetworkStatsObserversTest"
Jorim Jaggi [Tue, 23 May 2017 11:10:57 +0000 (11:10 +0000)]
Merge "Reset Keyguard when clicking emergency call button" into oc-dev
am:
ff389264d9
Change-Id: I557863570a252fc84b76198a4acf0534a55af47c
Jorim Jaggi [Tue, 23 May 2017 11:04:21 +0000 (11:04 +0000)]
Merge "Reset Keyguard when clicking emergency call button" into oc-dev
Andrew Scull [Tue, 23 May 2017 10:47:09 +0000 (10:47 +0000)]
Merge "NetworkManagementService.java: fix error-prone warnings" am:
44b7e94a7c
am:
0ba1fa19bd
Change-Id: Ia89fdb05890d40b1299c666a4535b4e9a8640323
Andrew Scull [Tue, 23 May 2017 10:40:38 +0000 (10:40 +0000)]
Merge "NetworkManagementService.java: fix error-prone warnings"
am:
44b7e94a7c
Change-Id: I7cade535f2bca308446aa91d4368ee41b62daa9b
Treehugger Robot [Tue, 23 May 2017 10:31:57 +0000 (10:31 +0000)]
Merge "NetworkManagementService.java: fix error-prone warnings"
Carmen Jackson [Tue, 23 May 2017 09:30:25 +0000 (09:30 +0000)]
Merge "Re-run pinner service on camera app update and dex optimization." into oc-dev
am:
a7e45e364c
Change-Id: Idd235d42904bb03ef38a1bb3972b9e82353bbaff
TreeHugger Robot [Tue, 23 May 2017 09:24:13 +0000 (09:24 +0000)]
Merge "Re-run pinner service on camera app update and dex optimization." into oc-dev
Stephen Chen [Tue, 23 May 2017 08:34:22 +0000 (08:34 +0000)]
Merge "Check network info for metering state on AccessPoint." into oc-dev
am:
73c04555ac
Change-Id: I85bd2269bac0cd072d06a036e09f6aea924da6ba
TreeHugger Robot [Tue, 23 May 2017 08:29:45 +0000 (08:29 +0000)]
Merge "Check network info for metering state on AccessPoint." into oc-dev
Hugo Benichi [Tue, 23 May 2017 07:02:54 +0000 (07:02 +0000)]
Merge "Fix NetworkStatsAccessTest" am:
ec1f25a4ba am:
cdb75d321b
am:
85afabc4ec
Change-Id: I60f9d8867655a6aa24ee192c772d4c26a96c9bcd
Hugo Benichi [Tue, 23 May 2017 06:56:48 +0000 (06:56 +0000)]
Merge "Fix NetworkStatsAccessTest" am:
ec1f25a4ba
am:
cdb75d321b
Change-Id: I5ef9861438bbe474b4e4670b8fdba4368531978d
Hugo Benichi [Tue, 23 May 2017 06:51:15 +0000 (06:51 +0000)]
Merge "Fix NetworkStatsAccessTest"
am:
ec1f25a4ba
Change-Id: If949493d9967fa723667947979262bf4f90841c2
Hugo Benichi [Tue, 23 May 2017 06:43:06 +0000 (06:43 +0000)]
Merge "Fix NetworkStatsAccessTest"
Hugo Benichi [Tue, 23 May 2017 06:37:24 +0000 (06:37 +0000)]
Merge "ConnectivityManager: simplify callback handler" am:
857e7d9c85 am:
7bce658dd6
am:
a67fb638fa
Change-Id: I3934666df4a02101351993f7f83fb0a42124a2f5
Hugo Benichi [Tue, 23 May 2017 06:30:48 +0000 (06:30 +0000)]
Merge "ConnectivityManager: simplify callback handler" am:
857e7d9c85
am:
7bce658dd6
Change-Id: Ica9d4fbb1dd0ba9da4aaea0fbc3571c3446110ef
Stephen Chen [Fri, 19 May 2017 22:55:02 +0000 (15:55 -0700)]
Check network info for metering state on AccessPoint.
This resolves bug where networks manually marked as metered by Settings
UI were not tagged with a metered friction icon in the Wi-Fi picker.
Bug:
38460378
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
Change-Id: I2ffe25e898ac001549e7d7492a2aa335ee415a4e
Hugo Benichi [Tue, 23 May 2017 06:24:16 +0000 (06:24 +0000)]
Merge "ConnectivityManager: simplify callback handler"
am:
857e7d9c85
Change-Id: I8d5371b69fcec3f1f625923eb65191b4c018bb00
Treehugger Robot [Tue, 23 May 2017 06:16:47 +0000 (06:16 +0000)]
Merge "ConnectivityManager: simplify callback handler"
Tomasz Wasilczyk [Tue, 11 Apr 2017 18:06:34 +0000 (11:06 -0700)]
Fix makefile warning.
Test: it builds.
Bug: b/
37159108
Change-Id: I73c09c8eeb0bab5f506c3d81072cc80c71f63779
Merged-In: I73c09c8eeb0bab5f506c3d81072cc80c71f63779
Erik Kline [Tue, 23 May 2017 05:12:44 +0000 (05:12 +0000)]
Merge "Refactor TISM add/remove code" am:
5041bbde19 am:
c85053f7eb
am:
2e33be3ca9
Change-Id: Ic1bcb3ca011bdc886086f34be18409eb5b12f521
Erik Kline [Tue, 23 May 2017 05:03:05 +0000 (05:03 +0000)]
Merge "Refactor TISM add/remove code" am:
5041bbde19
am:
c85053f7eb
Change-Id: Id001b164a7eca7b4e681eefbadf4b87bb1f7dbd1
Hugo Benichi [Tue, 23 May 2017 04:56:41 +0000 (04:56 +0000)]
Merge "ConnectivityServiceTest: fix flakyness" am:
a82cac1452 am:
004f36d5bc
am:
eb9d0f16aa
Change-Id: Ic792060aafb5aa8b485054be18c3dba82bb15a3b
Erik Kline [Tue, 23 May 2017 04:56:40 +0000 (04:56 +0000)]
Merge "Refactor TISM add/remove code"
am:
5041bbde19
Change-Id: I2475a3cbff37248509e21dd058ed8f3d827fefd0
Hugo Benichi [Tue, 23 May 2017 04:49:09 +0000 (04:49 +0000)]
Merge "ConnectivityServiceTest: fix flakyness" am:
a82cac1452
am:
004f36d5bc
Change-Id: Id8468bd8e38927341cdbebe2925c0bfd4bb37c0c
Treehugger Robot [Tue, 23 May 2017 04:44:22 +0000 (04:44 +0000)]
Merge "Refactor TISM add/remove code"
Hugo Benichi [Tue, 23 May 2017 04:42:40 +0000 (04:42 +0000)]
Merge "ConnectivityServiceTest: fix flakyness"
am:
a82cac1452
Change-Id: I241192b2d9565c41f47bbe6227b50049898da679
Hugo Benichi [Tue, 23 May 2017 04:35:08 +0000 (04:35 +0000)]
Merge "ConnectivityServiceTest: fix flakyness"
Android Build Merger (Role) [Tue, 23 May 2017 03:44:13 +0000 (03:44 +0000)]
Merge "Merge "Merge "ConnectivityManager: improve argument validation" am:
cdfd3a186f am:
0187514f74" into nyc-mr2-dev-plus-aosp am:
7ee4542d17" into oc-dev-plus-aosp
Hugo Benichi [Tue, 23 May 2017 03:43:21 +0000 (03:43 +0000)]
Merge "Merge "ConnectivityManager: improve argument validation" am:
cdfd3a186f am:
0187514f74" into nyc-mr2-dev-plus-aosp
am:
7ee4542d17
Change-Id: Ibe3c29fa1c483965531694b3d4b8f6a8154e546d
Android Build Merger (Role) [Tue, 23 May 2017 03:42:45 +0000 (03:42 +0000)]
Merge "Merge "ConnectivityManager: improve argument validation" am:
cdfd3a186f am:
0187514f74 am:
b800e8520e" into oc-dev-plus-aosp
Hugo Benichi [Tue, 23 May 2017 03:41:52 +0000 (03:41 +0000)]
Merge "ConnectivityManager: improve argument validation" am:
cdfd3a186f am:
0187514f74
am:
b800e8520e
Change-Id: Idfc0938025c633c89f5bfddd88b3721876d085ef
Android Build Merger (Role) [Tue, 23 May 2017 03:41:21 +0000 (03:41 +0000)]
Merge "Merge "Added IWLAN metered APN support" am:
70fe11fc38 am:
ab48527680 am:
b8f3e388fc" into oc-dev-plus-aosp
Jack Yu [Tue, 23 May 2017 03:39:49 +0000 (03:39 +0000)]
Merge "Added IWLAN metered APN support" am:
70fe11fc38 am:
ab48527680
am:
b8f3e388fc
Change-Id: Ia03104b1604bb34c6993171e848aa6193409726a
Wale Ogunwale [Tue, 23 May 2017 03:38:03 +0000 (03:38 +0000)]
Merge "Revert "Changed alert window notifications to use single channel"" into oc-dev
am:
540cb28c5a
Change-Id: I188f1e181ff7feab8d1da92f6ef72ac43d47719c
Android Build Merger (Role) [Tue, 23 May 2017 03:34:41 +0000 (03:34 +0000)]
Merge "Merge "ConnectivityManager: improve argument validation" am:
cdfd3a186f am:
0187514f74" into nyc-mr2-dev-plus-aosp
OSDN Git Service
