OSDN Git Service
Jason Monk [Thu, 13 Apr 2017 19:46:47 +0000 (19:46 +0000)]
Merge "Update mobile data icon" into oc-dev
am:
99856429db
Change-Id: I1cb5f4e16f3832ff304894fac43eced6decd020d
Chris Tate [Thu, 13 Apr 2017 19:45:30 +0000 (19:45 +0000)]
Merge "Introduce PACKAGE_FIRST_ADDED broadcast" into oc-dev
am:
117ac766a9
Change-Id: I9bec0f90873a5bcb9ff89eadcf7e334e9f0afb89
Seigo Nonaka [Thu, 13 Apr 2017 19:38:09 +0000 (19:38 +0000)]
Merge "Introduce setFallbackTypeface" into oc-dev
am:
729a515e5e
Change-Id: I3e88a1d51b8a8be7f932964917218a28ae23c5c9
TreeHugger Robot [Thu, 13 Apr 2017 19:37:31 +0000 (19:37 +0000)]
Merge "Update mobile data icon" into oc-dev
Yu Liu [Thu, 13 Apr 2017 19:34:48 +0000 (19:34 +0000)]
Merge "Fix some issues came up from the reviews of the newly added APIs Test: Existing unit tests still pass. BUG:
36554361 Change-Id: I6c2dab2e0df7f8578f92c70907f45aa69909892c" into oc-dev
am:
e425b366ba
Change-Id: I371260b7a82bbda02f978c2396385c96fd03ec66
Chris Tate [Thu, 13 Apr 2017 19:24:08 +0000 (19:24 +0000)]
Merge "Introduce PACKAGE_FIRST_ADDED broadcast" into oc-dev
TreeHugger Robot [Thu, 13 Apr 2017 19:21:21 +0000 (19:21 +0000)]
Merge "Introduce setFallbackTypeface" into oc-dev
Yu Liu [Thu, 13 Apr 2017 19:20:58 +0000 (19:20 +0000)]
Merge "Fix some issues came up from the reviews of the newly added APIs Test: Existing unit tests still pass. BUG:
36554361 Change-Id: I6c2dab2e0df7f8578f92c70907f45aa69909892c" into oc-dev
Daniel Sandler [Thu, 13 Apr 2017 19:16:13 +0000 (19:16 +0000)]
Merge "Quick fix to lockscreen text color." into oc-dev
am:
f06c2a01a5
Change-Id: If3ec3b915bb2defe9999b323bf7f7ce2c55ff7be
Daniel Sandler [Thu, 13 Apr 2017 19:06:24 +0000 (19:06 +0000)]
Merge "Quick fix to lockscreen text color." into oc-dev
Dan Sandler [Thu, 13 Apr 2017 18:38:40 +0000 (14:38 -0400)]
Quick fix to lockscreen text color.
Bug:
37299706
Test: visual
Change-Id: Ide48186f0f1cb4a50c77b45ae8b80a79781d7b0d
Daniel Nishi [Thu, 13 Apr 2017 18:44:53 +0000 (18:44 +0000)]
Merge changes from topic 'cp-movies' into oc-dev
am:
ff97ea2eef
Change-Id: Ife4f6fb260439003a46e6510af41f8bb6c542cb7
Daniel Nishi [Thu, 13 Apr 2017 18:39:53 +0000 (18:39 +0000)]
Merge changes from topic 'cp-movies' into oc-dev
* changes:
Use the real filters when determining Other Apps.
Add support for movies & tv apps querying.
Roozbeh Pournader [Thu, 13 Apr 2017 18:33:57 +0000 (18:33 +0000)]
Merge "Switch i18n listeners to use IME hint locales" into oc-dev
am:
da97b66f41
Change-Id: I9db037d0566c35c12aaed5e3f509498ca498b34f
Chris Wren [Thu, 13 Apr 2017 18:31:49 +0000 (18:31 +0000)]
Merge "don't interpret milliseconds as nanoseconds" into oc-dev
am:
de12503268
Change-Id: I51eb680e3e966577e30647b6529e900894da60c4
Steve McKay [Thu, 13 Apr 2017 18:26:43 +0000 (18:26 +0000)]
Merge "Remove support for auto-paging of cursors." into oc-dev
am:
7f0d8c8076
Change-Id: Ice100c419ce6d53721d6bbec1147bb1cc1bb7b4d
TreeHugger Robot [Thu, 13 Apr 2017 18:23:01 +0000 (18:23 +0000)]
Merge "Switch i18n listeners to use IME hint locales" into oc-dev
Daichi Hirono [Thu, 13 Apr 2017 18:21:18 +0000 (18:21 +0000)]
Merge "Address API review for ProxyFileDescriptorCallback" into oc-dev
am:
73b54bfd6d
Change-Id: I5969b9ec58b1d9d9baf3f9a9e4bd87678416e469
TreeHugger Robot [Thu, 13 Apr 2017 18:18:23 +0000 (18:18 +0000)]
Merge "don't interpret milliseconds as nanoseconds" into oc-dev
TreeHugger Robot [Thu, 13 Apr 2017 18:12:08 +0000 (18:12 +0000)]
Merge "Remove support for auto-paging of cursors." into oc-dev
TreeHugger Robot [Thu, 13 Apr 2017 18:11:45 +0000 (18:11 +0000)]
Merge "Address API review for ProxyFileDescriptorCallback" into oc-dev
Andrew Solovay [Thu, 13 Apr 2017 17:57:51 +0000 (17:57 +0000)]
Merge "doc: Add note to Context.bindService()" into oc-dev
am:
2c63aa3be7
Change-Id: I35b4a37abc8573340811a0ca5f9fd479ae5f20e3
Andrew Solovay [Thu, 13 Apr 2017 17:46:13 +0000 (17:46 +0000)]
Merge "doc: Add note to Context.bindService()" into oc-dev
Dave Friedman [Thu, 13 Apr 2017 17:43:44 +0000 (17:43 +0000)]
Merge "Docs: Fixes broken link in Javadoc. am:
df0fd34d50 am:
506a8b39fb am:
4eff74f8cb am:
2d642f9e2d am:
f125662db1" into oc-dev
am:
46802905f5
Change-Id: Idedbe69b858c4d77a610d68bfad47cd58eec9754
Matt Sarett [Thu, 13 Apr 2017 17:42:16 +0000 (17:42 +0000)]
Merge "Add SkiaCanvas::captureCanvasState()" into oc-dev
am:
59fa17a9d4
Change-Id: I434b6f2d5e26c1a0f09792ce0c22c34034ca5514
Jeremy Joslin [Thu, 13 Apr 2017 17:41:06 +0000 (17:41 +0000)]
Merge "Always call unbind." into oc-dev
am:
f726b4aa9a
Change-Id: If6fafdd633bb3c9120f00818de5f97ae2cfd7735
Seigo Nonaka [Thu, 13 Apr 2017 17:40:02 +0000 (17:40 +0000)]
Merge "Introduce FontsContract.requestFont and deprecate Typeface.create" into oc-dev
am:
d09be1c0e9
Change-Id: I51f68dc5b1453ca4ac700ca68976efd412812eae
Sudheer Shanka [Thu, 13 Apr 2017 17:38:59 +0000 (17:38 +0000)]
Merge "Fix the issue of voice interactor getting reset after reboot." into oc-dev
am:
c59a2a7649
Change-Id: I5676e0f3927f2de123e9d5d219bd10a881754583
Sundeep Ghuman [Thu, 13 Apr 2017 17:37:57 +0000 (17:37 +0000)]
Merge "Listen to RSSI_CHANGED_ACTION broadcasts in WifiTracker." into oc-dev
am:
56fcd408e6
Change-Id: If4d14ff4f69b86af16e65736b32e3e01d06eeaf5
Dave Friedman [Thu, 13 Apr 2017 17:33:56 +0000 (17:33 +0000)]
Docs: Fixes broken link in Javadoc. am:
df0fd34d50 am:
506a8b39fb am:
4eff74f8cb am:
2d642f9e2d am:
f125662db1
am:
27aeab9763
Change-Id: I0879ba9238602a3af19cdc91c5ae8762d8776c4d
Android Build Merger (Role) [Thu, 13 Apr 2017 17:29:09 +0000 (17:29 +0000)]
Merge "Docs: Fixes broken link in Javadoc. am:
df0fd34d50 am:
506a8b39fb am:
4eff74f8cb am:
2d642f9e2d am:
f125662db1" into oc-dev
Matt Sarett [Thu, 13 Apr 2017 17:28:55 +0000 (17:28 +0000)]
Merge "Add SkiaCanvas::captureCanvasState()" into oc-dev
TreeHugger Robot [Thu, 13 Apr 2017 17:28:47 +0000 (17:28 +0000)]
Merge "Always call unbind." into oc-dev
Dave Friedman [Thu, 13 Apr 2017 17:28:34 +0000 (17:28 +0000)]
Docs: Fixes broken link in Javadoc. am:
df0fd34d50 am:
506a8b39fb am:
4eff74f8cb am:
2d642f9e2d
am:
f125662db1
Change-Id: I5220c1ef4ac51e876c3461b64e2a3dd54c9e2b48
Dave Friedman [Thu, 13 Apr 2017 17:28:18 +0000 (17:28 +0000)]
Docs: Fixes broken link in Javadoc. am:
df0fd34d50 am:
506a8b39fb am:
4eff74f8cb am:
2d642f9e2d
am:
f125662db1
Change-Id: Ic69e95f68255e5e0bea646cdce2c56881586d24d
Julia Reynolds [Thu, 13 Apr 2017 17:23:39 +0000 (17:23 +0000)]
Merge "Allow notification channels to be silent." into oc-dev
am:
d178ec489f
Change-Id: I9e016e2523b9da200c26df2ddce642942bc0b806
Hyunyoung Song [Thu, 13 Apr 2017 17:20:50 +0000 (17:20 +0000)]
Merge "Update API, add more documentation on AdaptiveIconDrawable" into oc-dev
am:
76c13a5fce
Change-Id: I060797416983056208f21c099ba21fdc8409103a
Dave Friedman [Thu, 13 Apr 2017 17:19:36 +0000 (17:19 +0000)]
Docs: Fixes broken link in Javadoc. am:
df0fd34d50 am:
506a8b39fb am:
4eff74f8cb
am:
2d642f9e2d
Change-Id: I5257f51a37e6e45a928befea94b2ecdb0cf01f45
TreeHugger Robot [Thu, 13 Apr 2017 17:13:31 +0000 (17:13 +0000)]
Merge "Introduce FontsContract.requestFont and deprecate Typeface.create" into oc-dev
Jason Monk [Thu, 13 Apr 2017 17:13:19 +0000 (13:13 -0400)]
Update mobile data icon
Test: visual
Change-Id: I21be005b0f4c4371b616377be77025412c2b58e6
Fixes:
35996345
Seigo Nonaka [Fri, 31 Mar 2017 21:30:05 +0000 (14:30 -0700)]
Introduce setFallbackTypeface
setFallbackTypeface is returned by Builder.build() method when the
provided font is not loaded due to some reasons.
The fallback family is resolved with width/italic passed to Builder.
Bug:
36794225
Test: android.graphics.cts.TypefaceTest passes
Change-Id: I65e220aca823fd815a52437b11c8e6dc952de8e2
Martijn Coenen [Thu, 13 Apr 2017 17:12:12 +0000 (17:12 +0000)]
Merge "Add persistentFeature application attribute." into oc-dev
am:
e4960cf495
Change-Id: Idf9355d092efa1ffb7eacd9299e3a8471396d3d6
Sudheer Shanka [Thu, 13 Apr 2017 17:09:55 +0000 (17:09 +0000)]
Merge "Fix the issue of voice interactor getting reset after reboot." into oc-dev
TreeHugger Robot [Thu, 13 Apr 2017 17:08:00 +0000 (17:08 +0000)]
Merge "Listen to RSSI_CHANGED_ACTION broadcasts in WifiTracker." into oc-dev
Julia Reynolds [Thu, 13 Apr 2017 17:07:41 +0000 (17:07 +0000)]
Merge "Allow notification channels to be silent." into oc-dev
Dave Friedman [Thu, 13 Apr 2017 17:06:11 +0000 (17:06 +0000)]
Docs: Fixes broken link in Javadoc. am:
df0fd34d50 am:
506a8b39fb
am:
4eff74f8cb
Change-Id: Id237b5c6ead732111feb29e1dc0dcd8a444366ee
Lucas Dupin [Thu, 13 Apr 2017 17:05:09 +0000 (17:05 +0000)]
Merge "Add transfer mode support to ShapeDrawable" into oc-dev
am:
498a44f33a
Change-Id: I09e0f8bbbd8b8ba0123eea3ae5958d453321007c
Julia Reynolds [Thu, 13 Apr 2017 17:01:26 +0000 (17:01 +0000)]
Merge "Companion device mgr doesn't always exist" into oc-dev
am:
3d6225b4e2
Change-Id: I10420e5cf8fdb6359c8191d0626cd71ecab395aa
Dave Friedman [Thu, 13 Apr 2017 17:00:44 +0000 (17:00 +0000)]
Docs: Fixes broken link in Javadoc. am:
df0fd34d50
am:
506a8b39fb
Change-Id: If60b7db71fe92508daaec1255c637927432d7b55
Hyunyoung Song [Thu, 13 Apr 2017 16:53:37 +0000 (16:53 +0000)]
Merge "Update API, add more documentation on AdaptiveIconDrawable" into oc-dev
Martijn Coenen [Thu, 13 Apr 2017 16:53:18 +0000 (16:53 +0000)]
Merge "Add persistentFeature application attribute." into oc-dev
Lucas Dupin [Thu, 13 Apr 2017 16:51:58 +0000 (16:51 +0000)]
Merge "Add transfer mode support to ShapeDrawable" into oc-dev
TreeHugger Robot [Thu, 13 Apr 2017 16:50:47 +0000 (16:50 +0000)]
Merge "Companion device mgr doesn't always exist" into oc-dev
Dave Friedman [Thu, 13 Apr 2017 16:48:41 +0000 (16:48 +0000)]
Docs: Fixes broken link in Javadoc.
am:
df0fd34d50
Change-Id: I76ed5361426065d5e532c5a11c2d11f28ba8c2d7
Winson Chung [Thu, 13 Apr 2017 16:13:30 +0000 (16:13 +0000)]
Merge "Fix issue with non-focusable PiP activities being resumed." into oc-dev
am:
68cf1b8848
Change-Id: I7d20aeebb7e1a1e6485cc22a8e18ca3c4ab35c3d
Bill Yi [Thu, 13 Apr 2017 16:12:29 +0000 (16:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
05c71b3bbe -s ours
Change-Id: Id75778a6260e4cf090b4dd574654ff1e9e20ce93
Winson Chung [Thu, 13 Apr 2017 16:01:48 +0000 (16:01 +0000)]
Merge "Fix issue with non-focusable PiP activities being resumed." into oc-dev
Bill Yi [Thu, 13 Apr 2017 15:55:30 +0000 (15:55 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
2f522fc904 -s ours
Change-Id: I38570abe304599739f9e4dd8c450f9ae0b25a7d4
TreeHugger Robot [Thu, 13 Apr 2017 15:54:59 +0000 (15:54 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Thu, 13 Apr 2017 15:42:26 +0000 (15:42 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Thu, 13 Apr 2017 15:39:27 +0000 (15:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
023c36f89f -s ours
Change-Id: I4c1239ade7c3d827cbf6f209ef0375ab5420a9e1
Bill Yi [Thu, 13 Apr 2017 15:38:21 +0000 (15:38 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
9e8fa5ec61 -s ours
Change-Id: I0bb86e97bf9e1dbe7aa0de9ba4bde9e72bce7440
Hugo Benichi [Thu, 13 Apr 2017 15:37:10 +0000 (15:37 +0000)]
Merge changes I33ac2b52,I5ab8bb11 into oc-dev
am:
7270534ac4 -s ours
Change-Id: I98536197e3c4096badcc197ffac7b72836ac00dd
TreeHugger Robot [Thu, 13 Apr 2017 15:27:22 +0000 (15:27 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Thu, 13 Apr 2017 15:26:24 +0000 (15:26 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Thu, 13 Apr 2017 15:26:00 +0000 (15:26 +0000)]
Merge changes I33ac2b52,I5ab8bb11 into oc-dev
* changes:
Captive portal: fix probe urls at network creation
NetworkMonitor: improve captive portal validation logs
Julia Reynolds [Thu, 13 Apr 2017 15:19:09 +0000 (15:19 +0000)]
Only foreground notis should be sorted higher
am:
889280c4c3
Change-Id: I755fc0766540a8e836fcd98901c87e4d1ee335c1
Matt Sarett [Thu, 13 Apr 2017 13:33:18 +0000 (09:33 -0400)]
Add SkiaCanvas::captureCanvasState()
Test: Verified bug is fixed. Wrote unit test.
Bug:
37268771
Change-Id: I9deb7db353cd2129ad245e7f65419670463bb717
Julia Reynolds [Thu, 13 Apr 2017 14:54:01 +0000 (10:54 -0400)]
Companion device mgr doesn't always exist
E.g. on tvs.
Test: runtest systemui-notification
Change-Id: I1f1fd3cc5d361d3854eef5e5726816b50f5d7eb6
Fixes:
37276184
Julia Reynolds [Wed, 12 Apr 2017 17:27:58 +0000 (13:27 -0400)]
Allow notification channels to be silent.
This better accomodates those apps that play their own sounds.
Since most apps don't play their own sounds, update the documentation
on notificationchannel to add guidance about when they should add a
sound.
Fixes:
37237013
Test: runtest systemui-notification
Change-Id: If00b15b1b44da66d24dacb2895e9a6c0a06d1890
Julia Reynolds [Wed, 12 Apr 2017 16:27:00 +0000 (12:27 -0400)]
Only foreground notis should be sorted higher
Having the ongoing flag is not enough.
Test: runtest systemui-notification
Change-Id: I8a6c15af819f2bb4ad3937ae45d33361663fbe13
Niels Egberts [Thu, 13 Apr 2017 14:54:59 +0000 (14:54 +0000)]
Merge "Document examples where a developer might use the APIs." into oc-dev
am:
3a543a1bd2
Change-Id: I2c9e5961381e8b7dc1e46b96c704a52ec430e80e
Dianne Hackborn [Thu, 13 Apr 2017 14:42:33 +0000 (14:42 +0000)]
Merge "Debugging issue #
37272284: ActivityManager: SELinux tag not defined" into oc-dev
am:
809f4cf121
Change-Id: I56946e9a2868ea232a02fa2c4919d33c9d0647c0
TreeHugger Robot [Thu, 13 Apr 2017 14:41:55 +0000 (14:41 +0000)]
Merge "Document examples where a developer might use the APIs." into oc-dev
TreeHugger Robot [Thu, 13 Apr 2017 14:32:37 +0000 (14:32 +0000)]
Merge "Debugging issue #
37272284: ActivityManager: SELinux tag not defined" into oc-dev
Hugo Benichi [Thu, 13 Apr 2017 13:52:21 +0000 (13:52 +0000)]
Merge "Revert "Captive portal: rotate fallback urls"" am:
9ea45b6106 am:
4d47eba86a
am:
4d47a6a26b
Change-Id: Ib4dd12ee716fbc06e1fbfbb2e0445836b1e7c475
Seigo Nonaka [Tue, 11 Apr 2017 22:59:58 +0000 (15:59 -0700)]
Introduce FontsContract.requestFont and deprecate Typeface.create
Since background fetch should be synchronized with life cycle of
Activities, so should not create new background thread inside this
method. Not to break existing apps, mark as deprecated and will be
removed from public API untile next release.
New API accepts Handler so that the developer can pass their own thread
.
Test: TBD
Bug:
37253785
Change-Id: I87fdc6a354a829db679253824f42489f25698fa0
Orion Hodson [Thu, 13 Apr 2017 13:46:57 +0000 (13:46 +0000)]
Merge "Unhide MethodHandles.explicitCastArguments()" am:
891cab55d3 am:
0f7294af11
am:
2d5f14e578
Change-Id: I9b7a384143ec2dfe3ee55d3949843797f1325d7f
Hugo Benichi [Thu, 13 Apr 2017 13:46:32 +0000 (13:46 +0000)]
Merge "Revert "Captive portal: rotate fallback urls"" am:
9ea45b6106
am:
4d47eba86a
Change-Id: Ic2e927bec210f65a0de6face224ce0b8d227b0bc
Orion Hodson [Thu, 13 Apr 2017 13:40:32 +0000 (13:40 +0000)]
Merge "Unhide MethodHandles.explicitCastArguments()" am:
891cab55d3
am:
0f7294af11
Change-Id: Ib22190f899dfe6c1440fd70725958f1a767674ae
Hugo Benichi [Thu, 13 Apr 2017 13:40:04 +0000 (13:40 +0000)]
Merge "Revert "Captive portal: rotate fallback urls""
am:
9ea45b6106
Change-Id: Iea6582b4c7f347c24ebccf815256dd7125ab29de
Orion Hodson [Thu, 13 Apr 2017 13:34:27 +0000 (13:34 +0000)]
Merge "Unhide MethodHandles.explicitCastArguments()"
am:
891cab55d3
Change-Id: I6406a01c50df40a59e3af5432c1f31309cdb43e5
Seigo Nonaka [Thu, 13 Apr 2017 13:27:57 +0000 (13:27 +0000)]
Merge "Introduce FontsContract.fetchFonts and expose URI for watching." into oc-dev
am:
061db23b79
Change-Id: I7a7d47db8dedd6f75d4884d635cbfcf15949ac43
Hugo Benichi [Thu, 13 Apr 2017 13:25:40 +0000 (13:25 +0000)]
Merge "Revert "Captive portal: rotate fallback urls""
Treehugger Robot [Thu, 13 Apr 2017 13:25:10 +0000 (13:25 +0000)]
Merge "Unhide MethodHandles.explicitCastArguments()"
TreeHugger Robot [Thu, 13 Apr 2017 13:22:06 +0000 (13:22 +0000)]
Merge "Introduce FontsContract.fetchFonts and expose URI for watching." into oc-dev
Niels Egberts [Wed, 12 Apr 2017 14:03:10 +0000 (15:03 +0100)]
Document examples where a developer might use the APIs.
Test: mmma frameworks/base/
Bug:
35767714
Change-Id: I845db36869b84a18e79d7fe28f10031cfe836617
Hugo Benichi [Thu, 13 Apr 2017 12:43:49 +0000 (12:43 +0000)]
Revert "Captive portal: rotate fallback urls"
After discussion in the cl we agreed to use "|" as a separator. However String.split() input arg is a regex and not a literal string, so that "|" will actually split the urls characters per characters.
Will revert and resubmit with a comma.
This reverts commit
0908daaaf00e6b56ebed0a0fce9c3e3fe183a06b.
Change-Id: Ifab25e41bec806fbc1d2c13ffd81d4ad91598c89
Tony Mak [Thu, 13 Apr 2017 12:36:35 +0000 (12:36 +0000)]
Merge "Add hidden API startActivityForResultAsUser" into oc-dev
am:
bb14fb9acb
Change-Id: Iad4f51ffb4cdfaef1aeb312f92284cfad309b978
TreeHugger Robot [Thu, 13 Apr 2017 12:13:00 +0000 (12:13 +0000)]
Merge "Add hidden API startActivityForResultAsUser" into oc-dev
Bill Yi [Thu, 13 Apr 2017 11:43:14 +0000 (04:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iaf188ae0fe780b83f7caa70e8221126d1ffed110
Auto-generated-cl: translation import
Hugo Benichi [Thu, 13 Apr 2017 10:10:27 +0000 (10:10 +0000)]
Merge changes Ia15f77e2,Icaa1f95c am:
c923752929 am:
8e5ebd9261
am:
b98eee1f78
Change-Id: I124e328fb64b03eac6808865bf02af8d7dd939cc
Hugo Benichi [Thu, 13 Apr 2017 09:40:19 +0000 (09:40 +0000)]
Merge changes Ia15f77e2,Icaa1f95c am:
c923752929
am:
8e5ebd9261
Change-Id: Idf1f5091144d93f88684df50fd38593400b0e23e
Hugo Benichi [Thu, 13 Apr 2017 09:34:22 +0000 (09:34 +0000)]
Merge changes Ia15f77e2,Icaa1f95c
am:
c923752929
Change-Id: I98b29c91c68a63d6ddeffd03a690b7e841c2b5bc
Treehugger Robot [Thu, 13 Apr 2017 09:24:32 +0000 (09:24 +0000)]
Merge changes Ia15f77e2,Icaa1f95c
* changes:
Captive portal: regroup hardcoded http response codes.
Captive portal: rotate fallback urls
Erik Kline [Thu, 13 Apr 2017 08:44:51 +0000 (08:44 +0000)]
Merge "Extract SimChangeListener to its own file" am:
0ef8df6d52 am:
85f5725fb5
am:
270ab2fa7e
Change-Id: Ic39902fe33258dad0315a82b46f37582ba968085
Erik Kline [Thu, 13 Apr 2017 08:38:44 +0000 (08:38 +0000)]
Merge "Extract SimChangeListener to its own file" am:
0ef8df6d52
am:
85f5725fb5
Change-Id: I51f350937450542d8217da5e3d4a415de6cb7f30
Robert Carr [Thu, 13 Apr 2017 08:34:19 +0000 (08:34 +0000)]
Merge "ViewRoot: More surgically fix child-life time." into oc-dev
am:
22762b2283
Change-Id: I5685e1d7b4747a5e0276158f11de355131fc4dea
Erik Kline [Thu, 13 Apr 2017 08:33:12 +0000 (08:33 +0000)]
Merge "Extract SimChangeListener to its own file"
am:
0ef8df6d52
Change-Id: Ib83aa0acc1cf19c04ed94a198bb8333c7e3a60b8
Narayan Kamath [Thu, 13 Apr 2017 08:28:13 +0000 (08:28 +0000)]
Merge "Binder: Be forceful about a forceful exit." into oc-dev
am:
6780828985
Change-Id: I966efbe35b0fa0416a5057cb9a1df001baa4590d
OSDN Git Service
