Leon Scroggins
ceb14e015b
Merge changes from topics "DecodeException_ERROR", "AID_autoStart", "onPartialImage" into pi-dev
...
* changes:
Rename ImageDecoder.ERRORs
Add the ability to autoStart AID from xml
Re-write onPartialImage API
2018-03-22 21:53:05 +00:00
TreeHugger Robot
e8582d0ca7
Merge "Fix the heap-after-use in DurationAnomalyTracker" into pi-dev
2018-03-22 21:41:35 +00:00
TreeHugger Robot
827a06d4b4
Merge "Record Bluetooth Cumulative Stats Properly" into pi-dev
2018-03-22 21:39:03 +00:00
TreeHugger Robot
23ceeb3a44
Merge "Fix UidMap proto output error. And fix a bug in MaxDurationTracker." into pi-dev
2018-03-22 21:36:50 +00:00
TreeHugger Robot
e7c26531c0
Merge "Disable Bitmap density scaling to Picture" into pi-dev
2018-03-22 21:34:32 +00:00
Felipe Leme
9bea50471f
Merge "Enable Autofill Field Classification by default." into pi-dev
2018-03-22 21:20:34 +00:00
Jorim Jaggi
a43de8b61a
Merge "Remove old workaround for display issues" into pi-dev
2018-03-22 21:18:49 +00:00
Victor Hsieh
f4f7859149
Merge "Replace pm.dexopt.priv-apps with existing constant" into pi-dev
2018-03-22 21:17:56 +00:00
Nathan Harold
8a047a0c52
Merge "Add AppOp for IpSec Tunnels" into pi-dev
2018-03-22 21:14:36 +00:00
Ying Xu
812319dc7d
Merge "Add more comments for the isConfigForIdentifiedCarrier()" into pi-dev
2018-03-22 21:14:32 +00:00
Dmitry Dementyev
6f2965af79
Merge "Update RECOVER_KEYSTORE permission documentation." into pi-dev
2018-03-22 20:33:34 +00:00
Yao Chen
c219348186
Merge "Remove unsigned-integer-overflow signed-integer-overflow from sanitizer." into pi-dev
2018-03-22 20:24:41 +00:00
Tyler Gunn
3a4d495733
Merge "Rename handover failure constant per API review comments." into pi-dev
2018-03-22 20:22:20 +00:00
Mathieu Chartier
90ad15400a
Merge "Revert "Enable hidden API blacklist"" into pi-dev
2018-03-22 20:11:07 +00:00
David Brazdil
f712b23d56
Revert "Enable hidden API blacklist"
...
This reverts commit 16bfa11b73a34be1f1c72d2ffe86702f85378e92.
Reason for revert: Revert until b/76138670 is fixed
Bug: 64382372
Bug: 76138670
Bug: 76157445
Change-Id: Iaf6c76b773fbea4d4710b38808dee2e7e06f5e78
2018-03-22 20:10:26 +00:00
Julia Reynolds
538ba7ac35
Merge "Update duration text" into pi-dev
2018-03-22 20:04:40 +00:00
Andrew Sapperstein
eae9144add
Merge "Revert "Update material_deep_teal_500 to #008577."" into pi-dev
2018-03-22 19:31:23 +00:00
yinxu
349b644db3
Add more comments for the isConfigForIdentifiedCarrier()
...
This is a clean cherry-pick from:
https://android-review.git.corp.google.com/c/platform/frameworks/base/+/642231
Bug:74945742
Test: Compile
Change-Id: Ife3fdf797ca8877ec495d61a8aeed56fa20282a7
Merged-in: Ife3fdf797ca8877ec495d61a8aeed56fa20282a7
(cherry picked from commit cea0d8d4883c94482d936abd4d097617921c6fa7)
2018-03-22 12:08:51 -07:00
Nathan Harold
33ed612cca
Merge "Add NonNull Annotations To IpSec API Surface" into pi-dev
2018-03-22 18:31:03 +00:00
Makoto Onuki
c7f6eadffc
Merge "Move provider access stats to frameworks/base" into pi-dev
2018-03-22 17:42:13 +00:00
Chong Zhang
9e64c01d02
Merge "heif: fix Exif extraction in mtp database" into pi-dev
2018-03-22 17:39:52 +00:00
Felipe Leme
de6dfd93e5
Merge "Don't allow null ids on FillResponse.Builder.setAuthentication()" into pi-dev
2018-03-22 17:36:18 +00:00
Felipe Leme
b030730aa8
Merge "Fixed autofill service metadata name on javadoc sample." into pi-dev
2018-03-22 17:33:36 +00:00
Bo Zhu
88956ce326
Merge "Remove the hard-coded counterId in VaultParams" into pi-dev
2018-03-22 17:32:10 +00:00
Robert Berry
c6bd185565
Merge "Unhide RecoveryController#getRootCertificates()" into pi-dev
2018-03-22 17:23:05 +00:00
Robert Berry
3818de595b
Merge "Unhide RecoverySession#recoverKeyChainSnapshot() method" into pi-dev
2018-03-22 17:19:33 +00:00
Leon Scroggins III
cf7294fda6
Rename ImageDecoder.ERRORs
...
Bug: 73788969
Test: I501e8b76aacd785cb994165ab01dc1b39fea3a1c
Move them into ImageDecoder.DecodeException, which is where they are
actually used. This also provides some more context, so that the prefix
"ERROR_" is no longer necessary, fixing the redundancy/awkwardness in
ERROR_SOURCE_ERROR. Further rename that to SOURCE_MALFORMED_DATA, which
is more descriptive, and does not imply a Java Error.
Change-Id: Ied17ad343650f9c33d9a35b0f9d00ccc22264bd6
2018-03-22 13:09:02 -04:00
TreeHugger Robot
3bfa02a114
Merge "Make QSTileImpl#mListeners thread safe." into pi-dev
2018-03-22 17:07:01 +00:00
Dmitry Dementyev
59ca9b5f87
Update RECOVER_KEYSTORE permission documentation.
...
Previous comment used outdated name for class managing recoverable
keystore.
Bug: 74976894
Test: none
Change-Id: I44460014d0ac5817d48e16bf281d2bb4ffe06823
2018-03-22 09:36:53 -07:00
Leon Scroggins III
5388f79a45
Disable Bitmap density scaling to Picture
...
Bug: 76144110
Test: I95165583649a1df86782d3684f7bf9bcd8dab7bd
This matches the behavior of DisplayListCanvas. Not scaling means that
we can draw a Bitmap to a Picture, and then play that back in HW mode
and see the same result.
Change-Id: I7421431bad0531112e06ab5c14814b6b6f1591d9
2018-03-22 12:36:22 -04:00
Victor Hsieh
b2d754ce0f
Replace pm.dexopt.priv-apps with existing constant
...
It was missed before during the rename.
Test: build
Bug: 63920015
Change-Id: Icb20a328b3d8acedca06cf6a781443d5611bb43d
2018-03-22 16:26:08 +00:00
Felipe Leme
4e561f83cb
Merge "Renamed AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES." into pi-dev
2018-03-22 16:24:53 +00:00
Fyodor Kupolov
8055aa2434
Merge "Add OWNERS for GlobalSettingsToPropertiesMapper" into pi-dev
2018-03-22 16:21:24 +00:00
TreeHugger Robot
397962981c
Merge "Audio presentation: Docs & Testability fixes" into pi-dev
2018-03-22 16:14:19 +00:00
Wyatt Riley
aa8cbab151
Merge "GNSS Model Name constant string and comment updates" into pi-dev
2018-03-22 16:10:08 +00:00
Felipe Leme
1c6b60581f
Enable Autofill Field Classification by default.
...
Bug: 76028992
Test: locally changed FieldsClassificationTest to not set it
Change-Id: I842124852f76f599a8ac1cb06271ebc3324c36c9
2018-03-22 09:09:27 -07:00
Yao Chen
59cc0a2237
Fix UidMap proto output error. And fix a bug in MaxDurationTracker.
...
Bug: 76118312
Bug: 76145379
Test: adb shell cmd stats dump-report
statsd_test
Change-Id: I9a987525df5b37fcefd5f28700bfa1c3952f6692
2018-03-22 09:07:03 -07:00
Andrew Sapperstein
431d9d63e9
Revert "Update material_deep_teal_500 to #008577."
...
This reverts commit 5c228d5eb975de5e15970ae11ebddf95010875fe.
Reason for revert: Breaks presubmit. b/76126268
Change-Id: Iffd8bbb62d05cae1c2a5dabfab2824899c5ff3cf
Bug: 74118164
Bug: 76126268
Test: presubmit
2018-03-22 15:56:27 +00:00
Felipe Leme
df0b0d380d
Fixed autofill service metadata name on javadoc sample.
...
Bug: 72811034
Test: nope
Change-Id: I0367fa6ad1fa21c51dadb9706830bc50c3139cab
2018-03-22 08:40:52 -07:00
Tyler Gunn
0ab380166d
Rename handover failure constant per API review comments.
...
Expanding EMERG to EMERGENCY.
Test: Build code
Bug: 74831393
Merged-In: Ic0555b20dc508d022c0165a5d9dc3b40b33db70e
Change-Id: Ic0555b20dc508d022c0165a5d9dc3b40b33db70e
(cherry picked from commit a4ef504bdc3044920d4996b93c30751a2fbce217)
2018-03-22 15:34:32 +00:00
Michael Plass
dddd69ef3e
Merge "Add Settings.Global.WIFI_SCORE_PARAMS" into pi-dev
2018-03-22 15:03:51 +00:00
Makoto Onuki
d0b64e6902
Move provider access stats to frameworks/base
...
Bug: 76037330
Test: boot and dumpsys activity provider ContactsProvider2
Change-Id: I69cfe0edc98da00d1212f57871646488f87eb8dd
2018-03-22 07:53:57 -07:00
TreeHugger Robot
3e4df18658
Merge "DO NOT MERGE Revert "DO NOT MERGE Update references to backup/restore agent timeouts"" into pi-dev
2018-03-22 14:04:20 +00:00
Robert Berry
f9332469a4
Merge "Small fix for the key grant alias used in importKey" into pi-dev
2018-03-22 13:55:31 +00:00
Robert Berry
750b71c651
Unhide RecoverySession#recoverKeyChainSnapshot() method
...
The other methods expose raw key materials, which is a security flaw. This
new API is already being used by GMSCore, via reflection (although falling
back to the old methods if it is not available). Would be good to switch it
on ASAP.
Bug: 74345822
Test: Tested with GMSCore
Change-Id: I30d53c9e825888d1122c72d23b7c1c10c6edb1e9
2018-03-22 13:49:54 +00:00
Robert Berry
93d002ca5f
Unhide RecoveryController#getRootCertificates()
...
This is so we can add a GTS test to affirm that GMS devices include the
Google Cloud Key Vault root certificate.
Test: runtest frameworks-core -p android.security.keystore.recovery
Bug: 74621045
Change-Id: Ib6431f5739f3dff066832e6aa300dd9da5bc0727
2018-03-22 13:49:20 +00:00
Robert Berry
98ea60c427
Merge "Unhide the new RecoverySession#start with the alias for root cert" into pi-dev
2018-03-22 13:48:31 +00:00
Artem Iglikov
b873780a3d
DO NOT MERGE Revert "DO NOT MERGE Update references to backup/restore agent timeouts"
...
This reverts commit f77cae61250c727630616b5672df2781e84a7e80.
Reason for revert: crashes SUW
Bug: 76128378
Change-Id: Ia77af64892aa5a03109cc4ef4c2c04b256000ba9
2018-03-22 13:07:34 +00:00
Leon Scroggins III
1dd88daf92
Add the ability to autoStart AID from xml
...
Bug: 73529437
Test: Ic818bbf1091d12631aedd6475d225fa4a708b29c
Change-Id: I4807409895a057e775bfee5dea407e8dc1af94be
2018-03-22 09:05:42 -04:00
Christofer Åkersten
bf121d2f13
Merge "Remove unnecessary Context from ApiLoader" into pi-dev
2018-03-22 11:49:41 +00:00