OSDN Git Service
Yi Jin [Sat, 31 Mar 2018 03:50:36 +0000 (03:50 +0000)]
Merge "Correctly use int types and fix uint64_t print." into pi-dev
am:
53f60f60ee
Change-Id: I34562b9ac0ee2a014b744ff786eaa578ed2061d8
Kevin Chyn [Sat, 31 Mar 2018 03:46:16 +0000 (03:46 +0000)]
Merge "Fingerprint user canceled message should not be delayed" into pi-dev
am:
374f6a26f9
Change-Id: Ibefdb50b12d74d1158a5ed91aaaf12b18310ab61
Makoto Onuki [Sat, 31 Mar 2018 03:41:50 +0000 (03:41 +0000)]
Merge "Fix erroneous protected-broadcast check" into pi-dev
am:
8c6aa94346
Change-Id: I42e5193e8710c4a04adb9ff66d2be21050627b3e
Chenjie Yu [Sat, 31 Mar 2018 03:37:24 +0000 (03:37 +0000)]
Merge "Null pointer check for Bluetooth traffic" into pi-dev
am:
2f6f33fa79
Change-Id: I25156d66b989d23ccf42e303138fcf5e27cc489e
Bookatz [Sat, 31 Mar 2018 03:29:38 +0000 (03:29 +0000)]
Merge "Statsd MAX now obeys refractory periods too" into pi-dev
am:
3b826c6075
Change-Id: I5741106ec3cd5a5d9c7a66796549982936c4f500
Bo Zhu [Sat, 31 Mar 2018 03:16:47 +0000 (03:16 +0000)]
Merge "Expose e.getMessage() from the exceptions in RecoverableKeyStore" into pi-dev
am:
8b60ebc6a6
Change-Id: Ie98c772deea51c25b075a92e2021257f41daf712
Suprabh Shukla [Sat, 31 Mar 2018 03:11:13 +0000 (03:11 +0000)]
Merge "Adding LauncherApps apis for suspended packages" into pi-dev
am:
a6d6a5aa79
Change-Id: I2eb805342fc07944042b4668429a1a3f909cec2a
Jason Monk [Sat, 31 Mar 2018 03:05:38 +0000 (03:05 +0000)]
Merge "Add some methods to manage slice permissios" into pi-dev
am:
35201a6af2
Change-Id: I83f2d375465479e3f4f8af3790c5d42cf20d1c49
Kevin Chyn [Sat, 31 Mar 2018 03:00:00 +0000 (03:00 +0000)]
Merge "Clear fingerprint stats after dump --proto" into pi-dev
am:
0d1debfcff
Change-Id: I213047cf6d62c747c16d8670da3781581f609841
Android Build Merger (Role) [Sat, 31 Mar 2018 02:55:42 +0000 (02:55 +0000)]
Merge "Merge "Make changes to MBMS API following recs" am:
feb60e0864 am:
2fa2a9d06f" into pi-dev-plus-aosp
Hall Liu [Sat, 31 Mar 2018 02:54:39 +0000 (02:54 +0000)]
Merge "Make changes to MBMS API following recs" am:
feb60e0864
am:
2fa2a9d06f
Change-Id: I3b1aef24454fa45ffbbf6bb003743e662eac0353
rago [Sat, 31 Mar 2018 02:53:00 +0000 (02:53 +0000)]
Merge "Dynamics Processing Effect" into pi-dev
am:
d41d56e348
Change-Id: I192dc1b2b980b698695f31f0d1777f9c8c425cfb
John Reck [Sat, 31 Mar 2018 02:46:22 +0000 (02:46 +0000)]
Merge "Fix regression to drawBitmapArray" into pi-dev
am:
a26795a884
Change-Id: I1d9109dc95ec9b99f097bf5f34cdb036373f2332
Pavlin Radoslavov [Sat, 31 Mar 2018 02:41:16 +0000 (02:41 +0000)]
[automerger skipped] Merge "Update Bluetooth codec related strings" am:
d10fd55a91
am:
856fe46a69 -s ours
Change-Id: I01f8230057325a652a4d690cad500429673ef7db
Hall Liu [Sat, 31 Mar 2018 02:36:45 +0000 (02:36 +0000)]
Merge "Make changes to MBMS API following recs"
am:
feb60e0864
Change-Id: I748bdcb23538f7c5e5d9bcc005df32fddd42602a
Xiangyu/Malcolm Chen [Sat, 31 Mar 2018 02:36:05 +0000 (02:36 +0000)]
Merge "Adding debug message inside NetworkServiceCallback." into pi-dev
am:
17d19b7d52
Change-Id: Icfec1153ed29ae096083d3260294b7b580e0285e
TreeHugger Robot [Sat, 31 Mar 2018 02:08:12 +0000 (02:08 +0000)]
Merge "Correctly use int types and fix uint64_t print." into pi-dev
Ruchi Kandoi [Sat, 31 Mar 2018 01:58:59 +0000 (01:58 +0000)]
Merge "Make OMAPI stricter" am:
998ef794a3
am:
43056194a5
Change-Id: I7d19c85a4068ff2cab66f316689fcc25501133c2
TreeHugger Robot [Sat, 31 Mar 2018 01:52:37 +0000 (01:52 +0000)]
Merge "Fingerprint user canceled message should not be delayed" into pi-dev
Daniel Cashman [Sat, 31 Mar 2018 01:47:15 +0000 (01:47 +0000)]
Merge "Require signing cert history certs to be unique." into pi-dev
am:
d05c00fbb6
Change-Id: I003d18660bc920de1bb2378a46836790753447f2
Pavlin Radoslavov [Sat, 31 Mar 2018 01:46:33 +0000 (01:46 +0000)]
Merge "Update Bluetooth codec related strings"
am:
d10fd55a91
Change-Id: Ie28703025f732e33abeac2e7d8121bc93eaa3db9
Ruchi Kandoi [Sat, 31 Mar 2018 01:43:18 +0000 (01:43 +0000)]
Merge "Make OMAPI stricter"
am:
998ef794a3
Change-Id: I34232eea503b3d95b22d4a8fa9e366c857264e78
TreeHugger Robot [Sat, 31 Mar 2018 01:41:57 +0000 (01:41 +0000)]
Merge "Fix erroneous protected-broadcast check" into pi-dev
Brian C. Young [Sat, 31 Mar 2018 01:39:51 +0000 (01:39 +0000)]
Merge "Remove getCurrentUser call to find an alternative" into pi-dev
am:
1b3844cb84
Change-Id: Id2ae3acaf7ac7af3b5d53703f229c60dd86124ac
Calin Juravle [Sat, 31 Mar 2018 01:34:28 +0000 (01:34 +0000)]
Merge "Fix BackgroundDexOptTest" into pi-dev
am:
ddc4e1ab06
Change-Id: Icd564239c493ed402fe9914f52c48da72a3d58db
Benedict Wong [Sat, 31 Mar 2018 01:30:03 +0000 (01:30 +0000)]
[automerger skipped] Merge "Disallow Reserved SPI Allocation" into pi-dev
am:
35147b2dae -s ours
Change-Id: I80f554392a01a4942b5c4927b8ad13d11dd5490a
TreeHugger Robot [Sat, 31 Mar 2018 01:18:34 +0000 (01:18 +0000)]
Merge "Null pointer check for Bluetooth traffic" into pi-dev
TreeHugger Robot [Sat, 31 Mar 2018 01:10:57 +0000 (01:10 +0000)]
Merge "Statsd MAX now obeys refractory periods too" into pi-dev
Nathan Harold [Sat, 31 Mar 2018 01:05:18 +0000 (01:05 +0000)]
[automerger skipped] Disallow Reserved SPI Allocation
am:
0f8c8bb01a -s ours
Change-Id: I64fb79980348f96116ad73893571babe3d7d29a6
Chris Craik [Sat, 31 Mar 2018 00:59:01 +0000 (00:59 +0000)]
Merge "Document expected colors, deprecate old ones" into pi-dev
am:
dbd39fc619
Change-Id: Ie386264b33c3a546cdc0fbdaa6bb461865463558
TreeHugger Robot [Sat, 31 Mar 2018 00:56:22 +0000 (00:56 +0000)]
Merge "Expose e.getMessage() from the exceptions in RecoverableKeyStore" into pi-dev
Brad Ebinger [Sat, 31 Mar 2018 00:53:48 +0000 (00:53 +0000)]
Merge "Unhide @SystemApi Constructor" into pi-dev
am:
77fcc0da3b
Change-Id: Idbf2a71018f1bd06f8445b07fc52bc65cb6776f6
Yangster-mac [Sat, 31 Mar 2018 00:49:16 +0000 (00:49 +0000)]
Merge "Guardrail for dimension in condition in duration tracker." into pi-dev
am:
014432cb67
Change-Id: I5801bf467d7635208b5ed93fa17b6f10fac81de1
TreeHugger Robot [Sat, 31 Mar 2018 00:39:52 +0000 (00:39 +0000)]
Merge "Adding LauncherApps apis for suspended packages" into pi-dev
Evan Rosky [Sat, 31 Mar 2018 00:34:15 +0000 (00:34 +0000)]
Merge "Restored focusableViewAvailable logic on visibility change" into pi-dev
am:
4d0a5fd7e7
Change-Id: I4f4805629698d306fbb8f40e3b62e0f2ca99ad8c
Amin Shaikh [Sat, 31 Mar 2018 00:29:24 +0000 (00:29 +0000)]
Merge "Control the QS label marquees." into pi-dev
am:
b17c2388a5
Change-Id: I6e8f0108af5c63129c692da65cf65ffb7c935d25
Hall Liu [Sat, 31 Mar 2018 00:28:06 +0000 (00:28 +0000)]
Merge "Make changes to MBMS API following recs"
TreeHugger Robot [Sat, 31 Mar 2018 00:26:06 +0000 (00:26 +0000)]
Merge "Add some methods to manage slice permissios" into pi-dev
Kevin Chyn [Sat, 31 Mar 2018 00:22:11 +0000 (00:22 +0000)]
Merge "Clear fingerprint stats after dump --proto" into pi-dev
Treehugger Robot [Sat, 31 Mar 2018 00:16:42 +0000 (00:16 +0000)]
Merge "Update Bluetooth codec related strings"
Tarandeep Singh [Sat, 31 Mar 2018 00:16:40 +0000 (00:16 +0000)]
Merge "Disable optimize startInput in IMMS" into pi-dev
am:
d44712584a
Change-Id: I57195512dfba25d2d2133055ce2069fd5720fbe0
Yi Jin [Fri, 30 Mar 2018 18:01:58 +0000 (11:01 -0700)]
Correctly use int types and fix uint64_t print.
Bug:
74118023
Test: atest incidentd_test and atest incident_helper
Change-Id: I951021c12e3d0dc5c83a1bbb03fa0d64d99c0920
TreeHugger Robot [Sat, 31 Mar 2018 00:05:32 +0000 (00:05 +0000)]
Merge "Dynamics Processing Effect" into pi-dev
TreeHugger Robot [Sat, 31 Mar 2018 00:03:49 +0000 (00:03 +0000)]
Merge "Fix regression to drawBitmapArray" into pi-dev
Xiangyu/Malcolm Chen [Sat, 31 Mar 2018 00:02:10 +0000 (00:02 +0000)]
Merge "Adding debug message inside NetworkServiceCallback." into pi-dev
Makoto Onuki [Fri, 30 Mar 2018 23:46:19 +0000 (16:46 -0700)]
Fix erroneous protected-broadcast check
This happens because isPermittedShellBroadcast() is called twice,
one for runtime receivers and the other manifest receivers, and
when SysUI sends a broadcast to its own runtime receiver, another
check also happens for manifest receivers but there's no receivers.
Fixes:
77154348
Test: Manual test with the following steps:
- adb shell dumpsys battery unplug
- adb shell settings delete secure low_power_manual_activation_count
- adb shell settings delete secure low_power_warning_acknowledged
- adb shell settings delete secure suppress_auto_battery_saver
- Then enable battery saver
- Make sure there's no error on logcat.
Change-Id: I9e4305016e10059bd067f06d05433102864b2036
Chenjie Yu [Fri, 30 Mar 2018 23:41:38 +0000 (16:41 -0700)]
Null pointer check for Bluetooth traffic
Bug:
77340376
Change-Id: I558c020636564437e040097a2d0f86519c343c4a
Fix:
77340376
Test: manual test
Rohan Shah [Fri, 30 Mar 2018 23:43:44 +0000 (23:43 +0000)]
Merge "Revert "[Notif] Disable "Customize" for blocking helper"" into pi-dev
am:
13c78d15d8
Change-Id: I8f46afcb00e1bbee4e64803163e3a814ab2bf71b
Amin Shaikh [Fri, 30 Mar 2018 23:39:30 +0000 (23:39 +0000)]
Merge "Update QS edit layout." into pi-dev
am:
6a8ea4fe24
Change-Id: I1fb88d70ac7568085c774fb5d75a54218c4e271d
TreeHugger Robot [Fri, 30 Mar 2018 23:35:54 +0000 (23:35 +0000)]
Merge "Require signing cert history certs to be unique." into pi-dev
Howard Ro [Fri, 30 Mar 2018 23:35:17 +0000 (23:35 +0000)]
Merge "Remove bad configs by counting the number of statsd deaths" into pi-dev
am:
ea16812ad2
Change-Id: I623f417660ee57f106cf8aa87641873c1242b0dd
Yi Jin [Fri, 30 Mar 2018 23:30:40 +0000 (23:30 +0000)]
Merge "Use unique_fd with the clear ownership." into pi-dev
am:
1ebfc94aa1
Change-Id: I478af4173025470829785ef99e0444609c36ddf0
Ruchi Kandoi [Fri, 30 Mar 2018 23:29:08 +0000 (23:29 +0000)]
Merge "Make OMAPI stricter"
TreeHugger Robot [Fri, 30 Mar 2018 23:26:38 +0000 (23:26 +0000)]
Merge "Remove getCurrentUser call to find an alternative" into pi-dev
Bookatz [Fri, 30 Mar 2018 23:21:17 +0000 (16:21 -0700)]
Statsd MAX now obeys refractory periods too
The logic of where refractory period enforcement was moved out of the
anomaly tracker and into the metric's predictAnomalyTimestamp. It was
done for ORING, but not for MAX. This fixes MAX.
Bug:
74446029
Test: adb sync data && adb shell data/nativetest64/statsd_test/statsd_test
Change-Id: I51e43c7c132f424af8fe20a37f2ad10cc55b5989
Calin Juravle [Fri, 30 Mar 2018 23:12:31 +0000 (23:12 +0000)]
Merge "Fix BackgroundDexOptTest" into pi-dev
Chenjie Yu [Fri, 30 Mar 2018 23:09:17 +0000 (23:09 +0000)]
Merge "Clean up atoms.proto" into pi-dev
am:
9fef2594f3
Change-Id: If643c3ebd8800c1d55d20a21850e9b56e35acfab
Ruchi Kandoi [Tue, 27 Mar 2018 17:03:34 +0000 (10:03 -0700)]
Make OMAPI stricter
- Channel implements java.nio.Channels.Channel.
- openBasicChannel(aid) and openLogicalChannel(aid) is added back.
- Add finalizers for the classes.
- SecureElementListener -> onConnectedListener
Bug:
76448978
Test: CtsOmapiTestCases
Change-Id: I7f92c4dcb5c08a72d32ac9440872ab853badec1d
Rahul Frias [Fri, 30 Mar 2018 23:02:15 +0000 (23:02 +0000)]
Merge "Clarified app behavior on REQUEST_TYPE_NONE" into pi-dev
am:
1b7162ad3d
Change-Id: I58f01676399514276b18d633bce4638dc179b66c
Benedict Wong [Fri, 30 Mar 2018 22:57:46 +0000 (22:57 +0000)]
[automerger skipped] Merge changes from topic "encap-api" into pi-dev
am:
36f2d8a4e1 -s ours
Change-Id: I19ea85409c7b8653a734e74afc092959e91a0aad
Kevin Chyn [Fri, 30 Mar 2018 22:26:03 +0000 (15:26 -0700)]
Fingerprint user canceled message should not be delayed
The user canceled message is different than the other fingerprint errors
since it is caused by the user explicitly tapping on the UI at which
point the dialog will be already dismissing/dismissed. So the error
should be sent immediately to the application.
Test: manual test with FingerprintDialog, modified to show when the
error messages are received
Change-Id: Ia2a3b0a7ac9c8cfcbd6055045a95fc06aa02c61a
Fixes:
77337939
Benedict Wong [Fri, 30 Mar 2018 22:29:26 +0000 (22:29 +0000)]
Merge "Disallow Reserved SPI Allocation" into pi-dev
Android Build Merger (Role) [Fri, 30 Mar 2018 22:28:59 +0000 (22:28 +0000)]
Merge "[automerger skipped] Require explicitly supplied truncation length am:
bfa67c81bf -s ours" into pi-dev-plus-aosp
TreeHugger Robot [Fri, 30 Mar 2018 22:28:25 +0000 (22:28 +0000)]
Merge "Document expected colors, deprecate old ones" into pi-dev
Benedict Wong [Fri, 30 Mar 2018 22:28:03 +0000 (22:28 +0000)]
[automerger skipped] Require explicitly supplied truncation length
am:
bfa67c81bf -s ours
Change-Id: I873ba85ee623a445c2ade21f656bd56e8a0fdeed
Android Build Merger (Role) [Fri, 30 Mar 2018 22:21:14 +0000 (22:21 +0000)]
Merge "Merge "Remove SignalClusterView in favor of IconManager" into pi-dev am:
eff51d566a" into pi-dev-plus-aosp
Evan Laird [Fri, 30 Mar 2018 22:20:44 +0000 (22:20 +0000)]
Merge "Remove SignalClusterView in favor of IconManager" into pi-dev
am:
eff51d566a
Change-Id: I38db8aab0ca303c854520a12eca062596dea1da3
Android Build Merger (Role) [Fri, 30 Mar 2018 22:17:39 +0000 (22:17 +0000)]
Merge "[automerger skipped] Merge "Fix socket leaks in various android.net.Network methods." am:
34ce11f2bd am:
f6ab9a5f96 -s ours" into pi-dev-plus-aosp
Paul Jensen [Fri, 30 Mar 2018 22:17:07 +0000 (22:17 +0000)]
[automerger skipped] Merge "Fix socket leaks in various android.net.Network methods." am:
34ce11f2bd
am:
f6ab9a5f96 -s ours
Change-Id: I6da127bed317ba1faf995ebb0236d91774782acb
Rohan Shah [Fri, 30 Mar 2018 22:16:05 +0000 (22:16 +0000)]
Merge "[Notif] Disable "Customize" for blocking helper" into pi-dev
am:
21ba6eff91
Change-Id: I21f6901af21779376c81ff35a5ec50c9ea270b3a
Vishwath Mohan [Fri, 30 Mar 2018 22:11:54 +0000 (22:11 +0000)]
Merge "Don't clear mPattern when clearing visual pattern." into pi-dev
am:
74d7f50597
Change-Id: I37e2d7e65048d4b4f0cf581bab04ea20baf7837b
Leon Scroggins III [Fri, 30 Mar 2018 22:07:10 +0000 (22:07 +0000)]
Remove chaining from ImageDecoder setters
am:
d9b53a097d
Change-Id: Ie8fa1121f804d3e20af03c910ac6001fe0c79bcf
Paul Jensen [Fri, 30 Mar 2018 22:03:22 +0000 (22:03 +0000)]
Merge "Fix socket leaks in various android.net.Network methods."
am:
34ce11f2bd
Change-Id: I1a59fced1f3bcd19bd48150ca215093dff431619
Brian C. Young [Fri, 30 Mar 2018 21:54:45 +0000 (21:54 +0000)]
Merge "Enable "Unlocked device required" API" into pi-dev
am:
1e0a9b0b1b
Change-Id: I5b7e01621d8c9432af06519993b8d65bbb5c6d7e
Jason Monk [Fri, 30 Mar 2018 21:48:11 +0000 (21:48 +0000)]
Merge "Add auto-grant permission slice API" into pi-dev
am:
4ced90cb12
Change-Id: I1cafb654553e62e8720d6c8b101328d5227dc545
Hall Liu [Wed, 28 Mar 2018 22:54:07 +0000 (15:54 -0700)]
Make changes to MBMS API following recs
* Change all error handling logic to return an error code via the async
callback
* Add an UNKNOWN code for errors for future backwards compatibility, and
prohibit the middleware from sending this code.
* Add IntDef for errors through the async callback
* Amend documentation for download()
* Implement support for arranging downloaded files into a hierarchy
following that of the server.
Change-Id: I4d5c8f6229b216d9aa84397e628e62279033cc74
Fixes:
76449215
Test: CTS
Brian C. Young [Fri, 30 Mar 2018 21:03:15 +0000 (14:03 -0700)]
Remove getCurrentUser call to find an alternative
The call the framework uses to get the current user ID requires the
INTERACT_ACROSS_USERS permission, which not a lot of apps will have.
Find a better way to do that.
Bug:
76430246
Test: CtsKeystoreTestCases
Change-Id: I8a0637d351fff9cfbf40e02946325f90466b68c5
Brad Ebinger [Fri, 30 Mar 2018 21:36:35 +0000 (21:36 +0000)]
Merge "Unhide @SystemApi Constructor" into pi-dev
TreeHugger Robot [Fri, 30 Mar 2018 21:27:11 +0000 (21:27 +0000)]
Merge "Guardrail for dimension in condition in duration tracker." into pi-dev
Evan Rosky [Fri, 30 Mar 2018 21:23:32 +0000 (21:23 +0000)]
Merge "Restored focusableViewAvailable logic on visibility change" into pi-dev
Suprabh Shukla [Tue, 27 Mar 2018 05:35:13 +0000 (22:35 -0700)]
Adding LauncherApps apis for suspended packages
The suspending app can provide a Bundle of information to be used by the
launcher for handling suspended packages. Added APIs:
- getSuspendedPackageLauncherExtras(String, UserHandle): To retrieve
the launcher extras for the given package and user.
- Callback#onPackagesSuspended(String[], UserHandle, Bundle): A
callback that will be invoked with the package names and the launcher
extras whenever sent packages are suspended.
Test: atest com.android.server.pm.SuspendPackagesTest
Bug:
76119578
Change-Id: I505d134809639a57c3314f994af34d576d905e74
TreeHugger Robot [Fri, 30 Mar 2018 21:13:04 +0000 (21:13 +0000)]
Merge "Control the QS label marquees." into pi-dev
TreeHugger Robot [Fri, 30 Mar 2018 21:08:07 +0000 (21:08 +0000)]
Merge "Disable optimize startInput in IMMS" into pi-dev
Victor Hsieh [Fri, 30 Mar 2018 21:08:07 +0000 (21:08 +0000)]
Merge "Fix fs-verity per fs-verity spec change" into pi-dev
am:
01a0288ca1
Change-Id: I4d7aade7fe59008cd31073584fc0973f0ebc234a
Rohan Shah [Fri, 30 Mar 2018 21:05:07 +0000 (21:05 +0000)]
Merge "Revert "[Notif] Disable "Customize" for blocking helper"" into pi-dev
Calin Juravle [Fri, 30 Mar 2018 19:38:59 +0000 (12:38 -0700)]
Fix BackgroundDexOptTest
Test: atest BackgroundDexOptServiceIntegrationTests
Bug:
76425903
Change-Id: I19b72b95ee19ebe1807e1ce108a39dec6196a097
Rohan Shah [Fri, 30 Mar 2018 20:54:37 +0000 (20:54 +0000)]
Revert "[Notif] Disable "Customize" for blocking helper"
This reverts commit
3cfc950708fe22ded741da9e99ac0b86a0de763c.
Reason for revert:
Apparently a breakage got through treehugger - I hadn't synced my changes and one of the params was incorrect. Reverting for now and rebasing before resubmit...
Bug:
77321231
Change-Id: Ib306759d6344a69f17331a6c3c9cc78d1345508b
John Reck [Fri, 30 Mar 2018 21:00:57 +0000 (21:00 +0000)]
Merge "Fix MemoryFileTest coretest" into pi-dev
am:
ae202c6fda
Change-Id: I6988af543849b69fb859cfb2e2e384be03fb62b5
TreeHugger Robot [Fri, 30 Mar 2018 21:00:06 +0000 (21:00 +0000)]
Merge "Update QS edit layout." into pi-dev
Howard Ro [Fri, 30 Mar 2018 20:58:51 +0000 (20:58 +0000)]
Merge "Remove bad configs by counting the number of statsd deaths" into pi-dev
Yi Jin [Fri, 30 Mar 2018 20:53:30 +0000 (20:53 +0000)]
Merge "Use unique_fd with the clear ownership." into pi-dev
Treehugger Robot [Fri, 30 Mar 2018 20:52:42 +0000 (20:52 +0000)]
Merge "Fix socket leaks in various android.net.Network methods."
TreeHugger Robot [Fri, 30 Mar 2018 20:48:09 +0000 (20:48 +0000)]
Merge "Clean up atoms.proto" into pi-dev
John Reck [Fri, 30 Mar 2018 20:44:35 +0000 (13:44 -0700)]
Fix regression to drawBitmapArray
253f2c213f6ecda63b6872aee77bd30d5ec07c82 accidentally
broke drawBitmapArray with hasAlpha=false. Revert the change
made as we have no need to support colorspaces in this
deprecated API
Change-Id: If858fad870faee33cc32e3361d0869351f6b0857
Fixes:
77310904
Test: sample app in bug
Rahul Frias [Fri, 30 Mar 2018 20:33:24 +0000 (20:33 +0000)]
Merge "Clarified app behavior on REQUEST_TYPE_NONE" into pi-dev
Benedict Wong [Fri, 30 Mar 2018 20:28:19 +0000 (20:28 +0000)]
Merge changes from topic "encap-api" into pi-dev
* changes:
Require explicitly supplied truncation length
Clarify UDP encapsulation socket API
TreeHugger Robot [Fri, 30 Mar 2018 20:22:16 +0000 (20:22 +0000)]
Merge "Remove SignalClusterView in favor of IconManager" into pi-dev
Roshan Pius [Fri, 30 Mar 2018 20:15:57 +0000 (20:15 +0000)]
Merge "wifi metrics(proto): Add scan throttling metrics" into pi-dev
am:
09a42e9553
Change-Id: I7eb5d12578c6810bc96e02795313cbf5fc24f3e5
Bo Zhu [Fri, 30 Mar 2018 19:20:06 +0000 (12:20 -0700)]
Expose e.getMessage() from the exceptions in RecoverableKeyStore
Bug:
77327780
Test: runtest frameworks-services -p \
com.android.server.locksettings.recoverablekeystore
Change-Id: Ibf04d6405e6468bfdfef0a8cb8e6e96bffbbf3a2
Pavlin Radoslavov [Fri, 30 Mar 2018 20:07:54 +0000 (20:07 +0000)]
Merge "Update Bluetooth codec related strings" into pi-dev
am:
68458a5148
Change-Id: I0d78d63c8ac749e96f648c20ae68677de3d6ec24
OSDN Git Service
