OSDN Git Service
Adam Lesinski [Wed, 5 Jul 2017 21:39:27 +0000 (21:39 +0000)]
Merge "Merge "Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours am:
1ebe18d691 -s ours" into oc-dev-plus-aosp am:
eb20c5a9f4 -s ours" into oc-dr1-dev-plus-aosp
am:
11dc56bd83 -s ours
Change-Id: I27945b9aa22e51b48894b0300542e5da4c95a048
Adam Lesinski [Wed, 5 Jul 2017 21:37:47 +0000 (21:37 +0000)]
Merge "Merge "Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours" into stage-aosp-master am:
a998cffb1b -s ours" into oc-dev-plus-aosp am:
530a622f60 -s ours
am:
9f27717e72 -s ours
Change-Id: Ice0e0dee03141da42d0dfb673fa0277ae0858a7c
Adam Lesinski [Wed, 5 Jul 2017 21:36:14 +0000 (21:36 +0000)]
Merge "Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours am:
1ebe18d691 -s ours" into oc-dev-plus-aosp am:
eb20c5a9f4 -s ours
am:
dad1aa3e11 -s ours
Change-Id: I090f28ba571ccca414b9e574b7a5e7476d519e69
Android Build Merger (Role) [Wed, 5 Jul 2017 21:31:02 +0000 (21:31 +0000)]
Merge "Merge "Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours am:
1ebe18d691 -s ours am:
8f09557150 -s ours" into oc-dr1-dev-plus-aosp am:
165f684a63 -s ours"
Android Build Merger (Role) [Wed, 5 Jul 2017 21:30:48 +0000 (21:30 +0000)]
Merge "Merge "Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours am:
1ebe18d691 -s ours am:
8f09557150 -s ours" into oc-dr1-dev-plus-aosp am:
165f684a63 -s ours"
Android Build Merger (Role) [Wed, 5 Jul 2017 21:30:03 +0000 (21:30 +0000)]
Merge "Merge "Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours am:
1ebe18d691 -s ours" into oc-dev-plus-aosp am:
eb20c5a9f4 -s ours" into oc-dr1-dev-plus-aosp
Adam Lesinski [Wed, 5 Jul 2017 21:29:45 +0000 (21:29 +0000)]
Merge "Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours am:
1ebe18d691 -s ours am:
8f09557150 -s ours" into oc-dr1-dev-plus-aosp
am:
165f684a63 -s ours
Change-Id: I3383043ac922082ac347e272e06e8872a4b3b9be
Adam Lesinski [Wed, 5 Jul 2017 21:29:41 +0000 (21:29 +0000)]
Merge "Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours am:
1ebe18d691 -s ours am:
8f09557150 -s ours" into oc-dr1-dev-plus-aosp
am:
165f684a63 -s ours
Change-Id: I79eeba15724d751cd4dcac88369fd7c10dec17c1
Android Build Merger (Role) [Wed, 5 Jul 2017 21:29:10 +0000 (21:29 +0000)]
Merge "Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours am:
1ebe18d691 -s ours am:
8f09557150 -s ours am:
036989452d -s ours"
Adam Lesinski [Wed, 5 Jul 2017 21:28:07 +0000 (21:28 +0000)]
Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours am:
1ebe18d691 -s ours am:
8f09557150 -s ours
am:
036989452d -s ours
Change-Id: Ibe1f9eb84a7bf9153728dc5e20f3ab55170af552
Adam Lesinski [Wed, 5 Jul 2017 21:28:03 +0000 (21:28 +0000)]
Merge "Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours am:
1ebe18d691 -s ours" into oc-dev-plus-aosp
am:
eb20c5a9f4 -s ours
Change-Id: I65561262aaf4c3b4eb0c8efe495fb1f59968301b
Adam Lesinski [Wed, 5 Jul 2017 21:27:49 +0000 (21:27 +0000)]
Merge "Merge "Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours" into stage-aosp-master am:
a998cffb1b -s ours" into oc-dev-plus-aosp
am:
530a622f60 -s ours
Change-Id: I0bf2d7461e65989758cb0575c1b1cb6ae238dd9f
Adam Lesinski [Wed, 5 Jul 2017 21:27:31 +0000 (21:27 +0000)]
Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours am:
1ebe18d691 -s ours am:
8f09557150 -s ours
am:
036989452d -s ours
Change-Id: Ife759ebe7c4849d597406bc5f9608cc8a344dc92
Adam Lesinski [Wed, 5 Jul 2017 21:26:38 +0000 (21:26 +0000)]
Merge "Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours am:
1ebe18d691 -s ours" into oc-dev-plus-aosp
am:
eb20c5a9f4 -s ours
Change-Id: I5e4e3d86918830bbc13d60ecd8a3392d55ff2726
Android Build Merger (Role) [Wed, 5 Jul 2017 21:24:07 +0000 (21:24 +0000)]
Merge "Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours am:
1ebe18d691 -s ours am:
8f09557150 -s ours" into oc-dr1-dev-plus-aosp
Adam Lesinski [Wed, 5 Jul 2017 21:23:09 +0000 (21:23 +0000)]
Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours am:
1ebe18d691 -s ours
am:
8f09557150 -s ours
Change-Id: I11fefbcbc4cef187dba5ba3fa4fa3265ab508490
Adam Lesinski [Wed, 5 Jul 2017 21:22:26 +0000 (21:22 +0000)]
Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours am:
1ebe18d691 -s ours
am:
8f09557150 -s ours
Change-Id: I238486086c8b806593e241a8c1a6f070fdcf060d
Android Build Merger (Role) [Wed, 5 Jul 2017 21:20:02 +0000 (21:20 +0000)]
Merge "Merge "Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours" into stage-aosp-master am:
a998cffb1b -s ours" into oc-dev-plus-aosp
Tomasz Wasilczyk [Wed, 5 Jul 2017 21:19:26 +0000 (21:19 +0000)]
Merge "RDS PI is a number, not a string."
Adam Lesinski [Wed, 5 Jul 2017 21:19:08 +0000 (21:19 +0000)]
Merge "Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours" into stage-aosp-master
am:
a998cffb1b -s ours
Change-Id: I15f2cf810bd0f2feb3117dbebe7f15daff281c1f
Android Build Merger (Role) [Wed, 5 Jul 2017 21:18:47 +0000 (21:18 +0000)]
Merge "Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours am:
1ebe18d691 -s ours" into oc-dev-plus-aosp
Adam Lesinski [Wed, 5 Jul 2017 21:17:50 +0000 (21:17 +0000)]
Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours
am:
1ebe18d691 -s ours
Change-Id: Idb9123f2913be7ac629c7822a846b6de849c638c
Adam Lesinski [Wed, 5 Jul 2017 21:16:55 +0000 (21:16 +0000)]
Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours
am:
1ebe18d691 -s ours
Change-Id: I407815d637dadf8416c8df715b533e2eb3edee2e
Android Build Merger (Role) [Wed, 5 Jul 2017 21:13:19 +0000 (21:13 +0000)]
Merge "Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6" am:
6fd0671265 -s ours" into stage-aosp-master
Adam Lesinski [Wed, 5 Jul 2017 21:12:22 +0000 (21:12 +0000)]
Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6"
am:
6fd0671265 -s ours
Change-Id: Icefbb67a8046a4bc57de5f69bcc32ab235371ddc
Adam Lesinski [Wed, 5 Jul 2017 21:11:36 +0000 (21:11 +0000)]
Merge "Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6"
am:
6fd0671265 -s ours
Change-Id: Ib9428106e209a77220e22f43210ecf0d946128ad
Android Build Merger (Role) [Wed, 5 Jul 2017 21:06:53 +0000 (21:06 +0000)]
Merge "Merge "Merge "Ensure all WindowStates are considered before determining all drawn." into oc-dr1-dev am:
e80ea58d60" into oc-dr1-dev-plus-aosp am:
9567cc35da"
Bryce Lee [Wed, 5 Jul 2017 21:06:02 +0000 (21:06 +0000)]
Merge "Merge "Ensure all WindowStates are considered before determining all drawn." into oc-dr1-dev am:
e80ea58d60" into oc-dr1-dev-plus-aosp
am:
9567cc35da
Change-Id: I25372e9957baec0104a08e56fc4580594a80e38f
Android Build Merger (Role) [Wed, 5 Jul 2017 21:05:38 +0000 (21:05 +0000)]
Merge "Merge "Ensure all WindowStates are considered before determining all drawn." into oc-dr1-dev am:
e80ea58d60 am:
cb1e54e94d"
Bryce Lee [Wed, 5 Jul 2017 21:04:43 +0000 (21:04 +0000)]
Merge "Ensure all WindowStates are considered before determining all drawn." into oc-dr1-dev am:
e80ea58d60
am:
cb1e54e94d
Change-Id: Idf844dffbbb2f1cb3e03d81f114dffebe28f905b
Android Build Merger (Role) [Wed, 5 Jul 2017 21:04:09 +0000 (21:04 +0000)]
Merge "Merge "Ensure all WindowStates are considered before determining all drawn." into oc-dr1-dev am:
e80ea58d60 am:
cb1e54e94d"
Bryce Lee [Wed, 5 Jul 2017 21:03:08 +0000 (21:03 +0000)]
Merge "Ensure all WindowStates are considered before determining all drawn." into oc-dr1-dev am:
e80ea58d60
am:
cb1e54e94d
Change-Id: I91cef465fd1c58deac4a1f8eae8a542b1ad8747c
TreeHugger Robot [Wed, 5 Jul 2017 21:02:44 +0000 (21:02 +0000)]
Merge "Expose TestApi needed by PermissionTests"
Treehugger Robot [Wed, 5 Jul 2017 21:01:29 +0000 (21:01 +0000)]
Android Build Merger (Role) [Wed, 5 Jul 2017 21:01:00 +0000 (21:01 +0000)]
Merge "Merge "Ensure all WindowStates are considered before determining all drawn." into oc-dr1-dev am:
e80ea58d60" into oc-dr1-dev-plus-aosp
Bryce Lee [Wed, 5 Jul 2017 20:59:59 +0000 (20:59 +0000)]
Merge "Ensure all WindowStates are considered before determining all drawn." into oc-dr1-dev
am:
e80ea58d60
Change-Id: I727bd81fb59f52cdffb10d3b22afbb3da04ecbfd
Bryce Lee [Wed, 5 Jul 2017 20:59:14 +0000 (20:59 +0000)]
Merge "Ensure all WindowStates are considered before determining all drawn." into oc-dr1-dev
am:
e80ea58d60
Change-Id: I5c9592e68a5d462feb136ea0638647bbc516b711
Bryce Lee [Wed, 5 Jul 2017 20:52:33 +0000 (20:52 +0000)]
Merge "Ensure all WindowStates are considered before determining all drawn." into oc-dr1-dev
TreeHugger Robot [Wed, 5 Jul 2017 20:33:14 +0000 (20:33 +0000)]
Merge "PDBS: add package check for getMaximumDataBlockSize()"
TreeHugger Robot [Wed, 5 Jul 2017 20:31:26 +0000 (20:31 +0000)]
Merge "Require READ_EXTERNAL_STORAGE to read wallpaper imagery"
TreeHugger Robot [Wed, 5 Jul 2017 20:04:01 +0000 (20:04 +0000)]
Merge "Script to run db perf tests"
TreeHugger Robot [Wed, 5 Jul 2017 19:58:04 +0000 (19:58 +0000)]
Merge "Avoid stale caching of print and companion system services"
TreeHugger Robot [Wed, 5 Jul 2017 19:06:57 +0000 (19:06 +0000)]
Merge "Create new permission READ_CONTENT_RATING_SYSTEMS"
Christopher Tate [Thu, 15 Jun 2017 21:48:41 +0000 (14:48 -0700)]
Require READ_EXTERNAL_STORAGE to read wallpaper imagery
We now require the READ_EXTERNAL_STORAGE permission for an app to
be allowed to read the system's wallpaper imagery. This is a
logged-but-benign no-op failure for apps targeting API levels up
through Android O, but a crashing failure (SecurityException) for
apps that target API levels newer than O.
Also, marked the permission-requiring parts of the formal API
with appropriate @RequiresPermission annotations.
Bug
30770233
Test: bit CtsPermissionTestCases:.NoWallpaperPermissionsTest
Change-Id: Id75181f05d05e5ca32f5fefcbe15dc81de264dff
Robin Lee [Wed, 5 Jul 2017 18:27:45 +0000 (18:27 +0000)]
Merge "Don't assume device has a status bar (TVs don't)"
Fyodor Kupolov [Wed, 5 Jul 2017 18:10:56 +0000 (11:10 -0700)]
Script to run db perf tests
Runs NewDatabasePerformanceTestSuite 5 times and outputs the summary
Test: sh frameworks/base/core/tests/coretests/src/android/database/run_newdb_perf_test.sh
Change-Id: Ibec41b2a546e9fd5a7f626e3d90c9f3060a98f1e
TreeHugger Robot [Wed, 5 Jul 2017 18:06:46 +0000 (18:06 +0000)]
Merge "Import translations. DO NOT MERGE"
Jason Monk [Wed, 5 Jul 2017 18:05:06 +0000 (18:05 +0000)]
Merge "Fix rounded corners fangs in RTL" into oc-dr1-dev am:
5c5f1f6419
am:
21dbabefe7
Change-Id: Idc20030dba8acb3869bff8dac63622327d889be8
Jason Monk [Wed, 5 Jul 2017 17:59:55 +0000 (17:59 +0000)]
Merge "Updates to brightness mirror to play with color extraction" into oc-dr1-dev am:
4cccea6b6a
am:
eafc0029ea
Change-Id: I75f4b42c017ae397706b7fe9a423da878b0db217
Selim Cinek [Wed, 5 Jul 2017 17:58:24 +0000 (17:58 +0000)]
Merge "Fixed the clear all animation on the locked shade" into oc-dr1-dev am:
890c430416
am:
003a65a79f
Change-Id: I6503fa5d6935a94dfacef12dd582bb71a3304d88
Selim Cinek [Wed, 5 Jul 2017 17:57:00 +0000 (17:57 +0000)]
Merge "Calling hideKeyguard more often, instead of caching it" into oc-dr1-dev am:
71e0a3758f
am:
9208057da2
Change-Id: Ic001802c968735f2ec4e624b02c4e9ced88f2fb2
Jason Monk [Wed, 5 Jul 2017 17:55:34 +0000 (17:55 +0000)]
Merge "Remove UI_MODE_CAR for QS because it isn't doing anything right now." into oc-dr1-dev am:
700cd6528b
am:
712bf2d40e -s ours
Change-Id: I9eaebab45a627433a7e0d600e0bb713557310453
Adam Lesinski [Fri, 28 Oct 2016 23:39:15 +0000 (16:39 -0700)]
Cherry-pick
7ad1110ecd6a840fcd2895c62668828a1ca029c6
Partial cherry-pick of commit
7ad1110ecd6a840fcd2895c62668828a1ca029c6.
Test: m
Merged-In: Id0e57ee828f17008891fe3741935a9be8830b01d
Change-Id: Id0e57ee828f17008891fe3741935a9be8830b01d
Jason Monk [Wed, 5 Jul 2017 17:51:37 +0000 (17:51 +0000)]
Merge "Fix rounded corners fangs in RTL" into oc-dr1-dev
am:
5c5f1f6419
Change-Id: Ib93c82921f7651db143355224231fe41db87137e
Jason Monk [Wed, 5 Jul 2017 17:50:11 +0000 (17:50 +0000)]
Merge "Updates to brightness mirror to play with color extraction" into oc-dr1-dev
am:
4cccea6b6a
Change-Id: I821c127ed06ecd858e6380ddc4019fcc17d7fc32
Selim Cinek [Wed, 5 Jul 2017 17:46:23 +0000 (17:46 +0000)]
Merge "Fixed the clear all animation on the locked shade" into oc-dr1-dev
am:
890c430416
Change-Id: Id19480f5051b3e96b2fea0e768af5fbaf3d746a8
Selim Cinek [Wed, 5 Jul 2017 17:44:52 +0000 (17:44 +0000)]
Merge "Calling hideKeyguard more often, instead of caching it" into oc-dr1-dev
am:
71e0a3758f
Change-Id: I2841b973d012ea3d0b2c4162f3930e3d48cebad1
Jason Monk [Wed, 5 Jul 2017 17:44:42 +0000 (17:44 +0000)]
Merge "Update power menu + dialog" into oc-dr1-dev am:
1e6b7d7b15
am:
c858cc7d8c
Change-Id: I6e69225684355d003cc4b53e47787fe64c7fb187
Jason Monk [Wed, 5 Jul 2017 17:43:31 +0000 (17:43 +0000)]
Merge "Remove UI_MODE_CAR for QS because it isn't doing anything right now." into oc-dr1-dev
am:
700cd6528b
Change-Id: I54c78e1d5db31174d4e9ed9480a233e09470f815
TreeHugger Robot [Wed, 5 Jul 2017 17:41:33 +0000 (17:41 +0000)]
Merge "Fix rounded corners fangs in RTL" into oc-dr1-dev
TreeHugger Robot [Wed, 5 Jul 2017 17:40:20 +0000 (17:40 +0000)]
Merge "Adding "Mobile data" and "Data usage" button in mobile settings."
TreeHugger Robot [Wed, 5 Jul 2017 17:39:13 +0000 (17:39 +0000)]
Merge "Updates to brightness mirror to play with color extraction" into oc-dr1-dev
TreeHugger Robot [Wed, 5 Jul 2017 17:36:41 +0000 (17:36 +0000)]
Merge "Fixed the clear all animation on the locked shade" into oc-dr1-dev
Jason Monk [Wed, 5 Jul 2017 17:36:13 +0000 (17:36 +0000)]
Merge "Update power menu + dialog" into oc-dr1-dev
am:
1e6b7d7b15
Change-Id: I2a56a751b123213e53ce4124129634a916804e04
TreeHugger Robot [Wed, 5 Jul 2017 17:35:47 +0000 (17:35 +0000)]
Merge "Calling hideKeyguard more often, instead of caching it" into oc-dr1-dev
Jason Monk [Wed, 5 Jul 2017 17:28:20 +0000 (17:28 +0000)]
Merge "Remove UI_MODE_CAR for QS because it isn't doing anything right now." into oc-dr1-dev
Jason Monk [Wed, 5 Jul 2017 17:25:20 +0000 (13:25 -0400)]
resolve merge conflicts of
3b7bac537d0b to master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I8233ff863d207d669a32034d49e02036987def95
TreeHugger Robot [Wed, 5 Jul 2017 17:24:39 +0000 (17:24 +0000)]
Merge "Update power menu + dialog" into oc-dr1-dev
Andrew Sapperstein [Wed, 5 Jul 2017 17:10:07 +0000 (17:10 +0000)]
Merge "Use SystemUiContext for immersive mode cling." into oc-dr1-dev am:
2cbe6aa96b
am:
016be7dc01
Change-Id: I26abb7ac25f3d738871f7d5b2345620af467d04c
Jason Monk [Wed, 5 Jul 2017 17:10:02 +0000 (17:10 +0000)]
Merge "Tiny visual tweaks to QS" into oc-dr1-dev
am:
96decad236
Change-Id: Ida1b05a34017489078d22729830768a39053d970
Jason Monk [Wed, 5 Jul 2017 17:04:48 +0000 (17:04 +0000)]
Merge "Tiny visual tweaks to QS" into oc-dr1-dev
Andrew Sapperstein [Wed, 5 Jul 2017 17:03:38 +0000 (17:03 +0000)]
Merge "Use SystemUiContext for immersive mode cling." into oc-dr1-dev
am:
2cbe6aa96b
Change-Id: Ida3b992b69beceff700e67ceea075663720c6904
Andrew Sapperstein [Wed, 5 Jul 2017 16:56:57 +0000 (16:56 +0000)]
Merge "Use SystemUiContext for immersive mode cling." into oc-dr1-dev
Lucas Dupin [Wed, 5 Jul 2017 16:22:35 +0000 (16:22 +0000)]
Merge "Dark text support on Recents" into oc-dr1-dev am:
b47e8caca5
am:
b0687a0ba4
Change-Id: I806036bc0550de48754bb6695fe1b573c7e685b8
Lucas Dupin [Wed, 5 Jul 2017 16:15:33 +0000 (16:15 +0000)]
Merge "Dark text support on Recents" into oc-dr1-dev
am:
b47e8caca5
Change-Id: Icae922c5c0653906cc44c1fd00d17eb5c34f754c
Lucas Dupin [Wed, 5 Jul 2017 16:09:49 +0000 (16:09 +0000)]
Merge "Dark text support on Recents" into oc-dr1-dev
Jason Monk [Wed, 5 Jul 2017 15:30:27 +0000 (11:30 -0400)]
Fix rounded corners fangs in RTL
Test: visual in RTL
Change-Id: I918a4de6c3f504d6aa280ca440625273dcbf5a02
Fixes:
62487402
Jason Monk [Wed, 5 Jul 2017 15:10:27 +0000 (11:10 -0400)]
Updates to brightness mirror to play with color extraction
Test: visual
Change-Id: Idfd86fc06b2dab183463963fd4ce32e9a27bf286
Fixes:
63124649
Jason Monk [Wed, 5 Jul 2017 15:15:59 +0000 (11:15 -0400)]
Remove UI_MODE_CAR for QS because it isn't doing anything right now.
Test: make
Fixes:
62597341
Change-Id: I9923982bfefc2604c176eb514d7053b701a09a63
Erik Kline [Wed, 5 Jul 2017 15:11:24 +0000 (15:11 +0000)]
Better logging infrastructure in OffloadHardwareInterface am:
248e736f11
am:
70bdcffbd9
Change-Id: I3b178f4bb798d9ac59b366723d19e3189d39942e
Erik Kline [Wed, 5 Jul 2017 15:04:23 +0000 (15:04 +0000)]
Better logging infrastructure in OffloadHardwareInterface
am:
248e736f11
Change-Id: I1b64e562c74797cbfaa26f3a1b5e38c3bf2a0c0d
Hugo Benichi [Wed, 5 Jul 2017 14:54:05 +0000 (14:54 +0000)]
Merge "ConnectivityManager: allow usage of TYPE_NONE" am:
279f32ded5 am:
0537f16516 am:
0278aa4b70
am:
f060ecf1e8
Change-Id: I1e005686a1de5f2154fbc614ea52ce1a3ff5fc81
Hugo Benichi [Wed, 5 Jul 2017 14:47:56 +0000 (14:47 +0000)]
Merge "ConnectivityManager: allow usage of TYPE_NONE" am:
279f32ded5 am:
0537f16516
am:
0278aa4b70
Change-Id: I1707e39308b0cf425b75e1e3f85323743c252c2f
Hugo Benichi [Wed, 5 Jul 2017 14:40:34 +0000 (14:40 +0000)]
Merge "ConnectivityManager: allow usage of TYPE_NONE" am:
279f32ded5
am:
0537f16516
Change-Id: If6430976a3a894b9f883e03692e500eb013a5245
Hugo Benichi [Wed, 5 Jul 2017 14:40:30 +0000 (14:40 +0000)]
Merge "ConnectivityServiceTest: more informative assert failures" am:
04d8a730a9 am:
0a7f5cc9d6 am:
14f400ca81
am:
89c67d3211
Change-Id: Icafd27e8273aa6b6595c30affd23a960e5d55c53
Hugo Benichi [Wed, 5 Jul 2017 14:33:35 +0000 (14:33 +0000)]
Merge "ConnectivityManager: allow usage of TYPE_NONE"
am:
279f32ded5
Change-Id: I72dbd17db63bd7b8637e82f5cdcfec3bf1482962
Hugo Benichi [Wed, 5 Jul 2017 14:33:34 +0000 (14:33 +0000)]
Merge "ConnectivityServiceTest: more informative assert failures" am:
04d8a730a9 am:
0a7f5cc9d6
am:
14f400ca81
Change-Id: If00f0fd750d54074c0c642465384446502c1deec
Jason Monk [Wed, 5 Jul 2017 14:26:57 +0000 (10:26 -0400)]
Tiny visual tweaks to QS
Test: visual
Change-Id: If032b940ee8726a2027552da68c46a952d01375c
Fixes:
38199857
Hugo Benichi [Wed, 5 Jul 2017 14:26:23 +0000 (14:26 +0000)]
Merge "ConnectivityServiceTest: more informative assert failures" am:
04d8a730a9
am:
0a7f5cc9d6
Change-Id: If152d2eb134f678673b76b181146874bf65fc536
Treehugger Robot [Wed, 5 Jul 2017 14:21:35 +0000 (14:21 +0000)]
Merge "ConnectivityManager: allow usage of TYPE_NONE"
Hugo Benichi [Wed, 5 Jul 2017 14:19:33 +0000 (14:19 +0000)]
Merge "ConnectivityServiceTest: more informative assert failures"
am:
04d8a730a9
Change-Id: Iaa55014ae4c2f4927059735c349c40ada836b79b
Treehugger Robot [Wed, 5 Jul 2017 14:07:37 +0000 (14:07 +0000)]
Merge "ConnectivityServiceTest: more informative assert failures"
Jason Monk [Thu, 29 Jun 2017 23:37:48 +0000 (19:37 -0400)]
Update power menu + dialog
- Update power menu to handle seascape properly
- Update shutting down dialog, the gradient is covered by the
global actions dialog not going away completely, everything else
is still in ShutdownThread.
Test: visual
Change-Id: I06a2fdd2652bf006dc5c0b45e3bc922e43093301
Fixes:
62391660
Hugo Benichi [Wed, 5 Jul 2017 12:56:08 +0000 (12:56 +0000)]
Merge "ConnectivityServiceTest: eliminate remaining sleep()" am:
66788dc4d8 am:
2d452e6c48 am:
80bc56bf2a
am:
7ee7b4c6d4
Change-Id: I9b1c77bd8d0710736f1f29b204acc3a162e833fb
Hugo Benichi [Wed, 5 Jul 2017 12:49:04 +0000 (12:49 +0000)]
Merge "ConnectivityServiceTest: eliminate remaining sleep()" am:
66788dc4d8 am:
2d452e6c48
am:
80bc56bf2a
Change-Id: I5e33e909cd8887460c2641c069432ec6bfa5beda
Hugo Benichi [Wed, 5 Jul 2017 12:41:53 +0000 (12:41 +0000)]
Merge "ConnectivityServiceTest: eliminate remaining sleep()" am:
66788dc4d8
am:
2d452e6c48
Change-Id: I6426659d9cf84f7e1d142b006ffe69df304f7a91
Hugo Benichi [Wed, 5 Jul 2017 12:35:01 +0000 (12:35 +0000)]
Merge "ConnectivityServiceTest: eliminate remaining sleep()"
am:
66788dc4d8
Change-Id: Ib1e31c2b8999d07b20ef4cef8e70d851f93df6e5
Hugo Benichi [Tue, 20 Jun 2017 05:07:59 +0000 (14:07 +0900)]
ConnectivityManager: allow usage of TYPE_NONE
This patch allows to use TYPE_NONE for the legacy network type variable
of NetworkInfo. This usage is "safe" with respect to legacy APIs using
network types as most of them already returns null or do nothing for
TYPE_NONE.
Of the existing APIs in ConnectivityManager that accept a network type
argument, those which were already returning null or doing nothing for
TYPE_NONE are:
getNetworkInfo(int)
getNetworkForType(int)
stopUsingNetworkFeature(int, String)
networkCapabilitiesForType(int)
requestRouteToHostAddress(int, InetAddress)
reportInetCondition(int, int)
isNetworkSupported(int)
getLinkProperties(int)
Only setProvisioningNotificationVisible needs an additional guard
against TYPE_NONE.
Bug:
30088447
Bug:
62844794
Test: runtest frameworks-net
Change-Id: I112596fcd03d3c2cd42a2a84d265adb38e3944bb
Hugo Benichi [Mon, 26 Jun 2017 01:06:49 +0000 (10:06 +0900)]
ConnectivityServiceTest: more informative assert failures
Bug:
62918393
Test: runtest frameworks-net
Change-Id: If87315ef7cba6380596f48b92c7e0f6eeccc8368
Hugo Benichi [Wed, 5 Jul 2017 12:25:16 +0000 (12:25 +0000)]
Merge "ConnectivityServiceTest: eliminate remaining sleep()"
OSDN Git Service
