Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
364,581 Commits 3 Branches 0 Tags
abd29040bbbd1a06be3089f52c6c0ee58d930c3e
Commit Graph

81173 Commits

Author SHA1 Message Date
Felipe Leme
abd29040bb Merge "Fixed AutofillServiceHelper.assertValid() so it throws the right exception." into pi-dev 
am: 0049ec1410

Change-Id: I815bf3aa060005b8c3f0512e38042ae377c8e236
 2018-03-24 00:53:12 +00:00
Felipe Leme
be541db705 Merge "Properly set input type on autofill compat mode." into pi-dev 
am: 352da45bbb

Change-Id: I7b97497e1d4dfb755e4f49182e27251356d9c372
 2018-03-24 00:03:23 +00:00
Todd Kopriva
1e72ce692a Merge "Merge "docs: fixing bug 36982027 and 30636712, typos" into oc-mr1-dev am: 5b0a4eea8d" into pi-dev 
am: ba22b7f4fd

Change-Id: I73239a97490ea456d5c7d7413e1277307c4caec8
 2018-03-23 23:36:28 +00:00
TreeHugger Robot
0049ec1410 Merge "Fixed AutofillServiceHelper.assertValid() so it throws the right exception." into pi-dev 2018-03-23 23:18:27 +00:00
Richard Ledley
6a29d0772d Merge "Add flag to control blocking Smart Replies for apps targeting an Android version below P." into pi-dev 
am: 525b182864

Change-Id: I57974b8dc2b55d938ed48760654936d4bce61b11
 2018-03-23 23:16:18 +00:00
Evan Rosky
a6afc381c9 Merge "Added TestApi for default focus highlight" into pi-dev 
am: 87f9818319

Change-Id: I039252a404149a979617d71b2c08f679e025d692
 2018-03-23 23:01:19 +00:00
TreeHugger Robot
352da45bbb Merge "Properly set input type on autofill compat mode." into pi-dev 2018-03-23 22:49:25 +00:00
Android Build Merger (Role)
ba22b7f4fd Merge "Merge "docs: fixing bug 36982027 and 30636712, typos" into oc-mr1-dev am: 5b0a4eea8d" into pi-dev 2018-03-23 22:11:57 +00:00
Todd Kopriva
1057fc37f5 Merge "docs: fixing bug 36982027 and 30636712, typos" into oc-mr1-dev 
am: 5b0a4eea8d

Change-Id: Iff4044c52e7ccdf6f7f879b9d5457ce1458b21bd
 2018-03-23 22:11:38 +00:00
TreeHugger Robot
525b182864 Merge "Add flag to control blocking Smart Replies for apps targeting an Android version below P." into pi-dev 2018-03-23 22:07:15 +00:00
TreeHugger Robot
87f9818319 Merge "Added TestApi for default focus highlight" into pi-dev 2018-03-23 22:04:04 +00:00
Todd Kopriva
5b0a4eea8d Merge "docs: fixing bug 36982027 and 30636712, typos" into oc-mr1-dev 2018-03-23 21:48:55 +00:00
Robert Berry
175f666461 Merge "Do not throw KeystoreException for when a key does not exist" into pi-dev 
am: 73b7722c13

Change-Id: I33b404ffc1e4554c3f3f76a4cd92d10fe4923761
 2018-03-23 21:31:58 +00:00
Richard Ledley
4069f7a167 Add flag to control blocking Smart Replies for apps targeting an Android version below P. 
Bug: 73802997

Test: atest SmartReplyConstantsTest

Change-Id: Id340cba09da7931ff6a4689802b3a5f594852a72
(cherry picked from commit 28944cbdcf)
 2018-03-23 21:14:27 +00:00
Felipe Leme
ec150609e4 Fixed AutofillServiceHelper.assertValid() so it throws the right exception. 
Test: atest FillResponseTest SaveInfoTest
Bug: 76097200

Change-Id: Id643007e2d038cc6948cdb8d66c5454048d5f632
 2018-03-23 14:09:02 -07:00
John Reck
530d626b81 Merge "Add isPivotSet/resetPivot" into pi-dev 
am: 6045d66aa2

Change-Id: I29ab902c1a1391d26f95ec1abfa14c887320eb5f
 2018-03-23 21:07:52 +00:00
Felipe Leme
c380e18e31 Properly set input type on autofill compat mode. 
Test: atest CtsAutoFillServiceTestCases:android.autofillservice.cts.VirtualContainerActivityTest#testAutofillSync\
CtsAutoFillServiceTestCases:android.autofillservice.cts.VirtualContainerActivityCompatModeTest#testAutofillSync

Fixes: 76173462

Change-Id: Ie400ed5d4426febc34b02f68d6be4d86bc11034f
 2018-03-23 14:04:23 -07:00
TreeHugger Robot
4efdab2a74 Merge "HIDD: Address API Review concerns" into pi-dev 2018-03-23 21:03:34 +00:00
Zach Johnson
31595b3156 Merge "Revert "Bluetooth: preserve one advertisement slot for GMS core"" into pi-dev 
am: 5bdf063537

Change-Id: I195b1f1da0cd8e94fe1f575cae1c1b052d46ed4a
 2018-03-23 21:03:04 +00:00
Amith Yamasani
980b453e17 Merge "Provide app launch count in UsageStats" into pi-dev 
am: 8808edb063

Change-Id: I62a73e647fcbfffe5a56fe8229d8fb79738e2a80
 2018-03-23 20:49:16 +00:00
TreeHugger Robot
73b7722c13 Merge "Do not throw KeystoreException for when a key does not exist" into pi-dev 2018-03-23 20:03:45 +00:00
Hansong Zhang
a84feb191f Merge "Hearing Aid Profile: set and get activeDevice" into pi-dev 
am: 9753e774ce

Change-Id: I39f848921e56d07d78397509687bc56b39a83e79
 2018-03-23 20:02:44 +00:00
Alice Sheng
6036a2b5bf Merge "Add setting for disabling swap." into pi-dev 
am: 7384995cf8

Change-Id: I2a8207237a5cf2e0b2d1be0996aece7542d9b90d
 2018-03-23 19:47:06 +00:00
Kurt Marcinkiewicz
98be440cfc Merge "Allow specifying a network for SNTP time sync" into pi-dev 
am: 991b971acb

Change-Id: I339c77063c72a9d76a5c4cb17052e20fb6e045a6
 2018-03-23 19:40:39 +00:00
John Reck
6045d66aa2 Merge "Add isPivotSet/resetPivot" into pi-dev 2018-03-23 19:26:50 +00:00
TreeHugger Robot
5bdf063537 Merge "Revert "Bluetooth: preserve one advertisement slot for GMS core"" into pi-dev 2018-03-23 19:18:41 +00:00
Amith Yamasani
8808edb063 Merge "Provide app launch count in UsageStats" into pi-dev 2018-03-23 19:13:22 +00:00
Petr Cermak
fcca48b648 Merge "Annotate RemoteInput#SOURCE_* with @IntDef" into pi-dev 
am: 4341a66b03

Change-Id: I0d1a41c52cfe2b24eaa23cbd8fc49a6ae6493c2f
 2018-03-23 18:55:42 +00:00
Mihai Popa
3c0ad631d5 Merge "[Magnifier-34] Keep magnifier inside its surface" into pi-dev 
am: 14372aaabc

Change-Id: I809c725f2bc11929047a7047b4b24a7edbc1260b
 2018-03-23 18:44:38 +00:00
Dmitry Dementyev
64a9487249 Merge "Prepare KeyChainSnapshot to removing deprecated getTrustedHardwarePublicKey method." into pi-dev 
am: 95f2965a74

Change-Id: I2e44ca18a1f3fa928f3a3529a1425a483dd34d06
 2018-03-23 18:31:59 +00:00
TreeHugger Robot
9753e774ce Merge "Hearing Aid Profile: set and get activeDevice" into pi-dev 2018-03-23 18:22:27 +00:00
Emilian Peev
a87c6da04b Merge changes from topic "bug73953366_bug74605221" into pi-dev 
am: 7ed5fb3e1d

Change-Id: I5d435b2c2edfeaaca0e12f1af222680f71dad2fc
 2018-03-23 18:20:08 +00:00
Emilian Peev
ca5ffee316 Camera: Camera shouldn't throw 'RejectedExecutionException' 
am: b9a5194e9e

Change-Id: Ic4dd87d89f91822fce82c5ca27632f69716279e5
 2018-03-23 18:15:35 +00:00
Alice Sheng
7384995cf8 Merge "Add setting for disabling swap." into pi-dev 2018-03-23 18:11:12 +00:00
Emilian Peev
f18ec57381 Revert "Revert "Camera: SessionConfiguration should use Executors"" 
am: 77ca866b53

Change-Id: I226e1ba33047695b74ce5de9054c4760e61bf773
 2018-03-23 18:11:10 +00:00
Kurt Marcinkiewicz
991b971acb Merge "Allow specifying a network for SNTP time sync" into pi-dev 2018-03-23 18:02:19 +00:00
TreeHugger Robot
4341a66b03 Merge "Annotate RemoteInput#SOURCE_* with @IntDef" into pi-dev 2018-03-23 17:40:56 +00:00
Mihai Popa
14372aaabc Merge "[Magnifier-34] Keep magnifier inside its surface" into pi-dev 2018-03-23 17:39:04 +00:00
Zach Johnson
14faa2d49b Revert "Bluetooth: preserve one advertisement slot for GMS core" 
This reverts commit 7020b015e9.

Reason for revert: This breaks platforms that only support a single advertising slot.

Bug: 76135219
Test: advertising does not work, revert change, advertising works
Change-Id: Ib8c823eb9990cc06bad95c8c3ad0129afb245e00
 2018-03-23 17:30:56 +00:00
Dmitry Dementyev
e7250b6ec6 Merge "Update RecoverableKeyStoreManager methods to throw NullPointerException when null is passed as @NonNull argument." into pi-dev 
am: 364dbf1c9e

Change-Id: I6ad01aa0dace567c6c6da67435213bbe8a9e63f3
 2018-03-23 17:22:26 +00:00
Dmitry Dementyev
95f2965a74 Merge "Prepare KeyChainSnapshot to removing deprecated getTrustedHardwarePublicKey method." into pi-dev 2018-03-23 17:16:17 +00:00
TreeHugger Robot
7ed5fb3e1d Merge changes from topic "bug73953366_bug74605221" into pi-dev 
* changes:
  Camera: Complete transition from handlers to executors
  Camera: Camera shouldn't throw 'RejectedExecutionException'
  Revert "Revert "Camera: SessionConfiguration should use Executors""
 2018-03-23 17:16:00 +00:00
Dmitry Dementyev
364dbf1c9e Merge "Update RecoverableKeyStoreManager methods to throw NullPointerException when null is passed as @NonNull argument." into pi-dev 2018-03-23 17:06:18 +00:00
Mathew Inwood
c9c72d26af Merge "resolve merge conflicts of daef557352 to pi-dev-plus-aosp" into pi-dev-plus-aosp 2018-03-23 16:48:11 +00:00
Mathew Inwood
6914312812 resolve merge conflicts of daef557352 to pi-dev-plus-aosp 
Test: I solemnly swear I tested this conflict resolution.
Merged-In: Idd73c9938592c5c4d67cfb9efefdffed0dd5f262
Change-Id: I3d1aeb30b755ca05f32dcd3c46335d1611e0bb50
 2018-03-23 16:35:44 +00:00
Ricky Wai
b2528c0291 Merge "Use sha256 of a string as seed in RapporEncoder.insecureEncoder" into pi-dev 
am: 651ac4d119

Change-Id: Ie468743be5b369e49eacda9707e76e010639a7fe
 2018-03-23 16:19:46 +00:00
Ricky Wai
651ac4d119 Merge "Use sha256 of a string as seed in RapporEncoder.insecureEncoder" into pi-dev 2018-03-23 15:55:28 +00:00
Petr Cermak
8e2731bfef Annotate RemoteInput#SOURCE_* with @IntDef 
This patch addresses a request from the API Council (http://b/74409378).
It defines a new RemoteInput.Source annotation for RemoteInput source
constants.

Bug: 74409378
Test: atest RemoteInputTest
Change-Id: I78a006b6a600ea0c0603b2591d1a29596074a44e
 2018-03-23 15:51:12 +00:00
Bo Zhu
2e815c6e74 Merge "Unhide the enum/function for the password hashing algorithm scrypt" into pi-dev 
am: 9ec7026e92

Change-Id: I0026b0ef43e9918811591f416a370dff84254df4
 2018-03-23 15:44:56 +00:00
Bo Zhu
9ec7026e92 Merge "Unhide the enum/function for the password hashing algorithm scrypt" into pi-dev 2018-03-23 15:25:36 +00:00