Commit Graph

5553 Commits

Author SHA1 Message Date
Makoto Onuki
1bfe94164f Merge "Change IMPORTANCE_PERCEPTIBLE_DEPRECATED to IMPORTANCE_PERCEPTIBLE_PRE_26" into oc-dev am: 301663a61b
am: 27521581fb

Change-Id: I8b0443ccf4a876b4de0d6de6d1af7909a4dee00e
2017-04-27 20:32:27 +00:00
Makoto Onuki
301663a61b Merge "Change IMPORTANCE_PERCEPTIBLE_DEPRECATED to IMPORTANCE_PERCEPTIBLE_PRE_26" into oc-dev 2017-04-27 20:03:22 +00:00
Chad Brubaker
d65e8e8326 Merge "Allow apps to provide the Instant App installer extra information" into oc-dev am: a9d0e6b205
am: f4488dabd5

Change-Id: I6310b54fc3f5e11feb926fe904d33c4cf67db669
2017-04-27 19:51:45 +00:00
Chad Brubaker
a9d0e6b205 Merge "Allow apps to provide the Instant App installer extra information" into oc-dev 2017-04-27 19:30:57 +00:00
Stefan Ramsauer
ba9ab17434 Merge "Fix parameter name mismatch in getResourceIdentifier." into oc-dev 2017-04-27 15:09:26 +00:00
Kang Li
dd207179ee Merge "Adds a comment to EXTRA_CONTENT_ANNOTATIONS to prevent developers from using colons in their customized annotations." into oc-dev am: 6b36aeb491
am: f595898fca

Change-Id: I970ac51e7f71cf15ce710956f698c27d463b107e
2017-04-27 07:40:13 +00:00
TreeHugger Robot
6b36aeb491 Merge "Adds a comment to EXTRA_CONTENT_ANNOTATIONS to prevent developers from using colons in their customized annotations." into oc-dev 2017-04-27 07:26:14 +00:00
TreeHugger Robot
f147688149 Merge "Address API Council feedback." into oc-dev 2017-04-27 06:26:04 +00:00
Makoto Onuki
e92f79450a Change IMPORTANCE_PERCEPTIBLE_DEPRECATED to IMPORTANCE_PERCEPTIBLE_PRE_26
Also make sure to return the legacy value from
RunningAppProcessInfo.importance.

Bug: 37636026

Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l INFO -m CtsAppTestCases -t 'android.app.cts.ActivityManagerTest#testGetRunningAppProcesses'
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l INFO -m CtsAppTestCases -t 'android.app.cts.ActivityManagerTest#testGetMyMemoryState'
Test: cts-tradefed run cts-dev --skip-device-info --skip-preconditions --skip-system-status-check com.android.compatibility.common.tradefed.targetprep.NetworkConnectivityChecker -a armeabi-v7a -l INFO -m CtsAppTestCases -t 'android.app.cts.AlertWindowsTests'
Change-Id: Ie04e4dfa40c28ea391ae5ce3c769c6f8ee70a43d
2017-04-26 16:12:43 -07:00
Chad Brubaker
0606861de5 Allow apps to provide the Instant App installer extra information
Apps may want to provide additional context information to the instant
app installer in order to allow the installer to make smarter choices
about the context of the launch. This CL adds a bundle to
ActivityOptions that is sent to the Installer (if an Instant App is
launched) but not to any other application if something else on the
device handles the Intent instead.

Bug: 35180854
Test: manual
Change-Id: Ifc69a420a9c68041b39acd8a4b83db8a789822a6
2017-04-26 14:01:48 -07:00
Nathan Harold
35eb324bf1 Merge "Hide IpSecManager, IpSecTransform, and IpSecAlgorithm" into oc-dev 2017-04-26 18:03:00 +00:00
nharold
17472fa1c1 Merge "Hide IpSecManager, IpSecTransform, and IpSecAlgorithm" am: 01e368f26d am: 939528045a am: 52dab83f7a
am: 9f218096de

Change-Id: Id67890a061c4e7aef91c7dea61e8706cfdd6bc6e
2017-04-26 17:52:39 +00:00
nharold
9f218096de Merge "Hide IpSecManager, IpSecTransform, and IpSecAlgorithm" am: 01e368f26d am: 939528045a
am: 52dab83f7a

Change-Id: I3bf240b35c3d509c4e016ffe20519c1bda5ab0b3
2017-04-26 17:38:58 +00:00
Kang Li
2f85e8a317 Adds a comment to EXTRA_CONTENT_ANNOTATIONS to prevent developers from
using colons in their customized annotations.

bug: 37496130
Test: skipped, because all changes are in comments.
Change-Id: Ifd7592c50f5079bb6035b051bf63f986c7cbae84
2017-04-26 16:38:14 +00:00
Nathan Harold
ac11ccb1f6 Hide IpSecManager, IpSecTransform, and IpSecAlgorithm
These classes, originally planned to be part of the
public API, are not ready for public consumption.
They are planned to be un-hidden in a future release.

Bug: 37681043
Test: make update-api and make
Change-Id: I8caccd3f8455341cb56a2256354eacbadedff047
2017-04-26 06:50:54 +00:00
Todd Kennedy
047c869e48 Merge "Merge "Add concept of implicitly exposed components" into oc-dev am: 0a4b7f5a86" into oc-dev-plus-aosp
am: eeb311e47d

Change-Id: I3857f3d588497024caab36d6a3a11f9374018c78
2017-04-26 01:16:00 +00:00
Jeff Sharkey
e00742f4c5 Merge "Fix some issues found by new doclava linter." into oc-dev am: a00c7c0a99
am: db73950734

Change-Id: I388d85c9eedccee594832e9947e2f8f095fbb10d
2017-04-26 00:41:04 +00:00
Eugene Susla
43371da3ad Merge "Remove underscore from Companion service name" into oc-dev am: 885b5f4466
am: 56620feed0

Change-Id: I3a35f668dde82a8ccb1094988943039b4c93e4fa
2017-04-26 00:36:49 +00:00
Nathan Harold
bd62d6aff2 Hide IpSecManager, IpSecTransform, and IpSecAlgorithm
These classes, originally planned to be part of the
public API, are not ready for public consumption.
They are planned to be un-hidden in a future release.

Bug: 37681043
Test: make update-api and make
Merged-In: I8caccd3f8455341cb56a2256354eacbadedff047
Change-Id: I8caccd3f8455341cb56a2256354eacbadedff047
(cherry picked from commit e38565fc74ee19e27175782be3cf2f0dffefd3a6)
2017-04-25 16:53:50 -07:00
TreeHugger Robot
0a4b7f5a86 Merge "Add concept of implicitly exposed components" into oc-dev 2017-04-25 23:50:21 +00:00
Jeff Sharkey
a00c7c0a99 Merge "Fix some issues found by new doclava linter." into oc-dev 2017-04-25 22:11:01 +00:00
TreeHugger Robot
885b5f4466 Merge "Remove underscore from Companion service name" into oc-dev 2017-04-25 21:26:15 +00:00
Steve McKay
76b2770214 Address API Council feedback.
Bug: 37422306, 37419881
Test: Build and read docs.
Change-Id: Id6c8bad6ad6b311017094ce5dbd66cfd72c477ad
(cherry picked from commit d74a3bd7d1)
2017-04-25 21:03:45 +00:00
TreeHugger Robot
d3104d7bbe Merge "Address API Council feedback." 2017-04-25 20:53:43 +00:00
Todd Kennedy
c05f5d12d9 Add concept of implicitly exposed components
Implicitly exposed components are those that can still be accessed
via generic startActivity() calls. However, they cannot be started
by specifying a package or component. Additionally, package info
can't be obtained if the package only has implicitly shared
components.

Change-Id: I404a4dff87559cfeee6ad78f7dcc7f5d849d6869
Fixes: b_37343345
Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.EphemeralTest
2017-04-25 13:34:23 -07:00
Jeff Sharkey
0f3f60b576 Fix some issues found by new doclava linter.
Add missing API annotations for permissions and SdkConstants, and
invoke doclava with new "-android" flag.

Test: make -j32 offline-sdk-docs
Bug: 37526420
Change-Id: I970bb2655eb568fd25004636f134c794663a6c33
2017-04-25 13:12:45 -06:00
Svetoslav Ganov
2f7c057db9 Merge "Move child package feature behind sys prop" into oc-dev am: 6b3263a6e2
am: f9b00d77b8

Change-Id: Id647581dc8826b2b872440caab817e1a0385b0e6
2017-04-25 04:09:16 +00:00
Svet Ganov
a3c4eb35b1 Move child package feature behind sys prop
Now one can do adb shell setprop/getptop to change
"persist.sys.child_packages_enabled" to true/false to
control whether child packages are supported.

Test: manual

bug:36107077

Change-Id: Ie60e255fd3c248905906cdd5b10adae074c0b717
2017-04-25 00:19:53 +00:00
Jeff Sharkey
1f14b1509c Merge "Even more auto-doc work." into oc-dev am: 880f4f4cc2
am: 9652eef0b2

Change-Id: I96c77c62b6ee3b5acaa45e116d35c7114797a0b8
2017-04-24 22:43:34 +00:00
Todd Kennedy
d35aa3c8c6 Merge "Merge "Remove @TestApi annotation" into oc-dev am: 1ab9119f50" into oc-dev-plus-aosp
am: 3855f370d9

Change-Id: I9bb1800ea0b3adba259994300aa7f54eb1a0e5cf
2017-04-24 21:17:04 +00:00
Steve McKay
d74a3bd7d1 Address API Council feedback.
Bug: 37422306, 37419881
Test: Build and read docs.
Change-Id: Id6c8bad6ad6b311017094ce5dbd66cfd72c477ad
2017-04-24 13:36:51 -07:00
Jeff Sharkey
30e06bb668 Even more auto-doc work.
Update docs based on what new lint detector found.  Add new @IntDef
to parameters or methods returning constants or flags, and add
@RequiresPermission to methods mentioning permissions.

Test: make -j32 offline-sdk-docs
Bug: 37526420
Change-Id: I7f640f7883fcb66b911a52ae93b83f77306571ec
2017-04-24 13:20:46 -06:00
Jeff Sharkey
e01a56bb66 Merge "More auto-doc work." into oc-dev am: 6bc03748a7
am: f25b285706

Change-Id: Ic6b7c359259b6fd809b1a01ba249a7b44e15a29f
2017-04-24 18:37:08 +00:00
TreeHugger Robot
f7a8befbec Merge "Add PC feature flag" 2017-04-24 17:54:13 +00:00
TreeHugger Robot
1ab9119f50 Merge "Remove @TestApi annotation" into oc-dev 2017-04-24 15:35:51 +00:00
Nicolas Geoffray
9cea1d28dd Drop REASON_FORCED_DEXOPT.
This can already be configured with the default compiler filter.

Also remove unused performDexOptIfNeeded.

bug:35794392
Test: device boots, forced dexopt works.
Change-Id: I14fc86c4783b2d7ac9cf8972b6619ba303e79659
(cherry picked from commit e103256c1f)
2017-04-24 10:44:31 +00:00
Nicolas Geoffray
04fbbec585 Merge "Drop REASON_FORCED_DEXOPT." 2017-04-24 10:42:46 +00:00
Jeff Sharkey
6bc03748a7 Merge "More auto-doc work." into oc-dev 2017-04-22 19:11:34 +00:00
Sudheer Shanka
a9a28a17b9 Merge "Fix a spelling." into oc-dev am: 1939550fba
am: ba16a5b5e9

Change-Id: Ibde673514841f823df5bc2c7e6a1220955537d26
2017-04-22 02:45:24 +00:00
TreeHugger Robot
1939550fba Merge "Fix a spelling." into oc-dev 2017-04-22 02:32:39 +00:00
Stefan Ramsauer
2e6886550a Fix parameter name mismatch in getResourceIdentifier.
Test: No test since change is NOP.
Change-Id: Id069f18e7e75f3b34448cfbabb8ba84d7bb18d87
(cherry picked from commit dd48cc8ad4)
2017-04-21 23:47:43 +00:00
Adam Lesinski
ea957eb6d2 Merge "Propagate density through AdaptiveIconDrawable and BitmapDrawable" into oc-dev am: 5be3647a9e
am: 091fe96343

Change-Id: Ib313379b085c4d3ee435b22bb844aeeef6ff74cf
2017-04-21 23:40:31 +00:00
Stefan Ramsauer
a3ced1c0af Merge "Fix parameter name mismatch in getResourceIdentifier." 2017-04-21 22:37:35 +00:00
Dennis Kempin
7345ed5065 Add PC feature flag
This CL adds a feature flags for traditional clamshell and desktop
computing devices. It can be used by apps to specifically target
those device types (such as Chromebooks) and by the framework to
recognize apps that have been designed for that form-factor.

Bug: 37359238
Test: None
Change-Id: Ie10443583997bcf1bff0b44da31af3f144f7aa0b
2017-04-21 15:37:02 -07:00
TreeHugger Robot
5be3647a9e Merge "Propagate density through AdaptiveIconDrawable and BitmapDrawable" into oc-dev 2017-04-21 22:35:57 +00:00
Jeff Sharkey
910e081216 More auto-doc work.
Add support for AnyThread, CallSuper, and UiThread.

Another related CL started documenting @RequiresPermission, so remove
duplicated information in existing APIs.

Suppress auto-doc on a handful of classes that are already
well-documented.

Test: make -j32 offline-sdk-docs
Bug: 37526420
Change-Id: I791437dccec0f11d5349a23b982ba098cb551af8
2017-04-21 16:35:08 -06:00
Jeff Sharkey
2d3bdf9201 Merge "Move PackageManager to new auto-doc feature!" into oc-dev am: 0a02259bba
am: 8203c3694a

Change-Id: I4bb0d19647db20e91d06602322fab6914a891d8e
2017-04-21 20:35:24 +00:00
Adam Lesinski
50954d2b4e Propagate density through AdaptiveIconDrawable and BitmapDrawable
Resources#getDrawableForDensity now propagates the overridden
density through to AdaptiveIconDrawable so that the density can be
propagated to leaf BitmapDrawables correctly.

This enables AdaptiveIconDrawable to support higher resolution
foreground/background bitmaps for use in Launcher.

Bug: 36039665
Test: bit CtsContentTestCases:android.content.res.cts.ResourcesTest
Change-Id: Iaa9a5592626e38e1ff839a76f7c6cfb9e16e5dc1
2017-04-21 13:25:44 -07:00
TreeHugger Robot
0a02259bba Merge "Move PackageManager to new auto-doc feature!" into oc-dev 2017-04-21 20:20:08 +00:00
Stefan Ramsauer
dd48cc8ad4 Fix parameter name mismatch in getResourceIdentifier.
Test: No test since change is NOP.
Change-Id: Id069f18e7e75f3b34448cfbabb8ba84d7bb18d87
2017-04-21 12:25:11 -07:00