Jeff Sharkey
78232ee54b
Merge "Move FIRST_SDK_INT to @TestApi." into pi-dev am: fee443bfab
...
am: 9d81c54bc8
2018-03-27 02:37:11 +00:00
TreeHugger Robot
fee443bfab
Merge "Move FIRST_SDK_INT to @TestApi." into pi-dev
2018-03-27 01:40:23 +00:00
Philip P. Moltmann
4d5c36a19c
Merge "Make PackageManager#getNamesForUids testable." into pi-dev am: 9360a31f5f
...
am: 895b6a19a6
2018-03-26 23:08:15 +00:00
TreeHugger Robot
9360a31f5f
Merge "Make PackageManager#getNamesForUids testable." into pi-dev
2018-03-26 22:36:45 +00:00
Jason Monk
8cf36dca52
Merge "Security fixup for Slices" into pi-dev am: fc704e2fd7
...
am: fe54f0c260
2018-03-26 22:13:16 +00:00
Makoto Onuki
b76c916103
Merge "Sticky battery saver" into pi-dev am: 110a7c20f4
...
am: 7e62948ab3
2018-03-26 22:00:33 +00:00
Jason Monk
fc704e2fd7
Merge "Security fixup for Slices" into pi-dev
2018-03-26 21:44:38 +00:00
TreeHugger Robot
110a7c20f4
Merge "Sticky battery saver" into pi-dev
2018-03-26 21:41:09 +00:00
Jeff Sharkey
1da8bb1d8e
Move FIRST_SDK_INT to @TestApi.
...
Test: atest android.os.cts.BuildTest
Bug: 71555186
Change-Id: I92732b930834d9c1e4150417bb3ee8b6839e2b3e
2018-03-26 12:51:03 -06:00
Makoto Onuki
a3cd7b9d53
Sticky battery saver
...
- When battery saver is enabled manually (i.e. via PM.setPowerSaveMode()),
it'll stick, and we'll re-enable battery saver even after a reboot
or a charge.
- Extracted all battery saver state transition logic into a separate
class.
Fix: 75033216
Bug: 74120126
Test: Manual test with "dumpsys battery set ...."
Test: atest $ANDROID_BUILD_TOP/frameworks/base/services/tests/servicestests/src/com/android/server/power/batterysaver/BatterySaverStateMachineTest.java
Change-Id: If020cd48f341b339783fe09dd35bc7199e737a52
Test: dumpsys power
Test: incident_report power
Test: atest CtsBatterySavingTestCases
2018-03-26 10:27:56 -07:00
Philip P. Moltmann
abeb04ed55
Make PackageManager#getNamesForUids testable.
...
Fixes: 76161011
Test: atest android.content.pm.cts.PackageManagerTest
Change-Id: I857d489ec9981839d63a5b934b4aaa0d2709be85
2018-03-26 10:22:10 -07:00
Emilian Peev
261aef584d
Merge changes from topic "executor_api" into pi-dev am: 8cb2aba54d
...
am: d0d4291fef
2018-03-26 14:05:56 +00:00
Emilian Peev
3b0166dbf1
Camera: Async camera manager calls should use executors am: 9129aa25c1
...
am: f977ff992c
2018-03-26 14:02:38 +00:00
Emilian Peev
f977ff992c
Camera: Async camera manager calls should use executors
...
am: 9129aa25c1
2018-03-26 13:46:48 +00:00
TreeHugger Robot
8cb2aba54d
Merge changes from topic "executor_api" into pi-dev
...
* changes:
Camera: Accept user-supplied executors in capture sessions
Camera: Async camera manager calls should use executors
2018-03-26 13:31:30 +00:00
Mohamed Abdalkader
eef110306f
Merge "Unhide ImsReasonInfo Constructor" into pi-dev am: 4f2e53fe48
...
am: cee0b20e71
2018-03-24 06:02:35 +00:00
Wale Ogunwale
0cc85cd5f4
Merge "Merge "Don't show unsupported sdk warning in test harness." into pi-dev am: 444885b10d" into pi-dev-plus-aosp
...
am: cd6eae6cce
2018-03-24 04:54:12 +00:00
Hall Liu
5efb2f73dd
Merge "Split the DownloadStateCallback class into two" into pi-dev am: ecd4709573
...
am: 3f65260be7
2018-03-24 02:26:33 +00:00
TreeHugger Robot
4f2e53fe48
Merge "Unhide ImsReasonInfo Constructor" into pi-dev
2018-03-24 01:12:49 +00:00
Evan Rosky
1069c90060
Merge "Added TestApi for default focus highlight" into pi-dev am: 87f9818319
...
am: a6afc381c9
2018-03-24 00:54:19 +00:00
Wale Ogunwale
444885b10d
Merge "Don't show unsupported sdk warning in test harness." into pi-dev
2018-03-23 23:32:54 +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
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
2018-03-23 21:32:26 +00:00
John Reck
530d626b81
Merge "Add isPivotSet/resetPivot" into pi-dev
...
am: 6045d66aa2
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
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
Jason Monk
ac11238291
Security fixup for Slices
...
- Allow slice providers to override grant flow
- Remove overriding caller, that was a terrible idea
- Move where the same app check happens to allow for CTS
Test: CTS
Bug: 69168488
Change-Id: I61c81c0665a08420b7bc83e3660657b62b2cd6a8
2018-03-23 15:08:11 -04:00
Emilian Peev
669ca91e00
Revert "Revert "Camera: SessionConfiguration should use Executors"" am: 77ca866b53
...
am: f18ec57381
2018-03-23 18:33:45 +00:00
Emilian Peev
f18ec57381
Revert "Revert "Camera: SessionConfiguration should use Executors""
...
am: 77ca866b53
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
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
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
Emilian Peev
2f0184fa89
Camera: Accept user-supplied executors in capture sessions
...
It should be possible for clients to pass executors instead of
handlers in any method that accepts capture result listener.
Bug: 3767382
Test: Camera CTS
Change-Id: I605c001533e93e6294d265fcd4d3d5783c313b8a
2018-03-23 14:27:37 +00:00
Wyatt Riley
8a26977813
Merge "Deprecating unused fields from GnssMeasurement" into pi-dev am: a106a1a6b4
...
am: ea5ad6d83f
2018-03-23 14:02:39 +00:00
Wyatt Riley
ea5ad6d83f
Merge "Deprecating unused fields from GnssMeasurement" into pi-dev
...
am: a106a1a6b4
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
2018-03-23 11:44:23 +00:00
Aseem Kumar
b0add1f630
Merge "Delete unimplemented APIs from RecoveryController." into pi-dev
...
am: 0ed26bc8b1
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
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
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
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
2018-03-23 03:18:25 +00:00
