Dianne Hackborn
a97ee07a5c
Merge "Fix issue #32180780 : Sync adapters inappropriately being run..." into oc-dev
...
am: 0fa2574ecb
2017-04-21 19:32:27 +00:00
TreeHugger Robot
0fa2574ecb
Merge "Fix issue #32180780 : Sync adapters inappropriately being run..." into oc-dev
2017-04-21 19:23:11 +00:00
Joe Fernandez
2bc550372e
Merge "docs: Update Imageview JavaDoc comments" into oc-dev
...
am: 62a24e9493
2017-04-21 18:44:57 +00:00
Joe Fernandez
474b5af269
Merge "docs: Update TextView JavaDoc comments" into oc-dev
...
am: 28973b3817
2017-04-21 18:42:54 +00:00
TreeHugger Robot
62a24e9493
Merge "docs: Update Imageview JavaDoc comments" into oc-dev
2017-04-21 18:36:51 +00:00
TreeHugger Robot
28973b3817
Merge "docs: Update TextView JavaDoc comments" into oc-dev
2017-04-21 18:34:14 +00:00
Kang Li
9d6cb20646
Merge "Removes colon characters from the doc of EXTRA_CONTENT_ANNOTATIONS." into oc-dev
...
am: 8b4f17be85
2017-04-21 18:11:33 +00:00
Seigo Nonaka
a121eabf99
Merge "Cache the Typeface based on the FontRequest." into oc-dev
...
am: 5b96e55d90
2017-04-21 18:09:44 +00:00
TreeHugger Robot
8b4f17be85
Merge "Removes colon characters from the doc of EXTRA_CONTENT_ANNOTATIONS." into oc-dev
2017-04-21 18:03:10 +00:00
TreeHugger Robot
5b96e55d90
Merge "Cache the Typeface based on the FontRequest." into oc-dev
2017-04-21 18:00:55 +00:00
Felipe Leme
184347912d
Merge "Removed deprecated SaveInfo methods." into oc-dev
...
am: fc533da920
2017-04-21 17:35:12 +00:00
TreeHugger Robot
fc533da920
Merge "Removed deprecated SaveInfo methods." into oc-dev
2017-04-21 17:28:13 +00:00
Julia Reynolds
ce822b2fb7
Merge "Remove long standing debug code" into oc-dev
...
am: f74a736add
2017-04-21 17:26:16 +00:00
TreeHugger Robot
f74a736add
Merge "Remove long standing debug code" into oc-dev
2017-04-21 17:17:20 +00:00
Dianne Hackborn
f9bac16d61
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
2017-04-21 10:07:31 -07:00
Pavel Grafov
9488302c42
Merge "Fix javadoc for some user restrictions." into oc-dev
...
am: 9c8bb68071
2017-04-21 16:35:09 +00:00
TreeHugger Robot
9c8bb68071
Merge "Fix javadoc for some user restrictions." into oc-dev
2017-04-21 16:28:49 +00:00
Seigo Nonaka
daa8dfc690
Cache the Typeface based on the FontRequest.
...
Bug: 37471729
Test: FontsContractE2ETest
Change-Id: Ifb1bd2b50077471404f5f1dffc01e7697d7042e6
2017-04-21 09:11:10 -07:00
Aurimas Liutikas
f3523dcaab
Merge "Fix/suppress error-prone warnings in framework's fragment." into oc-dev
...
am: d3892caf95
2017-04-21 15:26:24 +00:00
Felipe Leme
0d3db06d1d
Removed deprecated SaveInfo methods.
...
Test: CtsAutoFillServiceTestCases pass
Bug: 37563972
Bug: 33197203
Change-Id: Ie90fa78c31f033c47e7b2f018355ae87759c622b
2017-04-21 08:25:44 -07:00
Kang Li
fadc0166d5
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
2017-04-21 15:19:58 +00:00
Aurimas Liutikas
d3892caf95
Merge "Fix/suppress error-prone warnings in framework's fragment." into oc-dev
2017-04-21 15:14:08 +00:00
Pavel Grafov
ce3e1a3c5f
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
2017-04-21 14:48:21 +01:00
Julia Reynolds
fea6f7b799
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
2017-04-21 09:38:39 -04:00
Clara Bayarri
5d2334fb7c
Merge "Update Typeface callback docs about error codes" into oc-dev
...
am: 337be5a12f
2017-04-21 09:50:13 +00:00
TreeHugger Robot
337be5a12f
Merge "Update Typeface callback docs about error codes" into oc-dev
2017-04-21 09:44:53 +00:00
Erik Kline
83e2a25461
Merge "Add local-only hotspot info into tether state change broadcast" into oc-dev
2017-04-21 06:53:39 +00:00
Philip P. Moltmann
db74a12c58
Merge "Correctly compute visible views" into oc-dev
...
am: 5cb3d6bea3
2017-04-21 05:19:27 +00:00
TreeHugger Robot
5cb3d6bea3
Merge "Correctly compute visible views" into oc-dev
2017-04-21 05:15:40 +00:00
Erik Kline
668b722498
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
2017-04-21 13:26:04 +09:00
Felipe Leme
569221ee18
Merge "Implemented FillResponse.setIgnoredIds()." into oc-dev
...
am: bb21986b33
2017-04-21 03:02:59 +00:00
TreeHugger Robot
bb21986b33
Merge "Implemented FillResponse.setIgnoredIds()." into oc-dev
2017-04-21 02:54:13 +00:00
gaoshang
ea7fc08e0f
Merge "fix KeyEvent can't correctly finish when inputmethod time out happend" into oc-dev
...
am: 56879000d9
2017-04-21 02:42:02 +00:00
TreeHugger Robot
56879000d9
Merge "fix KeyEvent can't correctly finish when inputmethod time out happend" into oc-dev
2017-04-21 02:36:10 +00:00
Jeff Sharkey
045d23a6f9
Merge "Auto-generate docs based on annotations." into oc-dev
...
am: 9ea4b33f2a
2017-04-21 02:10:23 +00:00
TreeHugger Robot
9ea4b33f2a
Merge "Auto-generate docs based on annotations." into oc-dev
2017-04-21 02:03:33 +00:00
Sudheer Shanka
b4c55b62a5
Merge "Update ClipDescription.getTimeStamp to use currentTimeMillis timebase." into oc-dev
...
am: 2cef335b5b
2017-04-21 02:01:26 +00:00
Sudheer Shanka
2cef335b5b
Merge "Update ClipDescription.getTimeStamp to use currentTimeMillis timebase." into oc-dev
2017-04-21 01:51:27 +00:00
Stanley Tng
4a6356942d
Merge "Allow the Bluetooth MAC address to be updated asynchronously (2/3)" am: c5680c9b05 am: 16609dfe18
...
am: 559f49a4a8
2017-04-21 01:38:54 +00:00
Stanley Tng
559f49a4a8
Merge "Allow the Bluetooth MAC address to be updated asynchronously (2/3)" am: c5680c9b05
...
am: 16609dfe18
2017-04-21 01:30:21 +00:00
Felipe Leme
584033675e
Merge "Fixed NPE on dump() and other minor fixes..." into oc-dev
...
am: dbc020983d
2017-04-21 01:25:39 +00:00
TreeHugger Robot
dbc020983d
Merge "Fixed NPE on dump() and other minor fixes..." into oc-dev
2017-04-21 01:20:23 +00:00
Phil Weaver
3f5a6d144d
Merge "Fix a11y text location in clipped views" into oc-dev
...
am: 6a60322157
2017-04-21 01:17:44 +00:00
TreeHugger Robot
6a60322157
Merge "Fix a11y text location in clipped views" into oc-dev
2017-04-21 01:11:12 +00:00
Felipe Leme
01ded104a1
Implemented FillResponse.setIgnoredIds().
...
Fixes: 37424141
Test: existing CtsAutoFillServiceTestCases pass
Test: PartitionedActivityTest.testIgnoredFieldsDontTriggerAutofill
Change-Id: I09bd95230c45d2970080514e25cb53320de49b56
2017-04-20 17:38:27 -07:00
Sunny Goyal
e068539229
Merge "Renaming setAsyncExecutor to setExecutor" into oc-dev
...
am: 82629345c8
2017-04-21 00:38:07 +00:00
TreeHugger Robot
82629345c8
Merge "Renaming setAsyncExecutor to setExecutor" into oc-dev
2017-04-21 00:31:11 +00:00
Phil Weaver
3865998741
Merge "Hide API to listen to a11y service state" into oc-dev
...
am: 4a5ea54710
2017-04-21 00:20:43 +00:00
Phil Weaver
4a5ea54710
Merge "Hide API to listen to a11y service state" into oc-dev
2017-04-21 00:11:08 +00:00
George Mount
d11fa9b032
Merge "Kill running animations on fragment view's when removed." into oc-dev
...
am: dcc7feb329
2017-04-21 00:06:58 +00:00
