Hall Liu
5efb2f73dd
Merge "Split the DownloadStateCallback class into two" into pi-dev am: ecd4709573
...
am: 3f65260be7
Change-Id: Ib5b10d57b839ff64a79a5b0689d2ae3eacea3a21
2018-03-24 02:26:33 +00:00
Evan Rosky
1069c90060
Merge "Added TestApi for default focus highlight" into pi-dev am: 87f9818319
...
am: a6afc381c9
Change-Id: I034e076aa41e3866b84e19261132450991d9488d
2018-03-24 00:54:19 +00:00
Hall Liu
ecd4709573
Merge "Split the DownloadStateCallback class into two" into pi-dev
2018-03-23 23:11:46 +00:00
John Reck
477ea0674c
Merge "Add isPivotSet/resetPivot" into pi-dev am: 6045d66aa2
...
am: 530d626b81
Change-Id: I592dd6459b9526393602d9845d0191c291f56cb6
2018-03-23 22:14:45 +00:00
TreeHugger Robot
87f9818319
Merge "Added TestApi for default focus highlight" into pi-dev
2018-03-23 22:04:04 +00:00
Amith Yamasani
78f3b26d6c
Merge "Merge "Provide app launch count in UsageStats" into pi-dev am: 8808edb063" into pi-dev-plus-aosp
...
am: b2312dc99b
Change-Id: Id475a570188d5109e3d77d77f47e77dc6376ff51
2018-03-23 21:32:26 +00:00
John Reck
530d626b81
Merge "Add isPivotSet/resetPivot" into pi-dev
...
am: 6045d66aa2
Change-Id: I29ab902c1a1391d26f95ec1abfa14c887320eb5f
2018-03-23 21:07:52 +00:00
TreeHugger Robot
4efdab2a74
Merge "HIDD: Address API Review concerns" into pi-dev
2018-03-23 21:03:34 +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
John Reck
6045d66aa2
Merge "Add isPivotSet/resetPivot" into pi-dev
2018-03-23 19:26:50 +00:00
Amith Yamasani
8808edb063
Merge "Provide app launch count in UsageStats" into pi-dev
2018-03-23 19:13:22 +00:00
Emilian Peev
669ca91e00
Revert "Revert "Camera: SessionConfiguration should use Executors"" am: 77ca866b53
...
am: f18ec57381
Change-Id: Iad789b80b193b535a517c991894cc29046e517b1
2018-03-23 18:33:45 +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
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
Bo Zhu
c9c790a938
Merge "Unhide the enum/function for the password hashing algorithm scrypt" into pi-dev am: 9ec7026e92
...
am: 2e815c6e74
Change-Id: I3374a90dbdee1feb2eeecd054da6069c3e630802
2018-03-23 15:57:36 +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
Wyatt Riley
8a26977813
Merge "Deprecating unused fields from GnssMeasurement" into pi-dev am: a106a1a6b4
...
am: ea5ad6d83f
Change-Id: Idab41f714fba955b9043db3cfe70915c452647f5
2018-03-23 14:02:39 +00:00
Wyatt Riley
ea5ad6d83f
Merge "Deprecating unused fields from GnssMeasurement" into pi-dev
...
am: a106a1a6b4
Change-Id: I26e0c6849773447cf29c388b2801a221264966bd
2018-03-23 13:50:08 +00:00
TreeHugger Robot
a106a1a6b4
Merge "Deprecating unused fields from GnssMeasurement" into pi-dev
2018-03-23 13:41:46 +00:00
Aseem Kumar
e7834b5677
Merge "Delete unimplemented APIs from RecoveryController." into pi-dev am: 0ed26bc8b1
...
am: b0add1f630
Change-Id: I6a03ba603aa44d0ecc0b3b10dd27b896a4d0879f
2018-03-23 11:44:23 +00:00
Aseem Kumar
b0add1f630
Merge "Delete unimplemented APIs from RecoveryController." into pi-dev
...
am: 0ed26bc8b1
Change-Id: I7f5abe06978db5f421bfd831ead6e2bc0ebe4cee
2018-03-23 11:31:14 +00:00
TreeHugger Robot
0ed26bc8b1
Merge "Delete unimplemented APIs from RecoveryController." into pi-dev
2018-03-23 11:19:06 +00:00
Jean-Michel Trivi
9f504f3118
Merge "Merge "Hide Media*2 APIs" into pi-dev am: d847d7d0a9" into pi-dev-plus-aosp
...
am: afe151935a
Change-Id: I40f0b08af3387975e4ca30f6da38b6942ee21077
2018-03-23 06:00:08 +00:00
Aseem Kumar
933dfc1cd6
Delete unimplemented APIs from RecoveryController.
...
Bug: 74859770
Test: make update-api builds
Change-Id: Ic547e0ee2ef13995389a71369ffa736a7d83b78a
2018-03-23 05:16:42 +00:00
Jean-Michel Trivi
b598645e3d
Merge "Hide Media*2 APIs" into pi-dev
...
am: d847d7d0a9
Change-Id: I29a18f6592ecc3f79483dacea6ca294a226ca792
2018-03-23 04:04:01 +00:00
Seigo Nonaka
284a0ae76b
Merge "Make PrecomputedText Spannable for supporting selection" into pi-dev am: 02c8d1b07f
...
am: 42033475dd
Change-Id: Ibac099cd1256e4a87299196dcfeda8d50c900197
2018-03-23 03:34:31 +00:00
Bo Zhu
40d8a45b23
Unhide the enum/function for the password hashing algorithm scrypt
...
Bug: 75024420
Test: none, it's just unhiding APIs
Change-Id: I9cbb327678d334079e2c660d85013f3073d4cb87
2018-03-22 20:22:44 -07:00
Nathan Harold
f273033220
Merge "Add MANAGE_IPSEC_TUNNELS Permission" into pi-dev am: 0205fd1064
...
am: 4ca771aa5c
Change-Id: I60dcb191a9aea3ff513a4c46c2c59d7f068e843c
2018-03-23 03:18:25 +00:00
Evan Rosky
e1a0b347a0
Added TestApi for default focus highlight
...
Bug: 62864111
Test: View_DefaultFocusHighlightTest
Change-Id: I2a74de3274351f0a7662715e723c25f4d7f8f6ed
2018-03-22 19:37:50 -07:00
Seigo Nonaka
42033475dd
Merge "Make PrecomputedText Spannable for supporting selection" into pi-dev
...
am: 02c8d1b07f
Change-Id: Ida44cb2d564b0b16272915f7f0f181b98452c1ca
2018-03-23 02:08:23 +00:00
Nathan Harold
4ca771aa5c
Merge "Add MANAGE_IPSEC_TUNNELS Permission" into pi-dev
...
am: 0205fd1064
Change-Id: I7f1c987901c3634fb81d93402d5cb0af80fff11e
2018-03-23 01:57:41 +00:00
Felipe Leme
a8ef3b7a1e
Merge "Removed urlBarResourceId." into pi-dev am: 3a31f6c5cc
...
am: e40a0838ba
Change-Id: I13688d0b8ce95910eae74e814030b78e28054be8
2018-03-23 01:38:29 +00:00
Suprabh Shukla
075541707a
Merge "APIs to suspend packages with SUSPEND_APPS permission" into pi-dev am: 6affc07065
...
am: 31b5990893
Change-Id: Ib95745ca26362a9624b704b217b4d9078d0ade7c
2018-03-23 01:17:09 +00:00
Jean-Michel Trivi
d847d7d0a9
Merge "Hide Media*2 APIs" into pi-dev
2018-03-23 01:12:14 +00:00
Leon Scroggins
547a528421
Merge changes from topics "DecodeException_ERROR", "AID_autoStart", "onPartialImage" into pi-dev am: ceb14e015b
...
am: fbe597e850
Change-Id: I2a70864001a9e6cf21692bcbcb5c2cc81361f0bf
2018-03-23 00:57:54 +00:00
Leon Scroggins III
1564d3070f
Re-write onPartialImage API am: 1d2bf2b846
...
am: 1a82348834
Change-Id: Icd8be0239571f543ae815f51d162eb1485567eec
2018-03-23 00:51:26 +00:00
Felipe Leme
e40a0838ba
Merge "Removed urlBarResourceId." into pi-dev
...
am: 3a31f6c5cc
Change-Id: Ic039210e17b1f49d4232b97acdd46befcbd896d3
2018-03-23 00:39:16 +00:00
Suprabh Shukla
31b5990893
Merge "APIs to suspend packages with SUSPEND_APPS permission" into pi-dev
...
am: 6affc07065
Change-Id: Icd9ccea90cac3b367b74915f76d39d7f5f740687
2018-03-23 00:09:48 +00:00
Ivan Podogov
ad27d2caa4
Merge "HIDD: Address API Review concerns" am: 8085d6f247 am: 6c64e83577
...
am: 153592fa3c
Change-Id: Idbb7a31a9de8092e91743c3806d6a0dba509eec6
2018-03-23 00:07:36 +00:00
Leon Scroggins
fbe597e850
Merge changes from topics "DecodeException_ERROR", "AID_autoStart", "onPartialImage" into pi-dev
...
am: ceb14e015b
Change-Id: I92ffd12b6e8df360a86733ca99676cd8f470addb
2018-03-22 23:43:38 +00:00
Leon Scroggins III
1a82348834
Re-write onPartialImage API
...
am: 1d2bf2b846
Change-Id: I7436bbe89b9efd9a406958b14f79294e982c5b3a
2018-03-22 23:34:41 +00:00
Jean-Michel Trivi
3a582e73c1
Hide Media*2 APIs
...
Bug: 76121592
Test: make offline-sdk-docs
Change-Id: Ic5eba5ba0b3ef9f11c582ab6db7d8d61934941dd
2018-03-22 16:30:14 -07:00
Ivan Podogov
191ce9c442
HIDD: Address API Review concerns
...
* Replace bare field usage with getter methods;
* Remove Builder;
* Move BluetoothHidDeviceCallback to inner class;
* Remove toArray() and equals();
* Throw IllegalArgumentException where applicable;
* Add an Executor parameter before Callback;
Bug: 72168436, 72168126
Test: make update-api, make, make sl4a.Common
Change-Id: I13095458bf3ded7a376e8d20fd13df12ef426693
(cherry picked from commit f2f5dc355f )
2018-03-22 16:29:54 -07:00
TreeHugger Robot
02c8d1b07f
Merge "Make PrecomputedText Spannable for supporting selection" into pi-dev
2018-03-22 23:21:54 +00:00
Ivan Podogov
153592fa3c
Merge "HIDD: Address API Review concerns" am: 8085d6f247
...
am: 6c64e83577
Change-Id: Ibcdc31fcb01a583ca05c056b2063f77c0f4dbeb6
2018-03-22 23:13:16 +00:00
TreeHugger Robot
0205fd1064
Merge "Add MANAGE_IPSEC_TUNNELS Permission" into pi-dev
2018-03-22 23:10:11 +00:00
TreeHugger Robot
3a31f6c5cc
Merge "Removed urlBarResourceId." into pi-dev
2018-03-22 22:22:30 +00:00
Nathan Harold
c3eb60cec6
Merge "Add AppOp for IpSec Tunnels" into pi-dev am: 8a047a0c52
...
am: e9ae13cabe
Change-Id: I9197eb54de99c9f5274d722cd25c35c654fa6137
2018-03-22 22:17:26 +00:00
TreeHugger Robot
6affc07065
Merge "APIs to suspend packages with SUSPEND_APPS permission" into pi-dev
2018-03-22 22:15:31 +00:00