OSDN Git Service
Dianne Hackborn [Fri, 21 Apr 2017 19:32:27 +0000 (19:32 +0000)]
Merge "Fix issue #
32180780: Sync adapters inappropriately being run..." into oc-dev
am:
0fa2574ecb
Change-Id: I7ea8132d0dcda44c25d1d96a1ce4f52f6cb0e72c
TreeHugger Robot [Fri, 21 Apr 2017 19:23:06 +0000 (19:23 +0000)]
Merge "Fix issue #
32180780: Sync adapters inappropriately being run..." into oc-dev
Philip P. Moltmann [Fri, 21 Apr 2017 19:01:28 +0000 (19:01 +0000)]
Merge "Fine tune the Autofill Save UI" into oc-dev
am:
ede054a73e
Change-Id: I0f23b28dbb8da1a3182411223bb3edde09fb56d8
Wale Ogunwale [Fri, 21 Apr 2017 18:58:59 +0000 (18:58 +0000)]
Merge "Switched wtf in DimLayerController to warning instead" into oc-dev
am:
d0c3b9c685
Change-Id: Ia75c5e478341cac25a7783ee058edd89bd05e7e8
TreeHugger Robot [Fri, 21 Apr 2017 18:53:15 +0000 (18:53 +0000)]
Merge "Fine tune the Autofill Save UI" into oc-dev
Jesse Hall [Fri, 21 Apr 2017 18:52:54 +0000 (18:52 +0000)]
Merge "Match AHardwareBuffer format name change" into oc-dev
am:
489edb395b
Change-Id: Ib258e8485a3bcafef4ec65f4b28caaaeb081189e
Wale Ogunwale [Fri, 21 Apr 2017 18:52:41 +0000 (18:52 +0000)]
Merge "Switched wtf in DimLayerController to warning instead" into oc-dev
Android Build Merger (Role) [Fri, 21 Apr 2017 18:47:06 +0000 (18:47 +0000)]
Merge "Merge "Use SubscriptionId instead of SubId" am:
946410eef5 am:
9cad054e02 am:
fb0acf3355" into oc-dev-plus-aosp
Jordan Liu [Fri, 21 Apr 2017 18:45:36 +0000 (18:45 +0000)]
Merge "Use SubscriptionId instead of SubId" am:
946410eef5 am:
9cad054e02
am:
fb0acf3355
Change-Id: I81365ed8a767f4571a62da0ff0ba170badcce462
Joe Fernandez [Fri, 21 Apr 2017 18:44:57 +0000 (18:44 +0000)]
Merge "docs: Update Imageview JavaDoc comments" into oc-dev
am:
62a24e9493
Change-Id: I480054acc8be3934bb7ad25cc932da380fab5d02
Joe Fernandez [Fri, 21 Apr 2017 18:42:54 +0000 (18:42 +0000)]
Merge "docs: Update TextView JavaDoc comments" into oc-dev
am:
28973b3817
Change-Id: I9bdc0c10f3046f0d6f1c1abe0a8977379121d6b4
TreeHugger Robot [Fri, 21 Apr 2017 18:38:19 +0000 (18:38 +0000)]
Merge "Match AHardwareBuffer format name change" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 18:36:46 +0000 (18:36 +0000)]
Merge "docs: Update Imageview JavaDoc comments" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 18:34:08 +0000 (18:34 +0000)]
Merge "docs: Update TextView JavaDoc comments" into oc-dev
Jordan Liu [Fri, 21 Apr 2017 18:30:29 +0000 (18:30 +0000)]
Merge "Use SubscriptionId instead of SubId" am:
946410eef5
am:
9cad054e02
Change-Id: Ib57abfadda3521667ce788e37e77496300feef4e
Jordan Liu [Fri, 21 Apr 2017 18:23:00 +0000 (18:23 +0000)]
Merge "Use SubscriptionId instead of SubId"
am:
946410eef5
Change-Id: Ib6f689a69ff19b24cc5ac128e77254c0d7624161
Jordan Liu [Fri, 21 Apr 2017 18:17:51 +0000 (18:17 +0000)]
Merge "Use SubscriptionId instead of SubId"
Kang Li [Fri, 21 Apr 2017 18:11:33 +0000 (18:11 +0000)]
Merge "Removes colon characters from the doc of EXTRA_CONTENT_ANNOTATIONS." into oc-dev
am:
8b4f17be85
Change-Id: I56bb063e1e6ff9003f852a47db355519dec22a69
Seigo Nonaka [Fri, 21 Apr 2017 18:09:44 +0000 (18:09 +0000)]
Merge "Cache the Typeface based on the FontRequest." into oc-dev
am:
5b96e55d90
Change-Id: Ic185a25c605e7345afa214d3b50fd859135f7b9b
TreeHugger Robot [Fri, 21 Apr 2017 18:03:06 +0000 (18:03 +0000)]
Merge "Removes colon characters from the doc of EXTRA_CONTENT_ANNOTATIONS." into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 18:00:51 +0000 (18:00 +0000)]
Merge "Cache the Typeface based on the FontRequest." into oc-dev
Rebecca Silberstein [Fri, 21 Apr 2017 17:41:31 +0000 (17:41 +0000)]
Merge "WifiManager: add new methods to start softap" into oc-dev
am:
435f1dc7a7 -s ours
Change-Id: Iec3175ed83e50f31154868b634899373b5c53519
Felipe Leme [Fri, 21 Apr 2017 17:35:12 +0000 (17:35 +0000)]
Merge "Removed deprecated SaveInfo methods." into oc-dev
am:
fc533da920
Change-Id: I930aaeaec76f0fa8ffe01bd7ca7bbad0cca977f8
Rebecca Silberstein [Fri, 21 Apr 2017 17:33:41 +0000 (17:33 +0000)]
Merge "WifiManager: add new methods to start softap" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 17:28:09 +0000 (17:28 +0000)]
Merge "Removed deprecated SaveInfo methods." into oc-dev
Julia Reynolds [Fri, 21 Apr 2017 17:26:16 +0000 (17:26 +0000)]
Merge "Remove long standing debug code" into oc-dev
am:
f74a736add
Change-Id: Iaf5aba1c4146da1352fea149171832cff88b3978
TreeHugger Robot [Fri, 21 Apr 2017 17:17:17 +0000 (17:17 +0000)]
Merge "Remove long standing debug code" into oc-dev
Dianne Hackborn [Fri, 21 Apr 2017 00:17:48 +0000 (17:17 -0700)]
Fix issue #
32180780: Sync adapters inappropriately being run...
...during full-data backup/restore
The activity manager now tells job scheduler service about the
current backup that is running (only if it is a full backup), it
there is a new condition where we won't consider jobs associated
with the current backup to be ready to run.
Also... just a little optimization here. :) The focus is on
scheduling jobs with a 0 deadline, meaning they should run right
away. Now the timing controller does a quick check for a new
job to see if its constraints are already satisifed, and doesn't
do anything further if that is the case (doesn't add to the list,
doesn't re-evaluate alarms, etc). And in the path to scheduling
a job, we do a check to see if the new job is already ready and if
so then just directly add it to the pending list and schedule it.
Doing this required removing what I think is the last bit of code
relying on handler serializing for thread safety, so now everything
in the job scheduler is protected by our global lock and we can
do whatever we want with the lock held and be assured the state
remains consistent.
Also did some small optimizations to many of the other controllers,
mostly switching from an ArrayList to an ArraySet for their tracked
jobs, since one of the things we do frequently is add/remove jobs.
Finally, added some nullability annotations to the JobScheduler
APIs.
Test: bit CtsJobSchedulerTestCases:*
Change-Id: I533fad94ba59468a52fe3d077a0ceab3427f0012
Tony Mak [Fri, 21 Apr 2017 16:51:19 +0000 (16:51 +0000)]
Merge "Send ACTION_POWER_SAVE_MODE_CHANGED to all user" into oc-dev
am:
035aaddbb3
Change-Id: I5b9b7b1a779b46aca047eb589d58a34c456fdf2c
Julia Reynolds [Fri, 21 Apr 2017 16:48:17 +0000 (16:48 +0000)]
Merge "Move companion device check to the handler" into oc-dev
am:
077b1ea14d
Change-Id: Ibb3dcd97136da1d5d131457c2a2596ccc09c1485
Android Build Merger (Role) [Fri, 21 Apr 2017 16:45:45 +0000 (16:45 +0000)]
Merge "Merge "Fix error message: getAllowedCarriers" am:
112d039dfb am:
03f4a0f034 am:
96b140489c" into oc-dev-plus-aosp
Meng Wang [Fri, 21 Apr 2017 16:45:00 +0000 (16:45 +0000)]
Merge "Fix error message: getAllowedCarriers" am:
112d039dfb am:
03f4a0f034
am:
96b140489c
Change-Id: Icec36f8895e4ffb081989973abf563fddbf2f2fd
TreeHugger Robot [Fri, 21 Apr 2017 16:44:44 +0000 (16:44 +0000)]
Merge "Send ACTION_POWER_SAVE_MODE_CHANGED to all user" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 16:43:20 +0000 (16:43 +0000)]
Merge "Move companion device check to the handler" into oc-dev
Jason Monk [Fri, 21 Apr 2017 16:43:13 +0000 (16:43 +0000)]
Merge "QS + DND interaction again" into oc-dev
am:
d84ff64f96
Change-Id: I0fa2650cb925001c0212b6d528184577f54451a2
Meng Wang [Fri, 21 Apr 2017 16:38:13 +0000 (16:38 +0000)]
Merge "Fix error message: getAllowedCarriers" am:
112d039dfb
am:
03f4a0f034
Change-Id: If62a8b9d7b4a2c36d20cdb00877563a5586a5f72
Pavel Grafov [Fri, 21 Apr 2017 16:35:09 +0000 (16:35 +0000)]
Merge "Fix javadoc for some user restrictions." into oc-dev
am:
9c8bb68071
Change-Id: I0c77cdfdf173f50701ce2cf52a3004b6297ff369
TreeHugger Robot [Fri, 21 Apr 2017 16:35:02 +0000 (16:35 +0000)]
Merge "QS + DND interaction again" into oc-dev
Meng Wang [Fri, 21 Apr 2017 16:32:12 +0000 (16:32 +0000)]
Merge "Fix error message: getAllowedCarriers"
am:
112d039dfb
Change-Id: Ic04b23b87f56261c2c55f1e0a284109bf353c8d0
Bill Yi [Fri, 21 Apr 2017 16:29:37 +0000 (16:29 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
21b5f4063e -s ours
Change-Id: Ibe6ea76c93c5203c4d528731aeb8bf691deaea3b
TreeHugger Robot [Fri, 21 Apr 2017 16:28:45 +0000 (16:28 +0000)]
Merge "Fix javadoc for some user restrictions." into oc-dev
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
Treehugger Robot [Fri, 21 Apr 2017 16:23:33 +0000 (16:23 +0000)]
Merge "Fix error message: getAllowedCarriers"
TreeHugger Robot [Fri, 21 Apr 2017 16:21:57 +0000 (16:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
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:12:22 +0000 (16:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Seigo Nonaka [Wed, 19 Apr 2017 19:16:39 +0000 (12:16 -0700)]
Cache the Typeface based on the FontRequest.
Bug:
37471729
Test: FontsContractE2ETest
Change-Id: Ifb1bd2b50077471404f5f1dffc01e7697d7042e6
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
Felipe Leme [Fri, 21 Apr 2017 15:08:39 +0000 (08:08 -0700)]
Removed deprecated SaveInfo methods.
Test: CtsAutoFillServiceTestCases pass
Bug:
37563972
Bug:
33197203
Change-Id: Ie90fa78c31f033c47e7b2f018355ae87759c622b
Kang Li [Wed, 19 Apr 2017 18:56:05 +0000 (11:56 -0700)]
Removes colon characters from the doc of EXTRA_CONTENT_ANNOTATIONS.
bug:
37496130
Test: skipped test, because the change is only in javadoc.
Change-Id: I899d55da59260eabfcea0549a1c6a338bcda2c81
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
Pavel Grafov [Fri, 21 Apr 2017 13:48:21 +0000 (14:48 +0100)]
Fix javadoc for some user restrictions.
DISALLOW_UNMUTE_MICROPHONE and DISALLOW_ADJUST_VOLUME can
be set by POs on secondary users as well. But they have no
effect on managed profiles.
(In the bug I erroneously mentionted DISALLOW_UNMUTE_DEVICE
which is @hidden instead of *_MICROPHONE).
Bug:
36024135
Test: IntelliJ quickdoc popup renders correctly.
Change-Id: I7a0e77ac993846cdc3a4ddf4d457e1282872107f
Julia Reynolds [Thu, 20 Apr 2017 15:31:30 +0000 (11:31 -0400)]
Move companion device check to the handler
To return faster to the app that's creating channels, since
companion device manager has to read from xml.
Fixes:
37534164
Test: runtest systemui-notification, manual with an app with strict
mode on.
Change-Id: I78909ba3ca6b33302fb78756b49c9014de5aeb12
Julia Reynolds [Wed, 19 Apr 2017 17:50:12 +0000 (13:50 -0400)]
Remove long standing debug code
Because it stops real errors from bubbling up to the calling app.
Test: make, post notifications
Change-Id: I0e59c61b0a60302a5fd023b7ad909e84b97e5df5
Fixes:
37494547
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: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: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
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
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:42:01 +0000 (02:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I231c6c8609a64f510f3902840053fb056a7e8509
Auto-generated-cl: translation import
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
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"
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: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:15:26 +0000 (06:15 +0000)]
Merge "Don't trigger new partition on fields from SaveInfo" into oc-dev
am:
ab8238e233
Change-Id: I621f11776f498858c62e76977df163f0aef18471
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
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
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
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
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
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
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
OSDN Git Service
