Daniel Cashman
63b447531e
Merge "Add SigningInfo class to expose package signing details." into pi-dev
...
am: 960a0c6c57
Change-Id: I512db4ad4f81da5cdd61bb2de5f3ed0e719379c1
2018-04-11 12:40:33 -07:00
Yangster-mac
0b90c524cb
Merge "Trim the invalid uids and tags when reading uids/tags from chain." into pi-dev
...
am: 9054656c20
Change-Id: I3c67a3842b3444d1dbc068917500db908a383b9c
2018-04-11 12:24:31 -07:00
Daniel Cashman
960a0c6c57
Merge "Add SigningInfo class to expose package signing details." into pi-dev
2018-04-11 19:21:07 +00:00
Jason Monk
df0975bba5
Merge "Fix docs and bug in SliceManager#bindSlice" into pi-dev
...
am: c2375d9b3d
Change-Id: Id7145e9d6432586d295f59b67a4f3b7e44d935b1
2018-04-11 11:56:07 -07:00
Colin Cross
3b11a4cb19
Merge "Revert "Update docs to match encryption requirements"" into pi-dev
...
am: fcbbb72603
Change-Id: I7b66ab3cb2362a6fa91d90b4b7237d6f3760b406
2018-04-11 11:44:45 -07:00
Nathan Harold
adff790058
Merge "[DO NOT MERGE] - Hide Tunnel Mode IpSec API" into pi-dev
...
am: 68e5f0f242
Change-Id: I2542b4dcb94b306e3fe2e3e87051f1bd6a481561
2018-04-11 11:39:56 -07:00
TreeHugger Robot
9054656c20
Merge "Trim the invalid uids and tags when reading uids/tags from chain." into pi-dev
2018-04-11 18:29:40 +00:00
Bookatz
b1d3483102
Merge "StatsManager throws exceptions" into pi-dev
...
am: 6b317915e8
Change-Id: I3de523046404285f3bcc7bfff598393d7c16820d
2018-04-11 11:19:33 -07:00
David Pursell
6f42d1bac2
Merge "MessageQueue: explicitly remove FD event listeners." into pi-dev
2018-04-11 18:05:52 +00:00
Chavi Weingarten
5826a2a7ad
Merge "Synchronize stack position and size update for split screen" into pi-dev
...
am: 9553a11557
Change-Id: Ie9308010a2c856284aca2fdc53304e3b79a080bb
2018-04-11 10:52:25 -07:00
TreeHugger Robot
c2375d9b3d
Merge "Fix docs and bug in SliceManager#bindSlice" into pi-dev
2018-04-11 17:52:22 +00:00
Colin Cross
fcbbb72603
Merge "Revert "Update docs to match encryption requirements"" into pi-dev
2018-04-11 17:28:39 +00:00
Colin Cross
4da1774894
Revert "Update docs to match encryption requirements"
...
This reverts commit cebb55ea9d .
Reason for revert: broke docs builds
Change-Id: I3a4b8d274141efec90fae2ed0b9324194288c635
2018-04-11 17:27:24 +00:00
Mathew Inwood
d39b02157b
Merge "Configurable sampling rate for hidden API access log events." into pi-dev
...
am: fb55bd8706
Change-Id: I734dffcd6c993bf718d6835a734be26de5d76780
2018-04-11 10:19:04 -07:00
Nathan Harold
68e5f0f242
Merge "[DO NOT MERGE] - Hide Tunnel Mode IpSec API" into pi-dev
2018-04-11 17:09:07 +00:00
Adrian Roos
0c4b2b7f63
Merge "DisplayCutout: Draw anti-aliased bounds in soft overlay" into pi-dev
...
am: 2370f368d4
Change-Id: Ifae0d5e2c5bc226eaaf4462dd9b9cb044c8340b8
2018-04-11 10:06:56 -07:00
TreeHugger Robot
6b317915e8
Merge "StatsManager throws exceptions" into pi-dev
2018-04-11 17:02:06 +00:00
Phil Weaver
ca312e6c9f
Merge "Fix AccessibilityEvent#getContentChangeTypes doc" into pi-dev
...
am: 441ef0b94b
Change-Id: I41f5d4b21754b11be1ef7b0613598cd56e999ece
2018-04-11 10:01:04 -07:00
Chavi Weingarten
9553a11557
Merge "Synchronize stack position and size update for split screen" into pi-dev
2018-04-11 16:53:42 +00:00
Mathew Inwood
fb55bd8706
Merge "Configurable sampling rate for hidden API access log events." into pi-dev
2018-04-11 16:45:19 +00:00
TreeHugger Robot
2370f368d4
Merge "DisplayCutout: Draw anti-aliased bounds in soft overlay" into pi-dev
2018-04-11 16:44:32 +00:00
Patrick Baumann
364100b737
Merge "Revert "Check permissions only against packagesettings"" into pi-dev
...
am: 61aebf6d39
Change-Id: Idfe77e93a7dd1f3e87e58c1f323c080ed615a57a
2018-04-11 09:41:34 -07:00
Phil Weaver
441ef0b94b
Merge "Fix AccessibilityEvent#getContentChangeTypes doc" into pi-dev
2018-04-11 16:38:28 +00:00
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
Adrian Roos
51072a8b6f
DisplayCutout: Draw anti-aliased bounds in soft overlay
...
To do so, we cannot use the Region from DisplayCutout, because it is conceptionally
a binary Bitmap. Instead, we need the exact curve as a Path.
Also fixes a theoretical bug where the DisplayCutout
was cached even though the display height changed.
Change-Id: I9356f4589186fedc5dc95010c7bd1a1fa20edf5e
Fixes: 77868940
Test: Enable display cutout in developer options, verify the edges look smoth and not jagged.
Test: atest DisplayCutoutTest
2018-04-11 16:12:29 +00:00
TreeHugger Robot
61aebf6d39
Merge "Revert "Check permissions only against packagesettings"" into pi-dev
2018-04-11 16:05:39 +00: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
Patrick Baumann
97b9b5304c
Revert "Check permissions only against packagesettings"
...
This reverts commit b00eb64591 .
Reason for revert: Boot issues after OTA
Bug: 76228188
Fixes: 77888575
Change-Id: I5ca2605cb6befea46ce50198bc72bdd4b6e84f1a
2018-04-11 14:52:31 +00: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
Jason Monk
5ffacd06ac
Fix docs and bug in SliceManager#bindSlice
...
Test: cts
Change-Id: I812af1eda072c2af0b29454a05ea777d8f4c3c62
Fixes: 73123733
2018-04-11 10:05:57 -04: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