OSDN Git Service
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
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: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
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
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
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
Hugo Benichi [Fri, 21 Apr 2017 01:58:14 +0000 (01:58 +0000)]
Merge "Add BitUtils (from "Support multiple filters per association request")"
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
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
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
Felipe Leme [Fri, 21 Apr 2017 01:25:39 +0000 (01:25 +0000)]
Merge "Fixed NPE on dump() and other minor fixes..." into oc-dev
am:
dbc020983d
Change-Id: I659fe602b3ae98da50e7a771e74c334570979b30
Stanley Tng [Fri, 21 Apr 2017 01:25:00 +0000 (01:25 +0000)]
Merge "Allow the Bluetooth MAC address to be updated asynchronously (2/3)"
am:
c5680c9b05
Change-Id: I63e35a957feb76517fb7559ecb6ac114109341ee
TreeHugger Robot [Fri, 21 Apr 2017 01:20:19 +0000 (01:20 +0000)]
Merge "Fixed NPE on dump() and other minor fixes..." into oc-dev
Phil Weaver [Fri, 21 Apr 2017 01:17:44 +0000 (01:17 +0000)]
Merge "Fix a11y text location in clipped views" into oc-dev
am:
6a60322157
Change-Id: Ia0bc461e0d7e1c4b5a10952c3a52b314a6a22379
Treehugger Robot [Fri, 21 Apr 2017 01:16:31 +0000 (01:16 +0000)]
Merge "Allow the Bluetooth MAC address to be updated asynchronously (2/3)"
TreeHugger Robot [Fri, 21 Apr 2017 01:11:07 +0000 (01:11 +0000)]
Merge "Fix a11y text location in clipped views" into oc-dev
Felipe Leme [Thu, 20 Apr 2017 22:58:30 +0000 (15:58 -0700)]
Implemented FillResponse.setIgnoredIds().
Fixes:
37424141
Test: existing CtsAutoFillServiceTestCases pass
Test: PartitionedActivityTest.testIgnoredFieldsDontTriggerAutofill
Change-Id: I09bd95230c45d2970080514e25cb53320de49b56
Sunny Goyal [Fri, 21 Apr 2017 00:38:07 +0000 (00:38 +0000)]
Merge "Renaming setAsyncExecutor to setExecutor" into oc-dev
am:
82629345c8
Change-Id: I11e9363b75490c5ca689f0b750cc948c98136f74
Jesse Evans [Fri, 21 Apr 2017 00:36:06 +0000 (00:36 +0000)]
Merge "browserIntent needs proper flags for PendingIntent" into oc-dev
am:
a8851447ef
Change-Id: Ie5a3c4c96c7a8a41b630ff5c84f8d03eedaa95c6
TreeHugger Robot [Fri, 21 Apr 2017 00:31:05 +0000 (00:31 +0000)]
Merge "Renaming setAsyncExecutor to setExecutor" into oc-dev
TreeHugger Robot [Fri, 21 Apr 2017 00:30:15 +0000 (00:30 +0000)]
Merge "browserIntent needs proper flags for PendingIntent" into oc-dev
Phil Weaver [Fri, 21 Apr 2017 00:20:43 +0000 (00:20 +0000)]
Merge "Hide API to listen to a11y service state" into oc-dev
am:
4a5ea54710
Change-Id: Iab5cd8541580b114ad2679c5127444182b87a9bf
Phil Weaver [Fri, 21 Apr 2017 00:11:03 +0000 (00:11 +0000)]
Merge "Hide API to listen to a11y service state" into oc-dev
George Mount [Fri, 21 Apr 2017 00:06:58 +0000 (00:06 +0000)]
Merge "Kill running animations on fragment view's when removed." into oc-dev
am:
dcc7feb329
Change-Id: If86dd400ef47c543bd62d621f6a16cecf178014b
Bill Yi [Fri, 21 Apr 2017 00:02:11 +0000 (17:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1add27afc0da8fbc26654fe0b82e194fe5b72514
Auto-generated-cl: translation import
Philip P. Moltmann [Thu, 20 Apr 2017 22:19:06 +0000 (15:19 -0700)]
Correctly compute visible views
addToSet needs the same set as parameters as it returns. Otherwise the
returned set it overrridden.
In this case only the last visible view was added as the set was
overriden with the invisible views.
Test: CtsAutoFillTestCases
Fixes:
37550229
Change-Id: I80e16cbd8a1af83373d7ea7b0f84a7c4d157119f
George Mount [Thu, 20 Apr 2017 23:57:22 +0000 (23:57 +0000)]
Merge "Execute pending transactions after FM state change." into oc-dev
am:
d58d802c5f
Change-Id: I03dd1d557b83bd98086330fd2006ec194be62b1b
TreeHugger Robot [Thu, 20 Apr 2017 23:52:41 +0000 (23:52 +0000)]
Merge "Kill running animations on fragment view's when removed." into oc-dev
TreeHugger Robot [Thu, 20 Apr 2017 23:51:03 +0000 (23:51 +0000)]
Merge "Execute pending transactions after FM state change." into oc-dev
Felipe Leme [Thu, 20 Apr 2017 23:47:48 +0000 (23:47 +0000)]
Merge "Added missing important-for-autofill mappings." into oc-dev
am:
b8305e9186
Change-Id: I5f229b698cea897cc63e42991084194b272c8c30
Wale Ogunwale [Thu, 20 Apr 2017 23:45:13 +0000 (16:45 -0700)]
Ignore request to add starting window if already visible
No need to display a starting winow for an app that already has its
main window visible and drawn.
Test: manual
Change-Id: Ibb6c74d0c5cc91cef335749d7546001fff1f7678
Fixes:
37199644
Michael Plass [Thu, 20 Apr 2017 23:45:35 +0000 (23:45 +0000)]
Merge "Deprecate BSSID Hostlist system API" into oc-dev
am:
5fc916d852
Change-Id: I8b4b1b2b90e8d141b416adbc53c3e10ba64c2a86
TreeHugger Robot [Thu, 20 Apr 2017 23:43:33 +0000 (23:43 +0000)]
Merge "Added missing important-for-autofill mappings." into oc-dev
Michael Plass [Thu, 20 Apr 2017 23:37:47 +0000 (23:37 +0000)]
Merge "Deprecate BSSID Hostlist system API" into oc-dev
Andrii Kulian [Thu, 20 Apr 2017 23:02:47 +0000 (16:02 -0700)]
Always create display content with system identity
If an app tried to use a virtual display that it had just created
and add a window to it before it was registered in WM, WM would try
to create a DisplayContent instance. This would be executed with
app's calling identity and fail permission check.
This CL ensures that we always clear the calling identity before
creating display content.
Bug:
37422998
Test: android.display.cts.VirtualDisplayTest#testPrivateVirtualDisplay
Change-Id: I442cca65055886b384a28eeefcc35f2a36e482d0
Stanley Tng [Tue, 18 Apr 2017 05:35:45 +0000 (22:35 -0700)]
Allow the Bluetooth MAC address to be updated asynchronously (2/3)
There are intermittent issues where either the returned Bluetooth
MAC address to Java framework is uninitialized or this address update
arrives too late. This fix will do 2 things:
(1) Returns error when MAC address is unavailable in the native code.
(2) Updates the MAC address later by adding a new broadcast event.
Test: Check address for these cases: factory reset, system reboot, and
Bluetooth re-enable.
Bug:
36709382
Change-Id: I09720193e38fdf9139e1bb146f8e1847e2b65b1a
Christopher Tate [Thu, 20 Apr 2017 23:24:31 +0000 (16:24 -0700)]
Fix #
37305009 : Beam crash in secondary users
The background-policy check for a-priori app uids needs to be an appId
check rather than nominal uid.
Along the way, even though the code is not invoked after the boot
sequence currently, make the "is this uid on the a-priori list?"
check thread safe.
Bug
37305009
Test: manual
Change-Id: I7c2525f86e73b213057cd4b7f327191ec20c4a6d
Hyunyoung Song [Tue, 14 Mar 2017 07:58:33 +0000 (00:58 -0700)]
Support fraction type for inset* for InsetDrawable.
b/
36024318
Test: manually tested on default icons.
Test: $ runtest --path=cts/tests/tests/graphics/src/android/graphics/drawable/cts/InsetDrawableTest.java
adb shell am instrument -e class 'android.graphics.drawable.cts.InsetDrawableTest' -w 'android.graphics.cts/android.support.test.runner.AndroidJUnitRunner'
android.graphics.drawable.cts.InsetDrawableTest:........................
Time: 0.132
OK (26 tests)
Change-Id: Ie8d24680b6884e65017f07723a371120f5ae610c
Jeff Sharkey [Thu, 20 Apr 2017 05:24:18 +0000 (23:24 -0600)]
Auto-generate docs based on annotations.
We have a handful of annotations that we've been sprinkling across
the platform APIs, such as @Nullable, @NonNull, @IntDef, etc. It
would be really helpful to surface these contracts to developers
through the SDK docs.
This change allows annotations like those mentioned above to declare
the following new javadoc fields:
@memberDoc: docs to append to a field or method definition.
@paramDoc: docs to append to a @param definition.
@returnDoc: docs to append to a @return definition.
This change also builds a docstring to describe the list of all
constants listed in an @IntDef annotation. Sadly AnnotationDesc
only passes along raw constant values, so we need the help of the
new "prefix" annotation argument to help find the field names.
Test: builds
Bug:
37526420
Change-Id: I4cfc00dd904e5dfa945b406d546e36846b7c0c28
Yang Ni [Thu, 20 Apr 2017 22:58:37 +0000 (22:58 +0000)]
Merge "Validates Intrinsic Blur only takes 2D Allocations" am:
b44f4d2f51 am:
0962a6e83c
am:
cfe40aa165
Change-Id: I7f191c2da99f310b4af599ab4849daeb90eb7497
Felipe Leme [Thu, 20 Apr 2017 22:46:18 +0000 (15:46 -0700)]
Fixed NPE on dump() and other minor fixes...
Bug:
36871500
Test: manual verification
Change-Id: I1c3a8406344280da37b728eae56f26447c48e0b2
Yang Ni [Thu, 20 Apr 2017 22:53:05 +0000 (22:53 +0000)]
Merge "Validates Intrinsic Blur only takes 2D Allocations" am:
b44f4d2f51
am:
0962a6e83c
Change-Id: I0b3c582cc9627567b4942eead98cdb0a2406d7c6
Yang Ni [Thu, 20 Apr 2017 22:47:34 +0000 (22:47 +0000)]
Merge "Validates Intrinsic Blur only takes 2D Allocations"
am:
b44f4d2f51
Change-Id: Ib2f8f8206fb77fad99c67d48b839231108e8d0cc
Yang Ni [Thu, 20 Apr 2017 22:37:20 +0000 (22:37 +0000)]
Merge "Validates Intrinsic Blur only takes 2D Allocations"
Sunny Goyal [Thu, 20 Apr 2017 22:25:47 +0000 (15:25 -0700)]
Renaming setAsyncExecutor to setExecutor
Bug:
37534990
Test: Tests updated
Change-Id: I9ea467d05b4ac4d96c23d53750727096a511686d
Jason Monk [Thu, 20 Apr 2017 22:26:58 +0000 (22:26 +0000)]
Merge "Fix status bar not hiding quickly" into oc-dev
am:
b0806f1006
Change-Id: Ie20ce6f63587222c2c0552078cf2846534cfa4c7