OSDN Git Service
Torne (Richard Coles) [Fri, 23 Mar 2018 01:41:53 +0000 (01:41 +0000)]
Merge "Don't try to create a process group when not root." into pi-dev
am:
5526509f17
Change-Id: If2278523802ed4c29ff2b63641b72d31c2a5fbb9
Philip P. Moltmann [Fri, 23 Mar 2018 01:34:08 +0000 (01:34 +0000)]
Merge "Allow apps to call startRecognition(UUID, Bundle, ComponentName, RecognitionConfig) via reflection" into pi-dev
am:
a93efabc24
Change-Id: I13a35a1fbfd26bdb646823b258914299620807dc
Abodunrinwa Toki [Fri, 23 Mar 2018 01:26:34 +0000 (01:26 +0000)]
Merge "Fix smart_linkify_enabled flag." into pi-dev
am:
e9a7cb8158
Change-Id: I8789a58acd22898dfa0ff301132efbafbf8ab8d8
Amin Shaikh [Fri, 23 Mar 2018 01:18:25 +0000 (01:18 +0000)]
Merge "QS edit mode fixes." into pi-dev
am:
c6de4240d5
Change-Id: I33179a69d3805e454e04655e8760c8d322d89377
Matthew Ng [Fri, 23 Mar 2018 01:10:21 +0000 (01:10 +0000)]
Merge "Fixes hiding track for quick scrub" into pi-dev
am:
4fb9723faa
Change-Id: I08ceb806a1bd89e8ec58968e06c4aa6286a7baa3
Adrian Roos [Fri, 23 Mar 2018 00:59:36 +0000 (00:59 +0000)]
Merge "PhoneWindowTest: promote to presubmit" into pi-dev
am:
7fd2abdf41
Change-Id: I0c8031cb69a7176b877ff00462f2dfb555be24be
Rose Liu [Fri, 23 Mar 2018 00:51:52 +0000 (00:51 +0000)]
Merge "Assign -1 as default value of window type and owner uid." into pi-dev
am:
a194d92495
Change-Id: I8169e627f61659dc27ba7caa452cc2bc4f69efd7
Felipe Leme [Fri, 23 Mar 2018 00:39:16 +0000 (00:39 +0000)]
Merge "Removed urlBarResourceId." into pi-dev
am:
3a31f6c5cc
Change-Id: Ic039210e17b1f49d4232b97acdd46befcbd896d3
Suprabh Shukla [Fri, 23 Mar 2018 00:09:48 +0000 (00:09 +0000)]
Merge "APIs to suspend packages with SUSPEND_APPS permission" into pi-dev
am:
6affc07065
Change-Id: Icd9ccea90cac3b367b74915f76d39d7f5f740687
Amin Shaikh [Fri, 23 Mar 2018 00:04:17 +0000 (00:04 +0000)]
Merge "Listen to all attached QS pages." into pi-dev
am:
fc16c4b3c4
Change-Id: Ia92a611955f44889602a8d6bb1e630abc4a06578
Julia Reynolds [Thu, 22 Mar 2018 23:58:37 +0000 (23:58 +0000)]
Merge "Add vol up + power ringer toggle gesture" into pi-dev
am:
224e2fb2ef
Change-Id: I3b15061159a345a006dc0f5f532e93291ca1b383
Leon Scroggins [Thu, 22 Mar 2018 23:43:38 +0000 (23:43 +0000)]
Merge changes from topics "DecodeException_ERROR", "AID_autoStart", "onPartialImage" into pi-dev
am:
ceb14e015b
Change-Id: I92ffd12b6e8df360a86733ca99676cd8f470addb
Leon Scroggins III [Thu, 22 Mar 2018 23:38:55 +0000 (23:38 +0000)]
Add the ability to autoStart AID from xml
am:
1dd88daf92
Change-Id: I01fc7e34b4e2909f6984b9266e237f3cc9f08432
Leon Scroggins III [Thu, 22 Mar 2018 23:34:41 +0000 (23:34 +0000)]
Re-write onPartialImage API
am:
1d2bf2b846
Change-Id: I7436bbe89b9efd9a406958b14f79294e982c5b3a
Ivan Podogov [Thu, 22 Mar 2018 23:13:16 +0000 (23:13 +0000)]
Merge "HIDD: Address API Review concerns" am:
8085d6f247
am:
6c64e83577
Change-Id: Ibcdc31fcb01a583ca05c056b2063f77c0f4dbeb6
Ivan Podogov [Thu, 22 Mar 2018 23:03:17 +0000 (23:03 +0000)]
Merge "HIDD: Address API Review concerns"
am:
8085d6f247
Change-Id: I7f4e272657874b02d122f7ddc291c0f006eeee30
TreeHugger Robot [Thu, 22 Mar 2018 23:00:54 +0000 (23:00 +0000)]
Merge "Don't try to create a process group when not root." into pi-dev
TreeHugger Robot [Thu, 22 Mar 2018 23:00:31 +0000 (23:00 +0000)]
Merge "Allow apps to call startRecognition(UUID, Bundle, ComponentName, RecognitionConfig) via reflection" into pi-dev
TreeHugger Robot [Thu, 22 Mar 2018 22:56:58 +0000 (22:56 +0000)]
Merge "Fix smart_linkify_enabled flag." into pi-dev
TreeHugger Robot [Thu, 22 Mar 2018 22:51:09 +0000 (22:51 +0000)]
Merge "QS edit mode fixes." into pi-dev
TreeHugger Robot [Thu, 22 Mar 2018 22:43:28 +0000 (22:43 +0000)]
Merge "Fixes hiding track for quick scrub" into pi-dev
TreeHugger Robot [Thu, 22 Mar 2018 22:41:40 +0000 (22:41 +0000)]
Merge "PhoneWindowTest: promote to presubmit" into pi-dev
Yao Chen [Thu, 22 Mar 2018 22:40:57 +0000 (22:40 +0000)]
Merge "Fix the heap-after-use in DurationAnomalyTracker" into pi-dev
am:
e8582d0ca7
Change-Id: I48a6624f0621bebd42806c148e58da1c13c6db31
Mike Ma [Thu, 22 Mar 2018 22:35:58 +0000 (22:35 +0000)]
Merge "Record Bluetooth Cumulative Stats Properly" into pi-dev
am:
827a06d4b4
Change-Id: I9086e4560f676693329a42ac71194ff1e64e8222
Yao Chen [Thu, 22 Mar 2018 22:32:07 +0000 (22:32 +0000)]
Merge "Fix UidMap proto output error. And fix a bug in MaxDurationTracker." into pi-dev
am:
23ceeb3a44
Change-Id: I0fd1b8d930fb87e144193b9d3911b3a00c3113af
Rose Liu [Thu, 22 Mar 2018 22:27:50 +0000 (22:27 +0000)]
Merge "Assign -1 as default value of window type and owner uid." into pi-dev
TreeHugger Robot [Thu, 22 Mar 2018 22:22:30 +0000 (22:22 +0000)]
Merge "Removed urlBarResourceId." into pi-dev
Leon Scroggins III [Thu, 22 Mar 2018 22:19:46 +0000 (22:19 +0000)]
Merge "Disable Bitmap density scaling to Picture" into pi-dev
am:
e7c26531c0
Change-Id: I44ee1a14af2ef7f2743e7105e6cc04b9afdac460
TreeHugger Robot [Thu, 22 Mar 2018 22:15:31 +0000 (22:15 +0000)]
Merge "APIs to suspend packages with SUSPEND_APPS permission" into pi-dev
Felipe Leme [Thu, 22 Mar 2018 22:14:20 +0000 (22:14 +0000)]
Merge "Enable Autofill Field Classification by default." into pi-dev
am:
9bea50471f
Change-Id: I49f3c8c84c06aa2ab8f5ed7f0a8695d8a7306778
TreeHugger Robot [Thu, 22 Mar 2018 22:07:37 +0000 (22:07 +0000)]
Merge "Listen to all attached QS pages." into pi-dev
Jorim Jaggi [Thu, 22 Mar 2018 22:06:07 +0000 (22:06 +0000)]
Merge "Remove old workaround for display issues" into pi-dev
am:
a43de8b61a
Change-Id: I8852443ed74f94a60975b74c192a1ac65ad20dd1
Julia Reynolds [Thu, 22 Mar 2018 22:03:48 +0000 (22:03 +0000)]
Merge "Add vol up + power ringer toggle gesture" into pi-dev
Leon Scroggins [Thu, 22 Mar 2018 21:53:05 +0000 (21:53 +0000)]
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
Treehugger Robot [Thu, 22 Mar 2018 21:50:57 +0000 (21:50 +0000)]
Merge "HIDD: Address API Review concerns"
Victor Hsieh [Thu, 22 Mar 2018 21:47:04 +0000 (21:47 +0000)]
Merge "Replace pm.dexopt.priv-apps with existing constant" into pi-dev
am:
f4f7859149
Change-Id: I23947e85c07310074b4a57bb5db680837c57e977
TreeHugger Robot [Thu, 22 Mar 2018 21:41:35 +0000 (21:41 +0000)]
Merge "Fix the heap-after-use in DurationAnomalyTracker" into pi-dev
TreeHugger Robot [Thu, 22 Mar 2018 21:39:03 +0000 (21:39 +0000)]
Merge "Record Bluetooth Cumulative Stats Properly" into pi-dev
TreeHugger Robot [Thu, 22 Mar 2018 21:36:50 +0000 (21:36 +0000)]
Merge "Fix UidMap proto output error. And fix a bug in MaxDurationTracker." into pi-dev
Nathan Harold [Thu, 22 Mar 2018 21:35:36 +0000 (21:35 +0000)]
Merge "Add AppOp for IpSec Tunnels" into pi-dev
am:
8a047a0c52
Change-Id: I159d49219d2f75e1f5aeece4196638a8823fc029
TreeHugger Robot [Thu, 22 Mar 2018 21:34:32 +0000 (21:34 +0000)]
Merge "Disable Bitmap density scaling to Picture" into pi-dev
Ying Xu [Thu, 22 Mar 2018 21:26:19 +0000 (21:26 +0000)]
[automerger skipped]Merge "Add more comments for the isConfigForIdentifiedCarrier()" into pi-dev
am:
812319dc7d -s ours
Change-Id: If5e490d53cb3b3957756b716f5ebbd7f12d45cce
Felipe Leme [Thu, 22 Mar 2018 21:20:34 +0000 (21:20 +0000)]
Merge "Enable Autofill Field Classification by default." into pi-dev
Jorim Jaggi [Thu, 22 Mar 2018 21:18:49 +0000 (21:18 +0000)]
Merge "Remove old workaround for display issues" into pi-dev
Victor Hsieh [Thu, 22 Mar 2018 21:17:56 +0000 (21:17 +0000)]
Merge "Replace pm.dexopt.priv-apps with existing constant" into pi-dev
Nathan Harold [Thu, 22 Mar 2018 21:14:36 +0000 (21:14 +0000)]
Merge "Add AppOp for IpSec Tunnels" into pi-dev
Ying Xu [Thu, 22 Mar 2018 21:14:32 +0000 (21:14 +0000)]
Merge "Add more comments for the isConfigForIdentifiedCarrier()" into pi-dev
Philip P. Moltmann [Thu, 22 Mar 2018 21:06:43 +0000 (14:06 -0700)]
Allow apps to call startRecognition(UUID, Bundle, ComponentName, RecognitionConfig) via reflection
- We don't want to make this a @SystemAPI as this will change
- We need 1st party apps to call this on Pixel devices
Test: Built
Bug:
73829108
Change-Id: I6954767020811ea99ceec17fd17b790c4a1bc0db
Dmitry Dementyev [Thu, 22 Mar 2018 21:04:07 +0000 (21:04 +0000)]
Merge "Update RECOVER_KEYSTORE permission documentation." into pi-dev
am:
6f2965af79
Change-Id: I6a12ff573c6a4b13407692bc230871b94f03a683
Amin Shaikh [Wed, 21 Mar 2018 21:03:37 +0000 (17:03 -0400)]
QS edit mode fixes.
- Remove secondary text for system tiles
- Show app name as secondary text for app tiles
- Fix left side cutoff
Change-Id: I010995c8fc42eb8b77360ade4830049e494c129a
Fixes:
74983414
Test: visual
Yao Chen [Thu, 22 Mar 2018 20:48:20 +0000 (20:48 +0000)]
Merge "Remove unsigned-integer-overflow signed-integer-overflow from sanitizer." into pi-dev
am:
c219348186
Change-Id: I2de4afb40faac68dcb508a4861a628575e6e91fb
rongliu [Wed, 14 Mar 2018 22:43:40 +0000 (15:43 -0700)]
Assign -1 as default value of window type and owner uid.
Bug:
74622357
Test: Test with ag/
3738015 together. Layers without buffers have window
type -1 and owner uid -1.
Change-Id: I6f010bf1327671a06874b75bc0a63a3fb010ced7
Ying Xu [Thu, 22 Mar 2018 20:40:10 +0000 (20:40 +0000)]
Merge "Add more comments for the isConfigForIdentifiedCarrier()" am:
ec76adb9ff
am:
3b84db2329
Change-Id: I2a9bd2d3b691418debf601b869049e7df090c3a8
Dmitry Dementyev [Thu, 22 Mar 2018 20:33:34 +0000 (20:33 +0000)]
Merge "Update RECOVER_KEYSTORE permission documentation." into pi-dev
Tyler Gunn [Thu, 22 Mar 2018 20:33:10 +0000 (20:33 +0000)]
Merge "Rename handover failure constant per API review comments." into pi-dev
am:
3a4d495733
Change-Id: Id22d791f96936fe2cdf0d5b9b4a47ce3583eef6a
Ying Xu [Thu, 22 Mar 2018 20:32:35 +0000 (20:32 +0000)]
Merge "Add more comments for the isConfigForIdentifiedCarrier()"
am:
ec76adb9ff
Change-Id: I437a82ea0d7d71102f273cbca1b54ef7f332027e
Mathieu Chartier [Thu, 22 Mar 2018 20:28:44 +0000 (20:28 +0000)]
Merge "Revert "Enable hidden API blacklist"" into pi-dev
am:
90ad15400a
Change-Id: I1d2b05e6959538b5b60a63f76fcd10b42b8e83a5
Yao Chen [Thu, 22 Mar 2018 20:24:41 +0000 (20:24 +0000)]
Merge "Remove unsigned-integer-overflow signed-integer-overflow from sanitizer." into pi-dev
Tyler Gunn [Thu, 22 Mar 2018 20:22:20 +0000 (20:22 +0000)]
Merge "Rename handover failure constant per API review comments." into pi-dev
Julia Reynolds [Thu, 22 Mar 2018 20:20:01 +0000 (20:20 +0000)]
Merge "Update duration text" into pi-dev
am:
538ba7ac35
Change-Id: I2534474e88a93f611f6223115659b1dc3ff7c515
Mathieu Chartier [Thu, 22 Mar 2018 20:11:07 +0000 (20:11 +0000)]
Merge "Revert "Enable hidden API blacklist"" into pi-dev
David Brazdil [Thu, 22 Mar 2018 18:42:41 +0000 (18:42 +0000)]
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
Julia Reynolds [Thu, 22 Mar 2018 20:04:40 +0000 (20:04 +0000)]
Merge "Update duration text" into pi-dev
Suprabh Shukla [Fri, 9 Mar 2018 02:21:50 +0000 (18:21 -0800)]
APIs to suspend packages with SUSPEND_APPS permission
Changed the existing hidden api setPackagesSuspendedAsUser to a system
api setPackagesSuspended that can be called by apps with either
MANAGE_USERS or SUSPEND_APPS permission. Additionally, the suspending
app can now specify optional extra information meant to be used by the
suspended apps and the launcher to deal with this state.
The following other APIs are added:
- isPackageSuspended(): Apps can query whether they are in a suspended
state
- @SystemApi getPackageSuspendedAppExtras(String): Apps with permission
SUSPEND_APPS can get the appExtras passed to PM when suspending the
app.
- @SystemApi setPackageSuspendedAppExtras(String, PersistableBundle):
Apps with permission SUSPEND_APPS can update app extras for a
suspended package.
- getPackageSuspendedAppExtras(): Apps can call to get the appExtras
passed in to PM when they were suspended.
Test: Can be run via:
atest com.android.server.pm.PackageManagerSettingsTests
atest com.android.server.pm.PackageUserStateTest
atest com.android.server.pm.SuspendPackagesTest
Bug:
74336673
Change-Id: I3b9ed2c8478b34ee2e8986f5f5fddb2839d102e3
Andrew Sapperstein [Thu, 22 Mar 2018 19:48:50 +0000 (19:48 +0000)]
Merge "Revert "Update material_deep_teal_500 to #008577."" into pi-dev
am:
eae9144add
Change-Id: I5952002efb67fe425e67218ab5cade748a251d37
Andrew Sapperstein [Thu, 22 Mar 2018 19:31:23 +0000 (19:31 +0000)]
Merge "Revert "Update material_deep_teal_500 to #008577."" into pi-dev
Abodunrinwa Toki [Fri, 16 Mar 2018 21:08:50 +0000 (21:08 +0000)]
Fix smart_linkify_enabled flag.
The flag should only ensure that smart linkify calls behave in the
legacy way instead of totally disabling linkify.
Also, to keep the flag consistent with smart_selection_enabled and
smart_text_share_enabled flags, the flag should only disable the
SmartLinkify (i.e. Linkify.addLinksAsync) feature not TextClassifier
APIs (i.e. TextClassifier.generateLinks).
Also fixes issue with non-focusable TextViews by firing the primary
action instead of showing the floating toolbar. (b/
73156794)
Bug:
75967597
Bug:
73156794
Test: bit FrameworksCoreTests:android.text.util.LinkifyTest
Test: bit CtsTextTestCases:android.text.util.cts.LinkifyTest
Test: bit FrameworksCoreTests:android.view.textclassifier.TextClassificationManagerTest
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Test: manual - checked behaviour turning flag on/off
Test: manual - checked behaviour with TextView.setFocusableInTouchMode(true/false)
Change-Id: I541f60161b9cd63ce7e57235607500f2fb0841e7
Pankaj Kanwar [Thu, 22 Mar 2018 19:16:52 +0000 (19:16 +0000)]
Merge "Revert "Change KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL to false"" am:
320b6c2312
am:
063c6dc0f6
Change-Id: Icd154b391b05dfa4ed16a97407a15dd7f03ad106
Nathan Harold [Thu, 22 Mar 2018 19:11:11 +0000 (19:11 +0000)]
[automerger skipped]Merge "Add NonNull Annotations To IpSec API Surface" into pi-dev
am:
33ed612cca -s ours
Change-Id: Ieca39ff6788ca7293ff95516120b947e502f4085
Pankaj Kanwar [Thu, 22 Mar 2018 19:10:11 +0000 (19:10 +0000)]
Merge "Revert "Change KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL to false""
am:
320b6c2312
Change-Id: Ie6f23da9c3c531fef9eb32b52d377a8f0e772b77
yinxu [Fri, 16 Mar 2018 17:16:53 +0000 (10:16 -0700)]
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)
Ying Xu [Thu, 22 Mar 2018 19:07:45 +0000 (19:07 +0000)]
Merge "Add more comments for the isConfigForIdentifiedCarrier()"
Makoto Onuki [Thu, 22 Mar 2018 18:45:31 +0000 (18:45 +0000)]
Merge "Move provider access stats to frameworks/base" into pi-dev
am:
c7f6eadffc
Change-Id: I22451d7234f52332ddd5e4811f9fe9b957469265
Felipe Leme [Thu, 22 Mar 2018 03:02:42 +0000 (20:02 -0700)]
Removed urlBarResourceId.
It will be removed before the final P build.
Test: atest FrameworksServicesTests:AutofillManagerServiceTest CtsAutoFillServiceTestCases
Fixes:
74445943
Change-Id: I9bc243a3c1ae78f2c385dbb907d362d8ab16b34c
Android Build Merger (Role) [Thu, 22 Mar 2018 18:38:24 +0000 (18:38 +0000)]
Merge "[automerger skipped]Merge "Dummy StatsLog class" into stage-aosp-master am:
fe5fdb1213 -s ours" into pi-dev-plus-aosp
Tej Singh [Thu, 22 Mar 2018 18:37:59 +0000 (18:37 +0000)]
[automerger skipped]Merge "Dummy StatsLog class" into stage-aosp-master
am:
fe5fdb1213 -s ours
Change-Id: I6b5a02d285536a5a4433aa4060e72cb7acd16e35
Chong Zhang [Thu, 22 Mar 2018 18:36:24 +0000 (18:36 +0000)]
Merge "heif: fix Exif extraction in mtp database" into pi-dev
am:
9e64c01d02
Change-Id: Ied34169a586b99b8833db8946f8e64409f2b79cd
Nathan Harold [Thu, 22 Mar 2018 18:31:03 +0000 (18:31 +0000)]
Merge "Add NonNull Annotations To IpSec API Surface" into pi-dev
Felipe Leme [Thu, 22 Mar 2018 18:28:41 +0000 (18:28 +0000)]
Merge "Don't allow null ids on FillResponse.Builder.setAuthentication()" into pi-dev
am:
de6dfd93e5
Change-Id: If5937a6d59d7e386aa685570359df47cb34a8a98
Tej Singh [Thu, 22 Mar 2018 18:23:52 +0000 (18:23 +0000)]
Merge "Dummy StatsLog class" into stage-aosp-master
Felipe Leme [Thu, 22 Mar 2018 18:23:06 +0000 (18:23 +0000)]
Merge "Fixed autofill service metadata name on javadoc sample." into pi-dev
am:
b030730aa8
Change-Id: Ic8c2eff923157be306dd401e47979a3337499919
Bo Zhu [Thu, 22 Mar 2018 18:19:09 +0000 (18:19 +0000)]
Merge "Remove the hard-coded counterId in VaultParams" into pi-dev
am:
88956ce326
Change-Id: I9112e639ae556de60cc2da64eef283033e99cca6
Robert Berry [Thu, 22 Mar 2018 17:50:46 +0000 (17:50 +0000)]
Merge "Unhide RecoveryController#getRootCertificates()" into pi-dev
am:
c6bd185565
Change-Id: Ib81d1997ee46034dff4c8b9c45836f434f660f1a
Robert Berry [Thu, 22 Mar 2018 17:45:01 +0000 (17:45 +0000)]
Merge "Unhide RecoverySession#recoverKeyChainSnapshot() method" into pi-dev
am:
3818de595b
Change-Id: Ie3aad7e53a3e359bd83602db3a85cf1ab497e7c2
Makoto Onuki [Thu, 22 Mar 2018 17:42:13 +0000 (17:42 +0000)]
Merge "Move provider access stats to frameworks/base" into pi-dev
Chong Zhang [Thu, 22 Mar 2018 17:39:52 +0000 (17:39 +0000)]
Merge "heif: fix Exif extraction in mtp database" into pi-dev
Amin Shaikh [Thu, 22 Mar 2018 17:37:47 +0000 (17:37 +0000)]
Merge "Make QSTileImpl#mListeners thread safe." into pi-dev
am:
3bfa02a114
Change-Id: Iff73fc24b669ead73d67091805d809c60953e2e2
Felipe Leme [Thu, 22 Mar 2018 17:36:18 +0000 (17:36 +0000)]
Merge "Don't allow null ids on FillResponse.Builder.setAuthentication()" into pi-dev
Felipe Leme [Thu, 22 Mar 2018 17:33:36 +0000 (17:33 +0000)]
Merge "Fixed autofill service metadata name on javadoc sample." into pi-dev
Bo Zhu [Thu, 22 Mar 2018 17:32:10 +0000 (17:32 +0000)]
Merge "Remove the hard-coded counterId in VaultParams" into pi-dev
Robert Berry [Thu, 22 Mar 2018 17:23:05 +0000 (17:23 +0000)]
Merge "Unhide RecoveryController#getRootCertificates()" into pi-dev
Robert Berry [Thu, 22 Mar 2018 17:19:33 +0000 (17:19 +0000)]
Merge "Unhide RecoverySession#recoverKeyChainSnapshot() method" into pi-dev
Leon Scroggins III [Thu, 22 Mar 2018 13:21:29 +0000 (09:21 -0400)]
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
TreeHugger Robot [Thu, 22 Mar 2018 17:07:01 +0000 (17:07 +0000)]
Merge "Make QSTileImpl#mListeners thread safe." into pi-dev
Felipe Leme [Thu, 22 Mar 2018 17:05:36 +0000 (17:05 +0000)]
Merge "Renamed AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES." into pi-dev
am:
4e561f83cb
Change-Id: Id6e661b49cc9a28bb6464930210eac41f061d61a
Pankaj Kanwar [Thu, 22 Mar 2018 17:03:39 +0000 (17:03 +0000)]
Merge "Revert "Change KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL to false""
Fyodor Kupolov [Thu, 22 Mar 2018 16:57:02 +0000 (16:57 +0000)]
Merge "Add OWNERS for GlobalSettingsToPropertiesMapper" into pi-dev
am:
8055aa2434
Change-Id: Ia61b7426acef33ac4f19f4fdc133be2a84bbf49d
Mikhail Naganov [Thu, 22 Mar 2018 16:43:54 +0000 (16:43 +0000)]
Merge "Audio presentation: Docs & Testability fixes" into pi-dev
am:
397962981c
Change-Id: I6088df15fd85afd633f1111a7eb675bcd7c9ad95
Adrian Roos [Thu, 22 Mar 2018 16:38:07 +0000 (17:38 +0100)]
PhoneWindowTest: promote to presubmit
Bug:
73807928
Test: atest PhoneWindowTest
Change-Id: I1204f7049b6e182c5dd1f9f236e285ee7b9405ca
Dmitry Dementyev [Thu, 22 Mar 2018 16:32:13 +0000 (09:32 -0700)]
Update RECOVER_KEYSTORE permission documentation.
Previous comment used outdated name for class managing recoverable
keystore.
Bug:
74976894
Test: none
Change-Id: I44460014d0ac5817d48e16bf281d2bb4ffe06823
OSDN Git Service
