Bo Zhu
4e7fbda633
Merge "Add an API to check whether the recoverable keystore is enabled" into pi-dev
...
am: 4d1b57dad3
Change-Id: I07106b9b06f290d6d464a8d5bfbf82d90e95e000
2018-04-11 09:21:14 -07:00
Bo Zhu
4d1b57dad3
Merge "Add an API to check whether the recoverable keystore is enabled" into pi-dev
2018-04-11 15:58:27 +00:00
Tim Volodine
234d296360
Merge "[WebView Tracing API] documentation fixes." into pi-dev
...
am: 4800d9a9e7
Change-Id: I226ef118f27661a94502e990ba89ad662f63f583
2018-04-11 07:56:25 -07:00
TreeHugger Robot
4800d9a9e7
Merge "[WebView Tracing API] documentation fixes." into pi-dev
2018-04-11 14:38:02 +00:00
Florian Mayer
3975415df5
Merge "Address API comments on NetworkStats#getDefaultNetwork." into pi-dev
...
am: f1657a827f
Change-Id: Ic7356df8144ca41a89bfbf194155bc41058a200d
2018-04-11 07:15:16 -07:00
Robert Berry
ed11ba6182
Merge "Update docs to match encryption requirements" into pi-dev
...
am: bfa13fe76f
Change-Id: I81f6a613bc8ef123ce33f53bfc6a44092d72a7a9
2018-04-11 07:10:28 -07:00
Florian Mayer
f1657a827f
Merge "Address API comments on NetworkStats#getDefaultNetwork." into pi-dev
2018-04-11 13:55:51 +00:00
Robert Berry
bfa13fe76f
Merge "Update docs to match encryption requirements" into pi-dev
2018-04-11 13:49:45 +00:00
Jan Althaus
796df0800b
Merge "Minor TextClassifier fixes" into pi-dev
...
am: b6bba33399
Change-Id: Ie054c977d952b9ed9a256c99ef6721a7c0f6c306
2018-04-11 05:33:46 -07:00
Jan Althaus
b6bba33399
Merge "Minor TextClassifier fixes" into pi-dev
2018-04-11 12:19:43 +00:00
Lenka Trochtova
99aac99341
Merge "Hide mandatory backup's API." into pi-dev
...
am: a9431996c3
Change-Id: Iba9983509efc0e4e6dbe0d7c0665547f6fec5be0
2018-04-11 05:16:18 -07:00
Jan Althaus
13a89c9403
Minor TextClassifier fixes
...
- Fix incorrect nullable annotation (usage/APIs already correct)
- Fix outdated doc reference
- Fixed visibility of TextClassification fields
Bug: 74461129
Test: N/A
Change-Id: I107cc978c9385ac2ad706fa8e0a8a3ecb215cf36
2018-04-11 13:03:43 +02:00
Lenka Trochtova
27fd8217c1
Hide mandatory backup's API.
...
Bug: 77801801
Bug: 73750212
Bug: 64012357
Test: make RunFrameworksServicesRoboTests
Test: cts-tradefed run cts -m CtsDevicePolicyManagerTestCases --test
com.android.cts.devicepolicy.DeviceOwnerTes
cts-tradefed run cts -m CtsBackupHostTestCase
Change-Id: I7699755309b3fbff7c3fec2a06a0f409fd4087de
2018-04-11 12:33:28 +02:00
Lorenzo Colitti
6dba3936a2
Address API comments on NetworkStats#getDefaultNetwork.
...
Bug: 76449091
Test: android.app.usage.cts.NetworkUsageStatsTest passes
Change-Id: I7f21e0bd7bc4b726058fc2e25542ff2c3173fabe
2018-04-11 10:11:12 +00:00
Suprabh Shukla
03026cb894
Merge "Review of suspend/unsuspend APIs" into pi-dev
...
am: 2188383b8a
Change-Id: Ied0b92474f80760f084fd749587fce0953c8469b
2018-04-11 00:55:38 -07:00
TreeHugger Robot
2188383b8a
Merge "Review of suspend/unsuspend APIs" into pi-dev
2018-04-11 07:36:38 +00:00
Pavel Maltsev
1b8c42d15f
Merge "Remove unwanted capabilitiy from the java-doc" into pi-dev
...
am: 1856d61f9a
Change-Id: I7fef43cce3cfe17dae6a5e4f564ad8857371502a
2018-04-10 20:58:01 -07:00
Remi NGUYEN VAN
448cf3b116
Merge "Do not register callback for < MIN_THRESHOLD_BYTES" into pi-dev
...
am: 788f87dab6
Change-Id: I7aab9434ab9b11fe588c057a4c2b774b09ad71d2
2018-04-10 20:46:55 -07:00
TreeHugger Robot
1856d61f9a
Merge "Remove unwanted capabilitiy from the java-doc" into pi-dev
2018-04-11 03:26:22 +00:00
Remi NGUYEN VAN
788f87dab6
Merge "Do not register callback for < MIN_THRESHOLD_BYTES" into pi-dev
2018-04-11 03:18:57 +00:00
Amith Yamasani
5cca011bd1
Merge "API Review: Rename getStandbyBucket to getAppStandbyBucket" into pi-dev
...
am: 555767b616
Change-Id: Ifb257e127e028c2edfaf16ed2785cb92e60e7705
2018-04-10 20:12:47 -07:00
Julia Reynolds
f4bf387e9d
Merge "Ensure colors for active permission icons" into pi-dev
...
am: 46d03c2914
Change-Id: I10b3e82a207d542a4761687c08927841eba09ba5
2018-04-10 19:49:55 -07:00
TreeHugger Robot
555767b616
Merge "API Review: Rename getStandbyBucket to getAppStandbyBucket" into pi-dev
2018-04-11 02:38:26 +00:00
Phil Weaver
1c2e91165c
Merge "Notify a11y when view attached to parent" into pi-dev
...
am: 7a65c44d03
Change-Id: I639f9133b5a10003b44f4a4e78894042a3adaa03
2018-04-10 19:23:08 -07:00
TreeHugger Robot
46d03c2914
Merge "Ensure colors for active permission icons" into pi-dev
2018-04-11 02:22:01 +00:00
Jason Monk
a1bb34ac1f
Merge "List<SliceSpec> -> Set<SliceSpec>" into pi-dev
...
am: 3c33d2b997
Change-Id: I5afdd7f0a7e00de6305b3a930bf432a351df8d7b
2018-04-10 18:58:45 -07:00
TreeHugger Robot
7a65c44d03
Merge "Notify a11y when view attached to parent" into pi-dev
2018-04-11 01:49:57 +00:00
Tim Volodine
90980b4208
[WebView Tracing API] documentation fixes.
...
Some fixes to the WebView Tracing API related documentation.
In particular this patch makes sure that:
- the defaults are correct,
- the examples are correct,
- the formatting is ok,
- the text for parameters etc.. is formatted consistently,
- the documentation is spellchecked and typos corrected.
BUG: 63750258
Test: manual inspection of the generated html documentation
Change-Id: I53ac1a1d003e519739464b8d8554f3d8262c46e4
2018-04-11 02:48:56 +01:00
Suprabh Shukla
96212bca06
Review of suspend/unsuspend APIs
...
Clarified the package extras bundle returned from
getSuspendedPackageAppExtras.
Moved the bundle arg to the last in LauncherApps.onPackagesSuspended and
clarified the contents of the Bundle.
isPackageSuspended(String) now throws a NameNotFoundException if the
package is not found.
Also, removed a permission check from isPackageSuspendedForUser.
Test: builds, boots, existing tests:
atest com.android.server.pm.SuspendPackagesTest
Bug: 77518983, 77517955, 77507744, 77801528
Change-Id: I06b5f69f8f8a079c206863cb6122e90be58366cd
2018-04-10 17:34:12 -07:00
Jason Monk
2d3932eb4d
List<SliceSpec> -> Set<SliceSpec>
...
Test: update-api
Bug: 73123786
Change-Id: I5668023eda0efcadf40a20259a92624e6680659f
2018-04-10 20:25:51 -04:00
Jason Monk
fa220e219b
Merge "Revert "List<SliceSpec> -> Set<SliceSpec>"" into pi-dev
...
am: 9107b53c6d
Change-Id: I392e8d905457bcd11a7d83bc330d992636e9e407
2018-04-10 17:14:38 -07:00
Jason Monk
9107b53c6d
Merge "Revert "List<SliceSpec> -> Set<SliceSpec>"" into pi-dev
2018-04-11 00:00:26 +00:00
Jason Monk
e280990dd6
Revert "List<SliceSpec> -> Set<SliceSpec>"
...
This reverts commit e2a04b3ea4 .
Bug: 73123786
Change-Id: I1f09893fb3c68650340495f2833eb678099a895f
2018-04-11 00:00:04 +00:00
Jason Monk
67e71049b1
Merge "List<SliceSpec> -> Set<SliceSpec>" into pi-dev
...
am: ae42e1d0c2
Change-Id: I4b5af94ddc84fd7c49b13bc6e072f4cba345d882
2018-04-10 16:48:47 -07:00
Jason Monk
ae42e1d0c2
Merge "List<SliceSpec> -> Set<SliceSpec>" into pi-dev
2018-04-10 23:23:43 +00:00
Bo Zhu
b95c90ce2d
Add an API to check whether the recoverable keystore is enabled
...
Bug: 77690455
Test: It builds
Change-Id: I94be0e341d8a3e0fa9a5f9af8beda60e08a449e8
2018-04-10 14:50:21 -07:00
Julia Reynolds
b887b23ad3
Ensure colors for active permission icons
...
Test: manual
Change-Id: I74c91109efaacad4f7743681877b874f77bda630
Fixes: 74512508
2018-04-10 17:01:00 -04:00
Eugene Susla
03f41ca886
Merge "[DO NOT MERGE] Avoid sending content changed a11y events from wrong views" into pi-dev
...
am: fd34bcc397
Change-Id: Ia1925c5ce2b39fd3e387165d402702e574508c72
2018-04-10 13:42:17 -07:00
Julia Reynolds
9aa4b2b3df
Merge changes I3a35ed86,I74a9c767 into pi-dev
...
am: 02db955ed8
Change-Id: I206953b1112aec235f08107488159dcdbc3453e9
2018-04-10 13:37:28 -07:00
Suprabh Shukla
f283b41a63
Merge "setPackagesSuspended now overwrites all the state" into pi-dev
...
am: e901d69ea6
Change-Id: I0c323bdb3fdbf36a732b383040db5f016db9b212
2018-04-10 13:31:42 -07:00
Eugene Susla
fd34bcc397
Merge "[DO NOT MERGE] Avoid sending content changed a11y events from wrong views" into pi-dev
2018-04-10 20:18:09 +00:00
TreeHugger Robot
02db955ed8
Merge changes I3a35ed86,I74a9c767 into pi-dev
...
* changes:
Update incorrect documentation
Ringer toggle should obey theme color
2018-04-10 20:17:28 +00:00
TreeHugger Robot
e901d69ea6
Merge "setPackagesSuspended now overwrites all the state" into pi-dev
2018-04-10 20:15:24 +00:00
Jason Monk
a68c3352f8
Merge "Slice permissions++" into pi-dev
...
am: 964631d1a7
Change-Id: Ifdb8d967c0f80838e378748e6f80ff6272663293
2018-04-10 12:56:58 -07:00
TreeHugger Robot
964631d1a7
Merge "Slice permissions++" into pi-dev
2018-04-10 19:41:41 +00:00
Seigo Nonaka
0b860336cc
Merge "Update JNI interface of GetBounds in PrecomputedText" into pi-dev
...
am: 42c686861c
Change-Id: I734f1715092ec932f8fc5569c4ecadfc45d9ad66
2018-04-10 12:24:33 -07:00
Jason Monk
e2a04b3ea4
List<SliceSpec> -> Set<SliceSpec>
...
Test: update-api
Bug: 73123786
Change-Id: Ia618a35fbe81d2aeb5f58d58add0a14069f21bed
2018-04-10 19:23:34 +00:00
TreeHugger Robot
42c686861c
Merge "Update JNI interface of GetBounds in PrecomputedText" into pi-dev
2018-04-10 19:06:51 +00:00
Julia Reynolds
82a9cf60f3
Update incorrect documentation
...
Test: make
Change-Id: I3a35ed86600b3b12ced4aecc35a0415e8e05a502
Fixes: 77862126
2018-04-10 14:59:19 -04:00
Amith Yamasani
ff1575f059
API Review: Rename getStandbyBucket to getAppStandbyBucket
...
Change-Id: Ifa0f5d0dba95d8bc6c2af814649594e9ca4a6c47
Fixes: 76831039
Test: Builds
2018-04-10 09:28:38 -07:00