Jeff Sharkey
2d3bdf9201
Merge "Move PackageManager to new auto-doc feature!" into oc-dev am: 0a02259bba
...
am: 8203c3694a
2017-04-21 20:35:24 +00:00
Jeff Sharkey
8203c3694a
Merge "Move PackageManager to new auto-doc feature!" into oc-dev
...
am: 0a02259bba
2017-04-21 20:26:59 +00:00
Jeff Sharkey
d85b1ddaeb
Merge "Fix code accounting bugs, track external app data." into oc-dev am: 4b32f7c676
...
am: 90d020d979
2017-04-21 20:20:33 +00:00
TreeHugger Robot
0a02259bba
Merge "Move PackageManager to new auto-doc feature!" into oc-dev
2017-04-21 20:20:08 +00:00
Jeff Sharkey
90d020d979
Merge "Fix code accounting bugs, track external app data." into oc-dev
...
am: 4b32f7c676
2017-04-21 20:10:50 +00:00
Jeff Sharkey
4b32f7c676
Merge "Fix code accounting bugs, track external app data." into oc-dev
2017-04-21 20:01:43 +00:00
Android Build Merger (Role)
5e8fd5372b
Merge "Merge "Update HardwareBuffer API." into oc-dev am: 649040c7f6 am: d5fcb3a45f"
2017-04-21 19:59:22 +00:00
Craig Donner
06da6d21e3
Merge "Update HardwareBuffer API." into oc-dev am: 649040c7f6
...
am: d5fcb3a45f
2017-04-21 19:58:02 +00:00
Kang Li
ee8187688e
Merge "Moved LRResolverRankerService to ExtServices, and added a permission to ensure that ResolverRankerServices are from trust sources."
2017-04-21 19:53:35 +00:00
Dianne Hackborn
215f1ed817
Merge "Fix issue #32180780 : Sync adapters inappropriately being run..." into oc-dev am: 0fa2574ecb
...
am: a97ee07a5c
2017-04-21 19:41:58 +00:00
Craig Donner
d5fcb3a45f
Merge "Update HardwareBuffer API." into oc-dev
...
am: 649040c7f6
2017-04-21 19:40:01 +00:00
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
649040c7f6
Merge "Update HardwareBuffer API." into oc-dev
2017-04-21 19:28:32 +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
f3803338cf
Merge "docs: Update Imageview JavaDoc comments" into oc-dev am: 62a24e9493
...
am: 2bc550372e
2017-04-21 18:53:15 +00:00
Joe Fernandez
8795bd8ee6
Merge "docs: Update TextView JavaDoc comments" into oc-dev am: 28973b3817
...
am: 474b5af269
2017-04-21 18:51:18 +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
4d87d4101b
Merge "Removes colon characters from the doc of EXTRA_CONTENT_ANNOTATIONS." into oc-dev am: 8b4f17be85
...
am: 9d6cb20646
2017-04-21 18:20:11 +00:00
Seigo Nonaka
a691442ce0
Merge "Cache the Typeface based on the FontRequest." into oc-dev am: 5b96e55d90
...
am: a121eabf99
2017-04-21 18:18:19 +00:00
Jeff Sharkey
4347f8147b
Move PackageManager to new auto-doc feature!
...
Test: make -j32 offline-sdk-docs
Bug: 37526420
Change-Id: Ib368042e91be3ed702ede0facaf5c8d8d28853d4
2017-04-21 12:14:49 -06: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
8923e1a0a9
Merge "Removed deprecated SaveInfo methods." into oc-dev am: fc533da920
...
am: 184347912d
2017-04-21 17:43:45 +00:00
Felipe Leme
184347912d
Merge "Removed deprecated SaveInfo methods." into oc-dev
...
am: fc533da920
2017-04-21 17:35:12 +00:00
Julia Reynolds
758635c288
Merge "Remove long standing debug code" into oc-dev am: f74a736add
...
am: ce822b2fb7
2017-04-21 17:31:21 +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
Anthony Chen
6edd7b509e
Merge "Modifications to allow notification header to be customized."
2017-04-21 16:46:09 +00:00
Pavel Grafov
bad9755f50
Merge "Fix javadoc for some user restrictions." into oc-dev am: 9c8bb68071
...
am: 9488302c42
2017-04-21 16:43:08 +00: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
Kang Li
61cf4d145e
Moved LRResolverRankerService to ExtServices, and added a permission to
...
ensure that ResolverRankerServices are from trust sources.
Test: manually shared images in Camera, and in PTP to confirm it works
as expected.
Change-Id: I3549292d424fec949e9115faea7a0c5bdec06e87
2017-04-21 15:44:51 +00:00
Aurimas Liutikas
cfac919a43
Merge "Fix/suppress error-prone warnings in framework's fragment." into oc-dev am: d3892caf95
...
am: f3523dcaab
2017-04-21 15:33:18 +00: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
506847aa92
Merge "Update Typeface callback docs about error codes" into oc-dev am: 337be5a12f
...
am: 5d2334fb7c
2017-04-21 09:55:49 +00: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
