OSDN Git Service
Wale Ogunwale [Fri, 21 Apr 2017 16:35:08 +0000 (16:35 +0000)]
Merge "Ignore request to add starting window if already visible" into oc-dev am:
9daf0e62a4
am:
4dfb7e3db2
Change-Id: I96444e4ebb10084b9109eb340f714bd3e9d80bcc
Wale Ogunwale [Fri, 21 Apr 2017 16:27:11 +0000 (16:27 +0000)]
Merge "Ignore request to add starting window if already visible" into oc-dev
am:
9daf0e62a4
Change-Id: Ic610537f8573292e4bead83482b13c545c5b92b8
Bill Yi [Fri, 21 Apr 2017 16:26:39 +0000 (16:26 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
03150c4a29 -s ours
am:
97c12deabb -s ours
Change-Id: I4478c1637241a89f668dfba9747fc6c488026141
TreeHugger Robot [Fri, 21 Apr 2017 16:25:21 +0000 (16:25 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Fri, 21 Apr 2017 16:23:17 +0000 (16:23 +0000)]
Merge "Add remaining tests for Trampoline."
Bill Yi [Fri, 21 Apr 2017 16:19:29 +0000 (16:19 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
03150c4a29 -s ours
Change-Id: Ie39e3beb8efda623bb1ee2669a59c5f0b3c77ac0
TreeHugger Robot [Fri, 21 Apr 2017 16:16:43 +0000 (16:16 +0000)]
Merge "Ignore request to add starting window if already visible" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 16:15:52 +0000 (16:15 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Fri, 21 Apr 2017 16:15:33 +0000 (16:15 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Fri, 21 Apr 2017 16:12:22 +0000 (16:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 16:08:22 +0000 (16:08 +0000)]
Merge "Import translations. DO NOT MERGE"
Hyunyoung Song [Fri, 21 Apr 2017 15:38:14 +0000 (15:38 +0000)]
Merge "Support fraction type for inset* for InsetDrawable. b/
36024318" into oc-dev am:
ab7a2879eb
am:
a457ce7ce8
Change-Id: I9dab39e4f2ee254925bcf2bdba592e8769016cc9
Aurimas Liutikas [Fri, 21 Apr 2017 15:33:18 +0000 (15:33 +0000)]
Merge "Fix/suppress error-prone warnings in framework's fragment." into oc-dev am:
d3892caf95
am:
f3523dcaab
Change-Id: I562b77c500a7a73e9549124f0f2882893a2b58d0
Hyunyoung Song [Fri, 21 Apr 2017 15:30:40 +0000 (15:30 +0000)]
Merge "Support fraction type for inset* for InsetDrawable. b/
36024318" into oc-dev
am:
ab7a2879eb
Change-Id: I8c474b66527b7d718d61e1039840c5fa5d5f21e8
Aurimas Liutikas [Fri, 21 Apr 2017 15:26:24 +0000 (15:26 +0000)]
Merge "Fix/suppress error-prone warnings in framework's fragment." into oc-dev
am:
d3892caf95
Change-Id: I3cdc3a4949ce9636dc3d4b5e5075ccf30f4b29d5
TreeHugger Robot [Fri, 21 Apr 2017 15:14:18 +0000 (15:14 +0000)]
Merge "Support fraction type for inset* for InsetDrawable. b/
36024318" into oc-dev
Aurimas Liutikas [Fri, 21 Apr 2017 15:14:04 +0000 (15:14 +0000)]
Merge "Fix/suppress error-prone warnings in framework's fragment." into oc-dev
Artem Iglikov [Fri, 21 Apr 2017 12:23:16 +0000 (13:23 +0100)]
Add remaining tests for Trampoline.
Also a bit of refactoring on TrampolineTestable and enable it for
presubmits.
Bug:
37520021
Test: manually ran the unit test.
Change-Id: I20214b70d3eb35017d50983bd8bebef93b66e839
TreeHugger Robot [Fri, 21 Apr 2017 14:09:20 +0000 (14:09 +0000)]
Merge "Create helper script to parse systrace files"
Michal Karpinski [Fri, 21 Apr 2017 12:40:00 +0000 (12:40 +0000)]
Merge "[DO NOT MERGE] Fix potential NPE in Trampoline.requestBackup()." into oc-dev am:
0db9724b6c
am:
c7bc48f1d6 -s ours
Change-Id: Ieda4ac533daeedd487fd57a713407887ffcc67a5
Michal Karpinski [Fri, 21 Apr 2017 12:30:02 +0000 (12:30 +0000)]
Merge "[DO NOT MERGE] Fix potential NPE in Trampoline.requestBackup()." into oc-dev
am:
0db9724b6c
Change-Id: I36ac24d6ffa41eda4d7cacee931410ee933744d3
Michal Karpinski [Fri, 21 Apr 2017 12:20:58 +0000 (12:20 +0000)]
Merge "[DO NOT MERGE] Fix potential NPE in Trampoline.requestBackup()." into oc-dev
Bill Yi [Fri, 21 Apr 2017 11:25:45 +0000 (04:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: Icb35140eaa33c3a84fa47712917356d44f64a3f2
Auto-generated-cl: translation import
Bill Yi [Fri, 21 Apr 2017 11:21:57 +0000 (04:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ida4d17127df81670a51a4bf933d8df61729fa2c4
Auto-generated-cl: translation import
Abodunrinwa Toki [Fri, 21 Apr 2017 11:15:52 +0000 (11:15 +0000)]
Merge "SmartSelection ConfigUpdater: Ignore version numbers" into oc-dev am:
924d482a44
am:
cfb9a94c2b
Change-Id: Iaaf07f7eaa4f36611285862f2d00caee3b27131f
Abodunrinwa Toki [Fri, 21 Apr 2017 11:09:50 +0000 (11:09 +0000)]
Merge "SmartSelection ConfigUpdater: Ignore version numbers" into oc-dev
am:
924d482a44
Change-Id: I6de3b90235b311a1a1c6344a8517e2ae9e643b5b
TreeHugger Robot [Fri, 21 Apr 2017 11:05:45 +0000 (11:05 +0000)]
Merge "SmartSelection ConfigUpdater: Ignore version numbers" into oc-dev
Bill Yi [Fri, 21 Apr 2017 11:01:47 +0000 (04:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I533828fecb18d6b3e77b2e65d2d1d1afa1fe8af0
Auto-generated-cl: translation import
TreeHugger Robot [Fri, 21 Apr 2017 10:48:04 +0000 (10:48 +0000)]
Merge changes I30dfeadc,I186cf812
* changes:
Fix and enable test for Trampoline.requestBackup().
Fix potential NPE in Trampoline.requestBackup().
Artem Iglikov [Fri, 21 Apr 2017 08:50:56 +0000 (09:50 +0100)]
[DO NOT MERGE] Fix potential NPE in Trampoline.requestBackup().
Before it was returning null in case the service was not initialized,
but as the method signature has int as the return type, this was boxed
and unboxed which would cause NPE.
Now it will return BackupManager.ERROR_BACKUP_NOT_ALLOWED instead.
This doesn't include fix for the test, because it's going to be
cherry-picked into oc-dev, which doesn't have the tests.
Test: manually ran unit tests
Bug:
37535747
Change-Id: I186cf812a4ec67be943b5c4334c82e9af5320b7a
Jerome Gaillard [Fri, 21 Apr 2017 10:23:07 +0000 (10:23 +0000)]
Merge "Update golden image following Change If9039398"
Clara Bayarri [Fri, 21 Apr 2017 09:55:49 +0000 (09:55 +0000)]
Merge "Update Typeface callback docs about error codes" into oc-dev am:
337be5a12f
am:
5d2334fb7c
Change-Id: Ib85820fd4e743102b6697ecb9ac92b5e45aa9c05
Clara Bayarri [Fri, 21 Apr 2017 09:50:13 +0000 (09:50 +0000)]
Merge "Update Typeface callback docs about error codes" into oc-dev
am:
337be5a12f
Change-Id: I145d3a197d6d1457b95afdbf08bb1caef6cf8446
TreeHugger Robot [Fri, 21 Apr 2017 09:44:48 +0000 (09:44 +0000)]
Merge "Update Typeface callback docs about error codes" into oc-dev
Bill Yi [Fri, 21 Apr 2017 09:38:25 +0000 (02:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic8744b5e7758d5cc7c369209d47cd334c2a5ff9e
Auto-generated-cl: translation import
Erik Kline [Fri, 21 Apr 2017 09:24:19 +0000 (09:24 +0000)]
Merge "Clarify IControlsTethering LOCAL_ONLY state name" am:
649c459858 am:
f7c93bcd45 am:
6305795287
am:
09d1588183
Change-Id: I972a2e23d9ef57b2bee6d2b8ee2ba610185ee87e
Erik Kline [Fri, 21 Apr 2017 09:18:50 +0000 (09:18 +0000)]
Merge "Clarify IControlsTethering LOCAL_ONLY state name" am:
649c459858 am:
f7c93bcd45
am:
6305795287
Change-Id: Idf256ced2c3403f9672b29c10ec02adb44a0ab7c
Erik Kline [Fri, 21 Apr 2017 09:13:16 +0000 (09:13 +0000)]
Merge "Clarify IControlsTethering LOCAL_ONLY state name" am:
649c459858
am:
f7c93bcd45
Change-Id: I7eab6f5027628711381b09188779cad164910f51
Bill Yi [Fri, 21 Apr 2017 09:11:58 +0000 (02:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id2a2ba93c5929d68604c4274103cc9dec564a73c
Auto-generated-cl: translation import
Erik Kline [Fri, 21 Apr 2017 09:07:46 +0000 (09:07 +0000)]
Merge "Clarify IControlsTethering LOCAL_ONLY state name"
am:
649c459858
Change-Id: Ia856b08ced4e26e32e107faac37e1c245caaf910
Erik Kline [Fri, 21 Apr 2017 08:59:30 +0000 (08:59 +0000)]
Merge "Clarify IControlsTethering LOCAL_ONLY state name"
Artem Iglikov [Fri, 21 Apr 2017 08:56:35 +0000 (09:56 +0100)]
Fix and enable test for Trampoline.requestBackup().
This was disabled because of NPE.
Test: manual
Bug:
37535747
Change-Id: I30dfeadcddb8003fde7fa92c28fa1f06164201dc
Artem Iglikov [Fri, 21 Apr 2017 08:50:56 +0000 (09:50 +0100)]
Fix potential NPE in Trampoline.requestBackup().
Before it was returning null in case the service was not initialized,
but as the method signature has int as the return type, this was boxed
and unboxed which would cause NPE.
Now it will return BackupManager.ERROR_BACKUP_NOT_ALLOWED instead.
This doesn't include fix for the test, because it's going to be
cherry-picked into oc-dev, which doesn't have the tests.
Test: manually ran unit tests
Bug:
37535747
Change-Id: I186cf812a4ec67be943b5c4334c82e9af5320b7a
Bill Yi [Fri, 21 Apr 2017 08:08:38 +0000 (08:08 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
4b76d33968 -s ours
am:
5a081a225f -s ours
Change-Id: Ic1bf6ba0bc6571119489cf4f9b4035dfcf9279c7
Bill Yi [Fri, 21 Apr 2017 08:03:35 +0000 (08:03 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
4b76d33968 -s ours
Change-Id: Idf537deb9593253c352a3dbcbb4a18ecfdc1e487
TreeHugger Robot [Fri, 21 Apr 2017 07:57:49 +0000 (07:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Erik Kline [Fri, 21 Apr 2017 07:06:35 +0000 (07:06 +0000)]
Merge "Add local-only hotspot info into tether state change broadcast" into oc-dev am:
83e2a25461
am:
838d795731
Change-Id: I903e773977787d35ade7c32afffb5e5e009c3a45
Erik Kline [Fri, 21 Apr 2017 07:01:35 +0000 (07:01 +0000)]
Merge "Add local-only hotspot info into tether state change broadcast" into oc-dev
am:
83e2a25461
Change-Id: I5c91199114ee1a48629523377fc06deda48f5579
Erik Kline [Fri, 21 Apr 2017 06:53:32 +0000 (06:53 +0000)]
Merge "Add local-only hotspot info into tether state change broadcast" into oc-dev
Felipe Leme [Fri, 21 Apr 2017 06:25:27 +0000 (06:25 +0000)]
Merge "Don't trigger new partition on fields from SaveInfo" into oc-dev am:
ab8238e233
am:
50e9fecdaa
Change-Id: I1438a1932191bd144fea064769c2869bc5b29fab
Felipe Leme [Fri, 21 Apr 2017 06:15:26 +0000 (06:15 +0000)]
Merge "Don't trigger new partition on fields from SaveInfo" into oc-dev
am:
ab8238e233
Change-Id: I621f11776f498858c62e76977df163f0aef18471
Philip P. Moltmann [Fri, 21 Apr 2017 06:10:21 +0000 (06:10 +0000)]
Merge "Correctly compute visible views" into oc-dev am:
5cb3d6bea3
am:
db74a12c58
Change-Id: Idf4cf825e7a30532c18330733573e4960d19e016
Hassan Shojania [Fri, 21 Apr 2017 06:08:37 +0000 (06:08 +0000)]
Merge "MediaPlayer/ModularDrm API review: Document/runtime exception update" into oc-dev am:
652d006d6b
am:
4ad936a593
Change-Id: I7bb6b403f9c00b879dba9e3826f61369bbe4f78e
TreeHugger Robot [Fri, 21 Apr 2017 06:06:49 +0000 (06:06 +0000)]
Merge "Don't trigger new partition on fields from SaveInfo" into oc-dev
Felipe Leme [Fri, 21 Apr 2017 06:00:33 +0000 (06:00 +0000)]
Merge "Implemented FillResponse.setIgnoredIds()." into oc-dev am:
bb21986b33
am:
569221ee18
Change-Id: I77f4b836247dc733c5220c16d2cb65a39a6f6903
gaoshang [Fri, 21 Apr 2017 05:58:36 +0000 (05:58 +0000)]
Merge "fix KeyEvent can't correctly finish when inputmethod time out happend" into oc-dev am:
56879000d9
am:
ea7fc08e0f
Change-Id: Iaf9a0298c0c1c8490c59de10015c0485d342ab25
Hugo Benichi [Fri, 21 Apr 2017 05:56:36 +0000 (05:56 +0000)]
Merge "Merge "Add BitUtils (from "Support multiple filters per association request")" am:
1321e592fe am:
232198d02b am:
00aae481fa -s ours" into oc-dev-plus-aosp
am:
64c9cf718d -s ours
Change-Id: I98ec80d25ba32dbbccf93f2cde67d21bdf0ad346
Philip P. Moltmann [Fri, 21 Apr 2017 05:19:27 +0000 (05:19 +0000)]
Merge "Correctly compute visible views" into oc-dev
am:
5cb3d6bea3
Change-Id: I72cb5fe9d3e7f7b5ecfbe03e19489b167f8c2465
TreeHugger Robot [Fri, 21 Apr 2017 05:15:36 +0000 (05:15 +0000)]
Merge "Correctly compute visible views" into oc-dev
Erik Kline [Mon, 17 Apr 2017 07:47:23 +0000 (16:47 +0900)]
Add local-only hotspot info into tether state change broadcast
Test: as follows
- build
- flashed
- booted
- "runtest frameworks-net" passes
- manually starting tethering shows Settings and icon updates
Bug:
31466854
Bug:
32163131
Change-Id: I938074587dfeec221c5cdb43a392802ad3fc3589
Daichi Hirono [Fri, 21 Apr 2017 03:51:36 +0000 (12:51 +0900)]
resolve merge conflicts of
931f1360dccb to master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I598c17e0d9428fc3eda24f63cba2aeb57986caf0
Hassan Shojania [Fri, 21 Apr 2017 03:08:24 +0000 (03:08 +0000)]
Merge "MediaPlayer/ModularDrm API review: Document/runtime exception update" into oc-dev
am:
652d006d6b
Change-Id: Iaf2580d742329db0280d8d466bb40482419099fd
Felipe Leme [Fri, 21 Apr 2017 03:02:59 +0000 (03:02 +0000)]
Merge "Implemented FillResponse.setIgnoredIds()." into oc-dev
am:
bb21986b33
Change-Id: I9dcc532eb2774a523a7d53495a53323a4799dbf8
Hassan Shojania [Fri, 21 Apr 2017 02:58:21 +0000 (02:58 +0000)]
Merge "MediaPlayer/ModularDrm API review: Document/runtime exception update" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 02:54:05 +0000 (02:54 +0000)]
Merge "Implemented FillResponse.setIgnoredIds()." into oc-dev
gaoshang [Fri, 21 Apr 2017 02:42:02 +0000 (02:42 +0000)]
Merge "fix KeyEvent can't correctly finish when inputmethod time out happend" into oc-dev
am:
56879000d9
Change-Id: I3bc0e45e4b801f8b6a2cdb555a8b2b825a259b6c
TreeHugger Robot [Fri, 21 Apr 2017 02:36:06 +0000 (02:36 +0000)]
Merge "fix KeyEvent can't correctly finish when inputmethod time out happend" into oc-dev
Hangyu Kuang [Fri, 21 Apr 2017 02:29:11 +0000 (02:29 +0000)]
Merge "media: Change setNextOutputFile to address API review comments." into oc-dev am:
0e6cce9de1
am:
3d17f50718
Change-Id: If9121b4b63a7b209084293cbe682fded3e3677dc
Android Build Merger (Role) [Fri, 21 Apr 2017 02:23:38 +0000 (02:23 +0000)]
Merge "Merge "Add BitUtils (from "Support multiple filters per association request")" am:
1321e592fe am:
232198d02b am:
00aae481fa -s ours" into oc-dev-plus-aosp
Hugo Benichi [Fri, 21 Apr 2017 02:22:57 +0000 (02:22 +0000)]
Merge "Add BitUtils (from "Support multiple filters per association request")" am:
1321e592fe am:
232198d02b
am:
00aae481fa -s ours
Change-Id: I77254db8a3b974e6e09881610af983edea1309a6
Christopher Tate [Fri, 21 Apr 2017 02:22:21 +0000 (02:22 +0000)]
Merge "Fix #
37305009 : Beam crash in secondary users" into oc-dev am:
68bfea8a5d
am:
9c54607426
Change-Id: Iea285792e32f3b02d116400045621e1b78729a50
Daichi Hirono [Fri, 21 Apr 2017 02:20:37 +0000 (02:20 +0000)]
Merge "Stop restoring tasks added before recent is loaded" into oc-dev
am:
495ecd9d56
Change-Id: I619cd6f13a11e757d4275ba4afc427eb325f1a6b
Hangyu Kuang [Fri, 21 Apr 2017 02:18:47 +0000 (02:18 +0000)]
Merge "media: Change setNextOutputFile to address API review comments." into oc-dev
am:
0e6cce9de1
Change-Id: I3c3070b5183281ccd8a31408f18f6c7dd3c7ca21
Jeff Sharkey [Fri, 21 Apr 2017 02:18:20 +0000 (02:18 +0000)]
Merge "Auto-generate docs based on annotations." into oc-dev am:
9ea4b33f2a
am:
045d23a6f9
Change-Id: Ib587ffea3014503833ff50096ba8cc0c84080ea3
Andrii Kulian [Fri, 21 Apr 2017 02:16:34 +0000 (02:16 +0000)]
Merge "Always create display content with system identity" into oc-dev am:
941264de7d
am:
bcb8e31150
Change-Id: I456ab84aef88d9582c97e4f2ef29b46c768ce59a
Hugo Benichi [Fri, 21 Apr 2017 02:16:20 +0000 (02:16 +0000)]
Merge "Add BitUtils (from "Support multiple filters per association request")" am:
1321e592fe
am:
232198d02b
Change-Id: I755f87e0dbe8169de01ea5cd09094eed3555ee65
Christopher Tate [Fri, 21 Apr 2017 02:12:46 +0000 (02:12 +0000)]
Merge "Fix #
37305009 : Beam crash in secondary users" into oc-dev
am:
68bfea8a5d
Change-Id: Ib449f03ac48eb534c75d539ce38f295444098cb4
TreeHugger Robot [Fri, 21 Apr 2017 02:12:34 +0000 (02:12 +0000)]
Merge "Stop restoring tasks added before recent is loaded" into oc-dev
Erik Kline [Thu, 20 Apr 2017 13:59:16 +0000 (22:59 +0900)]
Clarify IControlsTethering LOCAL_ONLY state name
Test: as follows
- build
- flashed
- booted
- "runtest frameworks-net" passes
- manually starting tethering shows Settings and icon updates
Bug:
31466854
Bug:
32163131
Change-Id: I1f45511f00aca37480f894be4a9a004f1a3b35d7
Jeff Sharkey [Fri, 21 Apr 2017 02:10:23 +0000 (02:10 +0000)]
Merge "Auto-generate docs based on annotations." into oc-dev
am:
9ea4b33f2a
Change-Id: Ic81a77a4fc3bb3638b8b53037c58efc9b26bbb7a
Hugo Benichi [Fri, 21 Apr 2017 02:09:14 +0000 (02:09 +0000)]
Merge "Add BitUtils (from "Support multiple filters per association request")"
am:
1321e592fe
Change-Id: Ibe263aeb2868b75f0a7a75895c68a5aaf2ddfa38
Sudheer Shanka [Fri, 21 Apr 2017 02:09:07 +0000 (02:09 +0000)]
Merge "Update ClipDescription.getTimeStamp to use currentTimeMillis timebase." into oc-dev am:
2cef335b5b
am:
b4c55b62a5
Change-Id: Ie247afa90811c4ffb24179fba63fd71cb8fc6426
TreeHugger Robot [Fri, 21 Apr 2017 02:06:13 +0000 (02:06 +0000)]
Merge "media: Change setNextOutputFile to address API review comments." into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 02:04:12 +0000 (02:04 +0000)]
Merge "Fix #
37305009 : Beam crash in secondary users" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 02:03:29 +0000 (02:03 +0000)]
Merge "Auto-generate docs based on annotations." into oc-dev
Andrii Kulian [Fri, 21 Apr 2017 02:03:20 +0000 (02:03 +0000)]
Merge "Always create display content with system identity" into oc-dev
am:
941264de7d
Change-Id: Ic551693590bc817479ea6519a3a87bfc1ad17de8
Sudheer Shanka [Fri, 21 Apr 2017 02:01:26 +0000 (02:01 +0000)]
Merge "Update ClipDescription.getTimeStamp to use currentTimeMillis timebase." into oc-dev
am:
2cef335b5b
Change-Id: Ife25840cfbfae896e00bb387915cf3a327da1185
Hugo Benichi [Fri, 21 Apr 2017 01:58:14 +0000 (01:58 +0000)]
Merge "Add BitUtils (from "Support multiple filters per association request")"
Christopher Tate [Fri, 21 Apr 2017 01:57:18 +0000 (01:57 +0000)]
Merge "OOM-adjust an app to the foreground for startForegroundService" into oc-dev am:
305d30f786
am:
81d53bf4d7
Change-Id: Ic7e643a2b7ab12a9d1443856a616e31484fe491d
Andrii Kulian [Fri, 21 Apr 2017 01:52:15 +0000 (01:52 +0000)]
Merge "Always create display content with system identity" into oc-dev
Sudheer Shanka [Fri, 21 Apr 2017 01:51:22 +0000 (01:51 +0000)]
Merge "Update ClipDescription.getTimeStamp to use currentTimeMillis timebase." into oc-dev
Christopher Tate [Fri, 21 Apr 2017 01:51:14 +0000 (01:51 +0000)]
Merge "OOM-adjust an app to the foreground for startForegroundService" into oc-dev
am:
305d30f786
Change-Id: Ifb52cf1189b3aa15b7bee12e1071130e77bef5d1
Stanley Tng [Fri, 21 Apr 2017 01:46:18 +0000 (01:46 +0000)]
Merge "Allow the Bluetooth MAC address to be updated asynchronously (2/3)" am:
c5680c9b05 am:
16609dfe18 am:
559f49a4a8
am:
4a6356942d
Change-Id: I874338efb281ddcbb5ddbb8b23814d25512d1f15
TreeHugger Robot [Fri, 21 Apr 2017 01:42:29 +0000 (01:42 +0000)]
Merge "OOM-adjust an app to the foreground for startForegroundService" into oc-dev
Stanley Tng [Fri, 21 Apr 2017 01:38:54 +0000 (01:38 +0000)]
Merge "Allow the Bluetooth MAC address to be updated asynchronously (2/3)" am:
c5680c9b05 am:
16609dfe18
am:
559f49a4a8
Change-Id: I6fa8f334a84132e121db7c517ea50ff8d8047611
Felipe Leme [Fri, 21 Apr 2017 01:28:27 +0000 (18:28 -0700)]
Don't trigger new partition on fields from SaveInfo
Fixes:
37551943
Test: existing CtsAutoFillServiceTestCases pass
Test: modified LoginActivityTest.testSaveOnly
Test: new LoginActivityTest.testSaveOnlyOptionalField
Change-Id: I2ae11c4f0aebe63fd02f81fbc37466435e3a2820
Felipe Leme [Fri, 21 Apr 2017 01:34:28 +0000 (01:34 +0000)]
Merge "Fixed NPE on dump() and other minor fixes..." into oc-dev am:
dbc020983d
am:
584033675e
Change-Id: Ie6f04394c5ca21c4d28107bd61369263d144d48a
TreeHugger Robot [Fri, 21 Apr 2017 01:30:25 +0000 (01:30 +0000)]
Merge "Ambient Indication: Add supporting infrastructure"
Stanley Tng [Fri, 21 Apr 2017 01:30:21 +0000 (01:30 +0000)]
Merge "Allow the Bluetooth MAC address to be updated asynchronously (2/3)" am:
c5680c9b05
am:
16609dfe18
Change-Id: I9c9c500bab98168da48d69cc7e4c93a33b8571bd
Phil Weaver [Fri, 21 Apr 2017 01:26:10 +0000 (01:26 +0000)]
Merge "Fix a11y text location in clipped views" into oc-dev am:
6a60322157
am:
3f5a6d144d
Change-Id: I1644089419dd423a819089c41111a69fc2cf2d65
OSDN Git Service
