Svet Ganov
bbef731c2d
Merge "Add autofill feature API" into oc-dev
...
am: a402d6dd2f
Change-Id: I5cfa36adbf31c49dffc519963545f388cae4b96d
2017-04-12 21:28:45 +00:00
Dianne Hackborn
ef95ec85ea
Merge "Add API to get a uid's current importance." into oc-dev
...
am: ad6ab44e15
Change-Id: I845cb5fd01ccedd4a95093c56a320ee1f6497dac
2017-04-12 21:27:27 +00:00
Selim Gurun
24d68dc3d8
Merge "Deprecate findAddress() method" into oc-dev
...
am: c68b1a8aef
Change-Id: I667ebcf6a9a18ae5a07a7e0f737abb6162568f83
2017-04-12 21:19:16 +00:00
TreeHugger Robot
a402d6dd2f
Merge "Add autofill feature API" into oc-dev
2017-04-12 21:17:33 +00:00
Dianne Hackborn
ad6ab44e15
Merge "Add API to get a uid's current importance." into oc-dev
2017-04-12 21:11:46 +00:00
Selim Gurun
c68b1a8aef
Merge "Deprecate findAddress() method" into oc-dev
2017-04-12 21:05:07 +00:00
nharold
37f48f4596
Merge changes from topic 'ipsec-api-tweaks' am: fddf677b8b am: 176bfb58c6
...
am: a237a34085
Change-Id: Ie868985d20535f35b869730a4ddaa00dc88a352d
2017-04-12 20:53:17 +00:00
Nathan Harold
3fa4a92b8c
IpSecManager and IpSecAlgorithm API Tweaks am: 6045429b35 am: 9c2428ad4d
...
am: 99c50add4f
Change-Id: I49641308cd0f2ce3e8a7545c8b03108d69287c64
2017-04-12 20:51:41 +00:00
Jesse Evans
3d1676cfc4
Merge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev
...
am: 684b5381e9
Change-Id: I3be91519cbe8b7c3cef474923a30927504e68642
2017-04-12 19:52:07 +00:00
TreeHugger Robot
684b5381e9
Merge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev
2017-04-12 19:39:16 +00:00
nharold
a237a34085
Merge changes from topic 'ipsec-api-tweaks' am: fddf677b8b
...
am: 176bfb58c6
Change-Id: I056e52c4c3bf41ffaf482ebaf4c7b14a9091f3ca
2017-04-12 18:39:15 +00:00
Nathan Harold
99c50add4f
IpSecManager and IpSecAlgorithm API Tweaks am: 6045429b35
...
am: 9c2428ad4d
Change-Id: I6f7e2011a273d10386b72391d12a0ce55f18ffd7
2017-04-12 18:37:23 +00:00
Charles He
fd7eb11a2b
Merge "Disallow direct-boot aware activities to bypass work lock" into oc-dev
...
am: 9f074e2224
Change-Id: Ie57c07ed9caee3ee66847cbedc4b10b79bcd9abe
2017-04-12 18:36:10 +00:00
Nathan Harold
9c2428ad4d
IpSecManager and IpSecAlgorithm API Tweaks
...
am: 6045429b35
Change-Id: I93d58f64834e5a4c7bc1bf03a5baf2eb5364a36d
2017-04-12 18:27:09 +00:00
Charles He
9f074e2224
Merge "Disallow direct-boot aware activities to bypass work lock" into oc-dev
2017-04-12 18:25:49 +00:00
Siyamed Sinir
fcbc2800db
Merge "Do not enforce paragraph constraint for copy ctr" into oc-dev
...
am: 37bfd57ead
Change-Id: I9ccf940b5e2d47bbb29fcb12bea3c20d2ea9ae69
2017-04-12 18:17:57 +00:00
nharold
fddf677b8b
Merge changes from topic 'ipsec-api-tweaks'
...
* changes:
Add FileDescriptor Versions of applyTransportModeTransform()
IpSecManager and IpSecAlgorithm API Tweaks
2017-04-12 18:13:57 +00:00
Siyamed Sinir
37bfd57ead
Merge "Do not enforce paragraph constraint for copy ctr" into oc-dev
2017-04-12 18:09:58 +00:00
Dianne Hackborn
cba1893400
Merge "Add new "work queue" feature to JobScheduler." into oc-dev
...
am: 0a0a63c8b1
Change-Id: I646a3a144833650f9ee7b9727f73ee78c7c82532
2017-04-12 18:02:53 +00:00
Dianne Hackborn
0a0a63c8b1
Merge "Add new "work queue" feature to JobScheduler." into oc-dev
2017-04-12 17:55:56 +00:00
Dianne Hackborn
83249ec4f1
Add API to get a uid's current importance.
...
This is kind-of useful to go along with monitoring
uid importance changes.
Test: none yet
Change-Id: Ic0f8418955d17ea21d06f49dcd9641bc5f32387b
2017-04-12 10:54:31 -07:00
Seigo Nonaka
d40151e581
Merge "Remove unused public APIs." into oc-dev
...
am: feaa8b0f01
Change-Id: I7ffbb8a98d342f12304bb85ce45498790363703c
2017-04-12 17:37:54 +00:00
TreeHugger Robot
feaa8b0f01
Merge "Remove unused public APIs." into oc-dev
2017-04-12 17:31:44 +00:00
George Mount
8a3e638b9c
Merge "Ensure bounds are updated together." into oc-dev
...
am: a968d33edb
Change-Id: I462a00824c15864a5f68cd9a647da68f9119aff0
2017-04-12 17:09:32 +00:00
Seigo Nonaka
4d9842b7e9
Merge "Introduce FILE_ID for TTC fonts and variation fonts." into oc-dev
...
am: 33aae89f29
Change-Id: I8398ce892052a0c3fd67560d3fab25ed15210ee4
2017-04-12 17:07:53 +00:00
TreeHugger Robot
a968d33edb
Merge "Ensure bounds are updated together." into oc-dev
2017-04-12 16:59:33 +00:00
TreeHugger Robot
33aae89f29
Merge "Introduce FILE_ID for TTC fonts and variation fonts." into oc-dev
2017-04-12 16:54:56 +00:00
Svet Ganov
43574b03e5
Add autofill feature API
...
We now have a software feature for autofill which can be used
by partners to disable it on low-end devices or form factors
for which autofill doesn't make sense.
bug:35956220
Test: manual (requires a custom build)
Change-Id: I6c06462ed9ca3ae93331700dce38a8c08dfd0722
2017-04-12 09:53:38 -07:00
Charles He
e7c5ced211
Disallow direct-boot aware activities to bypass work lock
...
Effectively reverting 89927b3cd9 , which
allowed direct-boot aware activities in the work profile to show before
the profile was unlocked. This causes problems with key eviction
introduced in O. Specifically, many system activities (e.g.
ChooserActivity, activities in Settings, etc.) are marked direct-boot
aware, and therefore can be started while the work profile is locked
with key evicted. Currently they either bypass the keyguard when they
should not, or simply crash due to profile still being locked.
In the future, we need to create a new mechanism to allow activities
such as video calls, alarm clocks, etc. to bypass the work keyguard. It
probably involves checking for something like FLAG_SHOW_WHEN_LOCKED.
Bug: 36961785
Bug: 35708183
Bug: 30296144
Test: manual, by following the steps in the bugs quoted
Test: runtest -c com.android.server.am.ActivityManagerServiceTest frameworks-services
Change-Id: I5ccaaf963f3dd96e4abb785a10aa258b15363178
2017-04-12 17:35:07 +01:00
Russell Brenner
47af6876f8
Merge "Add hidden SystemApi for two setup wizard actions" into oc-dev
...
am: 27ce8b0d34
Change-Id: If690b190990b1ca49a5efbc1994b8b09b332630e
2017-04-12 16:15:25 +00:00
TreeHugger Robot
27ce8b0d34
Merge "Add hidden SystemApi for two setup wizard actions" into oc-dev
2017-04-12 16:07:26 +00:00
Mark Salyzyn
b4b44d3bae
Merge "jni: isLoggable: adapt to removal of property name size limit" into oc-dev
2017-04-12 14:49:17 +00:00
Seigo Nonaka
43c20cf6d4
Introduce FILE_ID for TTC fonts and variation fonts.
...
A single TTC font or variation font can be used for multiple entry
of FontResult. To share the file contents, assign same URI for those.
Bug: 36494487
Test: android.provider.FontsContractTest passes
Change-Id: Ibf24f216179a6481dee1801cd2dfb68c4bb38fac
2017-04-12 07:24:21 -07:00
Michael Wright
719d1f06fb
Merge "Always request keyboard shorcuts, even if there's no menu." into oc-dev
...
am: 7ecd40c1fc
Change-Id: I003b2cfcdb10a4d9c999ba9cd575561bf7b70086
2017-04-12 14:23:20 +00:00
TreeHugger Robot
7ecd40c1fc
Merge "Always request keyboard shorcuts, even if there's no menu." into oc-dev
2017-04-12 14:16:10 +00:00
Jesse Evans
fc1bfc442c
Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED
...
Renames the instant apps setting to reflect what it is for.
Adds the SystemApi annotation to make this field visible
to the resolver and installer.
Test: existing tests
Change-Id: I1651bb101d69bdfdaa63c004435025c68a33cd8e
2017-04-12 07:00:51 -07:00
Pavel Grafov
0b512f27be
Merge "Improve javadocs for SecurityLog class." into oc-dev
...
am: a9a2bbc647
Change-Id: I7b6b3d6aa1d27cc09a094b3b01fd6530a2d2ed6c
2017-04-12 12:42:16 +00:00
Pavel Grafov
a9a2bbc647
Merge "Improve javadocs for SecurityLog class." into oc-dev
2017-04-12 12:33:52 +00:00
Jorim Jaggi
11a99404ce
Merge "Fix doc for FLAG_DISMISS_KEYGUARD" into oc-dev
...
am: 39608b8556
Change-Id: I73dad3226b72bc2b76034c42a77e25be75685a29
2017-04-12 05:18:45 +00:00
TreeHugger Robot
39608b8556
Merge "Fix doc for FLAG_DISMISS_KEYGUARD" into oc-dev
2017-04-12 05:11:03 +00:00
Suprabh Shukla
56fa529c28
Merge "Renaming intent action for unknown sources" into oc-dev
...
am: a609bbc9c4
Change-Id: I67e378a818d5fb74e602a32c67eb3299adf36549
2017-04-12 04:45:31 +00:00
Suprabh Shukla
a609bbc9c4
Merge "Renaming intent action for unknown sources" into oc-dev
2017-04-12 04:32:51 +00:00
Julia Reynolds
a38256bb7b
Merge "Allow companion device mgrs channel access" into oc-dev
...
am: de99065a40
Change-Id: I7de72421e62670f69d2d85837868efe0ef019a0a
2017-04-12 01:31:03 +00:00
TreeHugger Robot
de99065a40
Merge "Allow companion device mgrs channel access" into oc-dev
2017-04-12 01:22:52 +00:00
Roozbeh Pournader
c6df994b66
Merge "Keep spans while transforming to uppercase" into oc-dev
...
am: cd3f72d628
Change-Id: Ie93ae0764c46883c46f5d4f5a8996d57aa143b7e
2017-04-12 00:14:26 +00:00
Evan Rosky
97a97c72fd
Merge "Make AdapterView auto-focusable-aware" into oc-dev
...
am: 7d6bf45428
Change-Id: I1f44573ac5aa04c097f7d93298e27d99c54c6ce8
2017-04-12 00:11:54 +00:00
TreeHugger Robot
cd3f72d628
Merge "Keep spans while transforming to uppercase" into oc-dev
2017-04-12 00:02:35 +00:00
Evan Rosky
7d6bf45428
Merge "Make AdapterView auto-focusable-aware" into oc-dev
2017-04-12 00:02:25 +00:00
Russell Brenner
880994d0db
Add hidden SystemApi for two setup wizard actions
...
ACTION_UPGRADE_SETUP exists as an SdkConstant and is now additionally
tagged as a SystemApi. ACTION_DEVICE_INITIALIZATION_WIZARD is added
as a deprecated SystemApi to appease CTS requirements. Both APIs are
hidden.
Test: cts-tradefed run cts-dev -m CtsSignatureTestCases \
-t android.signature.cts.IntentTest#shouldNotFindUnexpectedIntents
Bug: 33663899
Change-Id: Ib45afbfcbb9a3d3020f11c8b63fc2bcf6fc447a1
(cherry picked from commit 4cd32e5395 )
2017-04-11 23:53:20 +00:00
Mark Salyzyn
097487aaaf
Merge "jni: isLoggable: adapt to removal of property name size limit" am: cf39eea407 am: 5f98be7f11
...
am: 3da7584dc4
Change-Id: I2fd96c0c9cae8043bb5fabaa32b542b6965abcf7
2017-04-11 23:44:04 +00:00