OSDN Git Service
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
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
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
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
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
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
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
TreeHugger Robot [Thu, 13 Apr 2017 08:25:05 +0000 (08:25 +0000)]
Merge "ViewRoot: More surgically fix child-life time." into oc-dev
Treehugger Robot [Thu, 13 Apr 2017 08:19:05 +0000 (08:19 +0000)]
Merge "Extract SimChangeListener to its own file"
Narayan Kamath [Thu, 13 Apr 2017 08:16:45 +0000 (08:16 +0000)]
Merge "Binder: Be forceful about a forceful exit." into oc-dev
Tadashi G. Takaoka [Thu, 13 Apr 2017 07:53:39 +0000 (07:53 +0000)]
Merge "Remove supportsDismissingSelfWindow attribute of IME" into oc-dev
am:
d280bfea23
Change-Id: I08a985e79f695ed43f4b873698424263689bd57d
Hugo Benichi [Mon, 10 Apr 2017 08:08:06 +0000 (17:08 +0900)]
Captive portal: regroup hardcoded http response codes.
This patch regroups various hardcoded http codes into well defined
constants. This reduces risk of errors and makes the captive portal
logic clearer.
This patch also fixes the logging when a captive portal detection
probe fails, to take into account https ssl handshake failures: for
well-behaved portals it is expected that the https probe will fail,
however the error message was written before the introduction of the
https probe and had become ambiguous.
Test: built, flashed, tested manually with various portal networks
Bug:
36532213
Change-Id: Ia15f77e268cb414816fc52f92835289f9a9ce92b
Hugo Benichi [Mon, 10 Apr 2017 08:43:08 +0000 (17:43 +0900)]
Captive portal: rotate fallback urls
This patch introduces a new settings value to specify more than one url
for the fallback http probe in addition to the existing settings value.
If more than one url exists, a network will rotate urls for the fallback
probe one by one everytime the fallback probe is sent.
Test: built, flashed, tested manually with various portal networks.
Bug:
36532213
Change-Id: Icaa1f95c5914e8840c83ccdf071047358a5b760f
Tadashi G. Takaoka [Thu, 13 Apr 2017 07:41:29 +0000 (07:41 +0000)]
Merge "Remove supportsDismissingSelfWindow attribute of IME" into oc-dev
Robert Carr [Thu, 13 Apr 2017 07:22:01 +0000 (07:22 +0000)]
Merge "Stack APPLICATION_MEDIA_OVERLAY windows with relative layering." into oc-dev
am:
9d5ac93cc3
Change-Id: I34c773700cb3dbb73803df1085034c3ac246943d
TreeHugger Robot [Thu, 13 Apr 2017 07:12:51 +0000 (07:12 +0000)]
Merge "Stack APPLICATION_MEDIA_OVERLAY windows with relative layering." into oc-dev
Dan Sandler [Thu, 13 Apr 2017 07:05:05 +0000 (07:05 +0000)]
Merge "Minor text fixes." into oc-dev
am:
818c408e5d
Change-Id: I344ae2f6456893defd49d9efe5af8325770bcf83
TreeHugger Robot [Thu, 13 Apr 2017 07:00:54 +0000 (07:00 +0000)]
Merge "Minor text fixes." into oc-dev
Adam Lesinski [Thu, 13 Apr 2017 06:59:33 +0000 (06:59 +0000)]
Merge "AAPT2: Generate R.txt" into oc-dev
am:
d1a6e6740f
Change-Id: Ib7d580fe143734fe202829dba8363985bc8406b7
Michael Wright [Thu, 13 Apr 2017 06:55:21 +0000 (06:55 +0000)]
Merge "Catch exceptions in Vibrator to maintain compatibility" into oc-dev
am:
07d60cce02
Change-Id: I84ee1eddc5a2ae67e1da6de5ad84721714bcd79f
TreeHugger Robot [Thu, 13 Apr 2017 06:54:18 +0000 (06:54 +0000)]
Merge "AAPT2: Generate R.txt" into oc-dev
Adam Lesinski [Thu, 13 Apr 2017 06:54:21 +0000 (06:54 +0000)]
Merge "OMS: Fix bug where overlay settings wouldn't persist" into oc-dev
am:
4ad2ebcc90
Change-Id: I326ba95cb4a81305588924a3c987754263b68a4c
Bill Yi [Thu, 13 Apr 2017 06:53:10 +0000 (23:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3bf092ebb3c99f4708f20d2d303e201c1da1ae9a
Auto-generated-cl: translation import
TreeHugger Robot [Thu, 13 Apr 2017 06:48:25 +0000 (06:48 +0000)]
Merge "Catch exceptions in Vibrator to maintain compatibility" into oc-dev
TreeHugger Robot [Thu, 13 Apr 2017 06:42:48 +0000 (06:42 +0000)]
Merge "OMS: Fix bug where overlay settings wouldn't persist" into oc-dev
Chong Zhang [Thu, 13 Apr 2017 06:34:25 +0000 (06:34 +0000)]
Merge changes from topic 'api-review' into oc-dev
am:
fd89a95f35
Change-Id: I297fcfecc54346ee885916eb2e671497c522001f
Chong Zhang [Thu, 13 Apr 2017 06:32:28 +0000 (06:32 +0000)]
MediaCas: address comments for API reviews
am:
addc39ec27
Change-Id: Ib4bb32cc09d9352bdbc4913dfdfdf1e92c11487f
TreeHugger Robot [Thu, 13 Apr 2017 06:23:45 +0000 (06:23 +0000)]
Merge changes from topic 'api-review' into oc-dev
* changes:
MediaCas: combine openSession methods
MediaCas: address comments for API reviews
Erik Kline [Thu, 13 Apr 2017 06:18:38 +0000 (06:18 +0000)]
Merge "Ignore potential SystemProperties errors when setting net.dns" am:
f854c9034c am:
1303b8b9ca
am:
1d3528ba86
Change-Id: Ic9bf0af39fc2f879fb1fa365480f4d6d187a4d79
Erik Kline [Thu, 13 Apr 2017 06:12:30 +0000 (06:12 +0000)]
Merge "Ignore potential SystemProperties errors when setting net.dns" am:
f854c9034c
am:
1303b8b9ca
Change-Id: I3fb343daa4d1d5f01d5cc99d842574c841970d03
Erik Kline [Thu, 13 Apr 2017 06:00:37 +0000 (06:00 +0000)]
Merge "Ignore potential SystemProperties errors when setting net.dns"
am:
f854c9034c
Change-Id: Ic9ac3a2b1162524369f19b876e91a234e56fdc37
Treehugger Robot [Thu, 13 Apr 2017 05:49:31 +0000 (05:49 +0000)]
Merge "Ignore potential SystemProperties errors when setting net.dns"
Lorenzo Colitti [Thu, 13 Apr 2017 05:48:37 +0000 (05:48 +0000)]
Merge "Move some NetworkStats tests to tests/net." am:
ab3901dc8b am:
67401e25c2
am:
997e6b085a
Change-Id: I37c1d362d891ec3b09b00df44aaf233adf355077
Bill Yi [Thu, 13 Apr 2017 05:38:20 +0000 (22:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4d7599fdee360cf86ce1980b9759a692a493d21b
Auto-generated-cl: translation import
Lorenzo Colitti [Thu, 13 Apr 2017 05:37:01 +0000 (05:37 +0000)]
Merge "Move some NetworkStats tests to tests/net." am:
ab3901dc8b
am:
67401e25c2
Change-Id: I732b7dbc6b0d29a79aff727c2357ed6bb9456f6c
Winson Chung [Thu, 13 Apr 2017 04:53:59 +0000 (21:53 -0700)]
Fix issue with non-focusable PiP activities being resumed.
- When the change to finish activities was made in ag/
2067154, it exposed
an issue in pinned stacks where we would resume the next top activity
once the top activity finished pausing. Normally, the pinned stack is
not focusable, but since it has an alwaysFocusable menu activity it
becomes the focused stack and falls into this case.
Instead of finding the next top activity, we need to find the next top
focusable activity to resume, and fall through to focusing the top
activity in the next focusable stack if there is none.
Bug:
37199067
Test: android.server.cts.ActivityManagerPinnedStackTests
Test: #testNoResumeAfterTaskOverlayFinishes
Change-Id: Ib79826ff38bb3beb38a40183ddc6819e5040bb27
Lorenzo Colitti [Thu, 13 Apr 2017 05:29:58 +0000 (05:29 +0000)]
Merge "Move some NetworkStats tests to tests/net."
am:
ab3901dc8b
Change-Id: I68214c14658afbb5c92facb018988d2ed27bc351
Lorenzo Colitti [Thu, 13 Apr 2017 05:18:46 +0000 (05:18 +0000)]
Merge "Move some NetworkStats tests to tests/net."
Daichi Hirono [Thu, 13 Apr 2017 04:42:22 +0000 (04:42 +0000)]
Merge "Use Context#startForegroundService in MTP provider" into oc-dev
am:
96907e6553
Change-Id: Ic121f5ca810d5d92cbe15dca38ef4c33ed8261d3
Robert Carr [Tue, 11 Apr 2017 01:34:33 +0000 (18:34 -0700)]
Stack APPLICATION_MEDIA_OVERLAY windows with relative layering.
See accompanying frameworks/native commit
"SurfaceFlinger: Add parent-less relative layering" for a full explanation.
Test: Manual of bug repro steps. Plus tests for new SurfaceControl functionality included in frameworks/native.
Bug:
36693738
Change-Id: Ic54598117c1f44a206d33f03d0cc463fbef43fcc
TreeHugger Robot [Thu, 13 Apr 2017 04:36:45 +0000 (04:36 +0000)]
Merge "Use Context#startForegroundService in MTP provider" into oc-dev
Bill Yi [Thu, 13 Apr 2017 04:31:16 +0000 (21:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: I140e40e34c4ee3482c87f180d292bdba8594961b
Auto-generated-cl: translation import
Erik Kline [Fri, 7 Apr 2017 06:29:29 +0000 (15:29 +0900)]
Ignore potential SystemProperties errors when setting net.dns
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
Bug:
33308258
Bug:
36249702
Change-Id: I76ae853ceb61b7b900f36f9c3cd67b2d2284aab0
Fyodor Kupolov [Thu, 13 Apr 2017 04:13:44 +0000 (04:13 +0000)]
Merge "Report app data fixup and prepare timings" into oc-dev
am:
1423ea3a45
Change-Id: I59bead1f8f0dd6a8cafe2ae564f028dd27dda222
TreeHugger Robot [Thu, 13 Apr 2017 04:08:17 +0000 (04:08 +0000)]
Merge "Report app data fixup and prepare timings" into oc-dev
Vladislav Kaznacheev [Thu, 13 Apr 2017 03:47:25 +0000 (03:47 +0000)]
Merge "Revert "Make scrollbarSize in Material Design theme configurable"" into oc-dev
am:
0964a2d9fc
Change-Id: I800980c3c887dd722410b427b7912b254012effc
TreeHugger Robot [Thu, 13 Apr 2017 03:36:23 +0000 (03:36 +0000)]
Merge "Revert "Make scrollbarSize in Material Design theme configurable"" into oc-dev
OSDN Git Service
