OSDN Git Service

android-x86/frameworks-base.git
5 years agoAdd RequiresApi annotations to LocationProvider
Soonil Nagarkar [Mon, 15 Apr 2019 20:22:52 +0000 (13:22 -0700)]
Add RequiresApi annotations to LocationProvider

Ensures that lint tests can run properly from client code which uses
this library.

Bug: 130188099
Test: manual
Change-Id: I1d3c8e486c38633d73c405f2c6f9b350ef1e6946

5 years agoMerge "Add AppPredictionServiceExists check." into qt-dev am: bd8c161d8d
George Hodulik [Mon, 15 Apr 2019 20:31:22 +0000 (13:31 -0700)]
Merge "Add AppPredictionServiceExists check." into qt-dev am: bd8c161d8d
am: 84f39b7ef0

Change-Id: I3ea0b8bd92338c61ee233dced866461a110c8ff3

5 years agoMerge "More SurfaceAnimator lifetime fixes." into qt-dev am: ed5d40cf26
Rob Carr [Mon, 15 Apr 2019 20:25:35 +0000 (13:25 -0700)]
Merge "More SurfaceAnimator lifetime fixes." into qt-dev am: ed5d40cf26
am: 5314f79bd9

Change-Id: Ife2904e47d2f41dcbe6f1221bb72ebf0e2bc076e

5 years agoMerge "Add AppPredictionServiceExists check." into qt-dev
George Hodulik [Mon, 15 Apr 2019 20:17:40 +0000 (13:17 -0700)]
Merge "Add AppPredictionServiceExists check." into qt-dev
am: bd8c161d8d

Change-Id: Id7c20e1e1baa970eec5727f2d41216d91e57d954

5 years agoMerge "Revert "Fix issue in attached layouting"" into qt-dev am: 0a510f8bbf
Jorim Jaggi [Mon, 15 Apr 2019 20:13:53 +0000 (13:13 -0700)]
Merge "Revert "Fix issue in attached layouting"" into qt-dev am: 0a510f8bbf
am: b73f0f5b8a

Change-Id: I3cacf2dd44738dc48264ea10edcea00883ce9235

5 years agoMerge "More SurfaceAnimator lifetime fixes." into qt-dev
Rob Carr [Mon, 15 Apr 2019 20:11:40 +0000 (13:11 -0700)]
Merge "More SurfaceAnimator lifetime fixes." into qt-dev
am: ed5d40cf26

Change-Id: Iea26915848f87f0c905491abb6aaa5968c84ca94

5 years agoMerge "[automerger skipped] Merge "Remove key_ prefix from CarrierConfig Strings...
Nathan Harold [Mon, 15 Apr 2019 19:55:33 +0000 (12:55 -0700)]
Merge "[automerger skipped] Merge "Remove key_ prefix from CarrierConfig Strings" into qt-dev am: 078d4d1475 -s ours
am: f97ba0e29c -s ours
am skip reason: change_id I1ae1df9d33229d3f3aba237d865ceb2373761af4 with SHA1 bbb8968e54 is in history

Change-Id: I710810f585f19ce0d854c40c7dd71e6ba8f82efd

5 years agoMerge "Add AppPredictionServiceExists check." into qt-dev
TreeHugger Robot [Mon, 15 Apr 2019 19:49:19 +0000 (19:49 +0000)]
Merge "Add AppPredictionServiceExists check." into qt-dev

5 years agoMerge "More SurfaceAnimator lifetime fixes." into qt-dev
Rob Carr [Mon, 15 Apr 2019 19:44:08 +0000 (19:44 +0000)]
Merge "More SurfaceAnimator lifetime fixes." into qt-dev

5 years agoMerge "qt-dev-plus-aosp designated for R. Update MAX_PLATFORM_VERSION, etc." into...
Ryan Mitchell [Mon, 15 Apr 2019 19:41:01 +0000 (12:41 -0700)]
Merge "qt-dev-plus-aosp designated for R. Update MAX_PLATFORM_VERSION, etc." into qt-dev-plus-aosp
am: 9202886cbf

Change-Id: Ie96fc31615d4e60dbbf7050b1a15e8fa14ecd722

5 years agoMerge "Revert "Fix issue in attached layouting"" into qt-dev
Jorim Jaggi [Mon, 15 Apr 2019 19:37:10 +0000 (12:37 -0700)]
Merge "Revert "Fix issue in attached layouting"" into qt-dev
am: 0a510f8bbf

Change-Id: If31e0ec393905ba24e26af0d7e1f035b4fd813ab

5 years agoAudioService: more stringent on dropping ACTION_AUDIO_BECOMING_NOISY am: c1adecd66a
Jean-Michel Trivi [Mon, 15 Apr 2019 19:22:06 +0000 (12:22 -0700)]
AudioService: more stringent on dropping ACTION_AUDIO_BECOMING_NOISY am: c1adecd66a
am: 5a2f0790ab

Change-Id: Id0495d0533be72276167a6af010cfc0ab91c3d7a

5 years ago[automerger skipped] Merge "Bluetooth: Make ScanRecord.getServiceSolicitationUuids...
Jakub Pawlowski [Mon, 15 Apr 2019 19:16:00 +0000 (12:16 -0700)]
[automerger skipped] Merge "Bluetooth: Make ScanRecord.getServiceSolicitationUuids NonNull" into qt-dev am: f98ada2290 -s ours
am: 1e577c1ce5 -s ours
am skip reason: change_id I5f895d65a7036275ab0faa0afd2ee1eebc416476 with SHA1 64307cc0b2 is in history

Change-Id: I777456067e4fbf1cdbd9d069a0c3488dcfd2a150

5 years agoMerge "Revert "Fix issue in attached layouting"" into qt-dev
Jorim Jaggi [Mon, 15 Apr 2019 19:14:41 +0000 (19:14 +0000)]
Merge "Revert "Fix issue in attached layouting"" into qt-dev

5 years agoMerge "[automerger skipped] Merge "Remove key_ prefix from CarrierConfig Strings...
Android Build Merger (Role) [Mon, 15 Apr 2019 19:09:49 +0000 (19:09 +0000)]
Merge "[automerger skipped] Merge "Remove key_ prefix from CarrierConfig Strings" into qt-dev am: 078d4d1475 -s ours am skip reason: change_id I1ae1df9d33229d3f3aba237d865ceb2373761af4 with SHA1 bbb8968e54 is in history" into qt-dev-plus-aosp

5 years ago[automerger skipped] Merge "Remove key_ prefix from CarrierConfig Strings" into qt-dev
Nathan Harold [Mon, 15 Apr 2019 19:09:08 +0000 (12:09 -0700)]
[automerger skipped] Merge "Remove key_ prefix from CarrierConfig Strings" into qt-dev
am: 078d4d1475 -s ours
am skip reason: change_id I1ae1df9d33229d3f3aba237d865ceb2373761af4 with SHA1 bbb8968e54 is in history

Change-Id: I10b999bd28d4625915e53ae3bedf7fcf74df4c6b

5 years agoMerge "qt-dev-plus-aosp designated for R. Update MAX_PLATFORM_VERSION, etc." into...
Ryan Mitchell [Mon, 15 Apr 2019 19:07:10 +0000 (19:07 +0000)]
Merge "qt-dev-plus-aosp designated for R. Update MAX_PLATFORM_VERSION, etc." into qt-dev-plus-aosp

5 years ago[automerger skipped] Merge "Load /metadata/password_slots/slot_map lazily." into...
David Anderson [Mon, 15 Apr 2019 19:03:54 +0000 (12:03 -0700)]
[automerger skipped] Merge "Load /metadata/password_slots/slot_map lazily." into qt-dev am: 9a73912aec
am: da439d4abb -s ours
am skip reason: change_id Ib2e0c05575d07496792188716b962ca622df28e6 with SHA1 f55f5d83de is in history

Change-Id: I25d958a9a511bb145f372f7c6b4d1cfa379456af

5 years agoAudioService: more stringent on dropping ACTION_AUDIO_BECOMING_NOISY
Jean-Michel Trivi [Mon, 15 Apr 2019 19:03:53 +0000 (12:03 -0700)]
AudioService: more stringent on dropping ACTION_AUDIO_BECOMING_NOISY
am: c1adecd66a

Change-Id: Ie2a7f82f97605c4e3684cecb128ad64bf14b9dc3

5 years agoMerge "Support render-ahead in vulkan" into qt-dev am: 08ca2a2560
John Reck [Mon, 15 Apr 2019 18:57:00 +0000 (11:57 -0700)]
Merge "Support render-ahead in vulkan" into qt-dev am: 08ca2a2560
am: a2e9ec9f2e

Change-Id: Icca706c923c87278c0a9910dd1746272c0da3e3d

5 years ago[automerger skipped] Merge "Bluetooth: Make ScanRecord.getServiceSolicitationUuids...
Jakub Pawlowski [Mon, 15 Apr 2019 18:55:42 +0000 (11:55 -0700)]
[automerger skipped] Merge "Bluetooth: Make ScanRecord.getServiceSolicitationUuids NonNull" into qt-dev
am: f98ada2290 -s ours
am skip reason: change_id I5f895d65a7036275ab0faa0afd2ee1eebc416476 with SHA1 64307cc0b2 is in history

Change-Id: I40000c30cca0a169eb22fbd74ca3cff1f546bd05

5 years agoMerge "Remove key_ prefix from CarrierConfig Strings" into qt-dev
Nathan Harold [Mon, 15 Apr 2019 18:51:37 +0000 (18:51 +0000)]
Merge "Remove key_ prefix from CarrierConfig Strings" into qt-dev

5 years agoAudioService: more stringent on dropping ACTION_AUDIO_BECOMING_NOISY
Jean-Michel Trivi [Sun, 14 Apr 2019 00:11:50 +0000 (17:11 -0700)]
AudioService: more stringent on dropping ACTION_AUDIO_BECOMING_NOISY

Drop ACTION_AUDIO_BECOMING_NOISY only when there is no more audio
  focus users.

Bug: 129983099
Test: see bug
Change-Id: I899301754ba1506598b1be1cb5605bc3b53e3942

5 years agoMerge "Load /metadata/password_slots/slot_map lazily." into qt-dev
David Anderson [Mon, 15 Apr 2019 18:47:39 +0000 (11:47 -0700)]
Merge "Load /metadata/password_slots/slot_map lazily." into qt-dev
am: 9a73912aec

Change-Id: If816edbe0d27c107ae2ee7c42c4bea447ae43021

5 years agoMerge "Support render-ahead in vulkan" into qt-dev
John Reck [Mon, 15 Apr 2019 18:40:58 +0000 (11:40 -0700)]
Merge "Support render-ahead in vulkan" into qt-dev
am: 08ca2a2560

Change-Id: I51ce1419820a0f984b52f2bbee18604ef39aed7f

5 years agoMerge "Resolve CEC related API requests from API Council" into qt-dev am: 64b51f91ff
Amy Zhang [Mon, 15 Apr 2019 18:38:24 +0000 (11:38 -0700)]
Merge "Resolve CEC related API requests from API Council" into qt-dev am: 64b51f91ff
am: 7a7ebecb9b

Change-Id: I2fc466ca79400faffd78eee543a15da63e638e2f

5 years agoMerge "Bluetooth: Make ScanRecord.getServiceSolicitationUuids NonNull" into qt-dev
TreeHugger Robot [Mon, 15 Apr 2019 18:38:14 +0000 (18:38 +0000)]
Merge "Bluetooth: Make ScanRecord.getServiceSolicitationUuids NonNull" into qt-dev

5 years agoMerge "Switch ByteStringUtils over to HexEncoding impl" am: 6150065560 am: 42aacac8ad
Neil Fuller [Mon, 15 Apr 2019 18:32:18 +0000 (11:32 -0700)]
Merge "Switch ByteStringUtils over to HexEncoding impl" am: 6150065560 am: 42aacac8ad
am: d982160c6a

Change-Id: Ibc609623891b69c694fdbffa81ce59c90f3db8d6

5 years agoMerge "Load /metadata/password_slots/slot_map lazily." into qt-dev
David Anderson [Mon, 15 Apr 2019 18:28:38 +0000 (18:28 +0000)]
Merge "Load /metadata/password_slots/slot_map lazily." into qt-dev

5 years agoMerge "Catch all exceptions when calling startCheckpoint()." into qt-dev am: ad6195dc40
Martijn Coenen [Mon, 15 Apr 2019 18:23:11 +0000 (11:23 -0700)]
Merge "Catch all exceptions when calling startCheckpoint()." into qt-dev am: ad6195dc40
am: 26b42aea01

Change-Id: If785f5803dc4449128cd1e0b51fb8d6a84701011

5 years agoMerge "Support render-ahead in vulkan" into qt-dev
John Reck [Mon, 15 Apr 2019 18:20:28 +0000 (18:20 +0000)]
Merge "Support render-ahead in vulkan" into qt-dev

5 years agoMerge "Add NonNull in Carriers constant" into qt-dev am: c6a1bf1ac1
Calvin Pan [Mon, 15 Apr 2019 18:12:18 +0000 (11:12 -0700)]
Merge "Add NonNull in Carriers constant" into qt-dev am: c6a1bf1ac1
am: d0ad497e6c

Change-Id: I428ff623d46d3891b05882df5774343bfe3234c0

5 years agoMerge "Resolve CEC related API requests from API Council" into qt-dev
Amy Zhang [Mon, 15 Apr 2019 18:05:06 +0000 (11:05 -0700)]
Merge "Resolve CEC related API requests from API Council" into qt-dev
am: 64b51f91ff

Change-Id: I8c9f89d3bd8c4124e4d09115684a02156e19e1fb

5 years agoMerge "Ensure strings are consistent with HIDL documentation" into qt-dev am: 6e77293d29
Kevin Chyn [Mon, 15 Apr 2019 18:02:59 +0000 (11:02 -0700)]
Merge "Ensure strings are consistent with HIDL documentation" into qt-dev am: 6e77293d29
am: d3eb0ab9b5

Change-Id: I2353023fa6cecfb18d5520ce268b038ece681d07

5 years agoRevert "Fix issue in attached layouting"
Jorim Jaggi [Mon, 15 Apr 2019 17:58:52 +0000 (17:58 +0000)]
Revert "Fix issue in attached layouting"

This reverts commit 36dcd2e34be3c1a8b48270a06c5e69162a92a2e2.

Bug: 130553898
Reason for revert: Breaks other CTS (PopupWindowTests)

Change-Id: Ib3a0a189db25d72e85a52dcefa9e1f52a976f3fb

5 years agoMerge "Switch ByteStringUtils over to HexEncoding impl" am: 6150065560
Neil Fuller [Mon, 15 Apr 2019 17:57:36 +0000 (10:57 -0700)]
Merge "Switch ByteStringUtils over to HexEncoding impl" am: 6150065560
am: 42aacac8ad

Change-Id: Ic26eb802f39f1f86177a2de8e855573806e08998

5 years agoMerge "Catch all exceptions when calling startCheckpoint()." into qt-dev
Martijn Coenen [Mon, 15 Apr 2019 17:51:56 +0000 (10:51 -0700)]
Merge "Catch all exceptions when calling startCheckpoint()." into qt-dev
am: ad6195dc40

Change-Id: I92509dde4d0e00f36f435b4f0bba616c44f42ff5

5 years agoMerge "AudioService: better vol adjustment logs" into qt-dev am: ddba88ea71
Jean-Michel Trivi [Mon, 15 Apr 2019 17:47:25 +0000 (10:47 -0700)]
Merge "AudioService: better vol adjustment logs" into qt-dev am: ddba88ea71
am: e11d6a5fb8

Change-Id: I97fb0be7aab267a2e0d34ddc31f51200497d92f4

5 years agoMerge "Switch ByteStringUtils over to HexEncoding impl"
Neil Fuller [Mon, 15 Apr 2019 17:47:04 +0000 (10:47 -0700)]
Merge "Switch ByteStringUtils over to HexEncoding impl"
am: 6150065560

Change-Id: If57eb62d54b6c473051a560bf523819f0b971439

5 years agoMerge "Resolve CEC related API requests from API Council" into qt-dev
Amy Zhang [Mon, 15 Apr 2019 17:46:49 +0000 (17:46 +0000)]
Merge "Resolve CEC related API requests from API Council" into qt-dev

5 years agoMerge "Add NonNull in Carriers constant" into qt-dev
Calvin Pan [Mon, 15 Apr 2019 17:44:46 +0000 (10:44 -0700)]
Merge "Add NonNull in Carriers constant" into qt-dev
am: c6a1bf1ac1

Change-Id: I6589938d50ca84c3d9eed43c358c791e5ed1cee2

5 years agoMerge "AudioPolicy: fix test API for focus policy" into qt-dev am: 848eab444c
Jean-Michel Trivi [Mon, 15 Apr 2019 17:40:10 +0000 (10:40 -0700)]
Merge "AudioPolicy: fix test API for focus policy" into qt-dev am: 848eab444c
am: 194d6fd230

Change-Id: I926e0ad67745a83ba06f6c87031ca2838ecf3a88

5 years agoMerge "Catch all exceptions when calling startCheckpoint()." into qt-dev
Martijn Coenen [Mon, 15 Apr 2019 17:38:08 +0000 (17:38 +0000)]
Merge "Catch all exceptions when calling startCheckpoint()." into qt-dev

5 years agoMerge "Ensure strings are consistent with HIDL documentation" into qt-dev
Kevin Chyn [Mon, 15 Apr 2019 17:34:35 +0000 (10:34 -0700)]
Merge "Ensure strings are consistent with HIDL documentation" into qt-dev
am: 6e77293d29

Change-Id: I9152d80ede71656932830818d3f27b31dca931e3

5 years agoMerge "Add NonNull in Carriers constant" into qt-dev
Calvin Pan [Mon, 15 Apr 2019 17:33:37 +0000 (17:33 +0000)]
Merge "Add NonNull in Carriers constant" into qt-dev

5 years agoMerge "Switch ByteStringUtils over to HexEncoding impl"
Neil Fuller [Mon, 15 Apr 2019 17:30:35 +0000 (17:30 +0000)]
Merge "Switch ByteStringUtils over to HexEncoding impl"

5 years agoMerge "AudioService: better vol adjustment logs" into qt-dev
Jean-Michel Trivi [Mon, 15 Apr 2019 17:24:48 +0000 (10:24 -0700)]
Merge "AudioService: better vol adjustment logs" into qt-dev
am: ddba88ea71

Change-Id: I9c57e4b7dc86947277caca9c550b2d1a08c2a51b

5 years agoMerge "Fix tinting of battery percentage" into qt-dev am: c34f078f61
Fabian Kozynski [Mon, 15 Apr 2019 17:19:21 +0000 (10:19 -0700)]
Merge "Fix tinting of battery percentage" into qt-dev am: c34f078f61
am: 6ee04ed0b7

Change-Id: I852f59db3a02df586098d5faa2f96ee59ee56c74

5 years agoMerge "AudioPolicy: fix test API for focus policy" into qt-dev
Jean-Michel Trivi [Mon, 15 Apr 2019 17:16:12 +0000 (10:16 -0700)]
Merge "AudioPolicy: fix test API for focus policy" into qt-dev
am: 848eab444c

Change-Id: I3e33fb238b1f410bbeb06f8d22f06149ad126501

5 years agoMerge "Fix tinting of battery percentage" into qt-dev
Fabian Kozynski [Mon, 15 Apr 2019 17:05:36 +0000 (10:05 -0700)]
Merge "Fix tinting of battery percentage" into qt-dev
am: c34f078f61

Change-Id: I1e1778605b7415e2360d80d51c09f3d7faa8a664

5 years agoMerge "Add getters to AudioPlaybackCaptureConfiguration" into qt-dev am: 4bea465dbb
Kevin Rocard [Mon, 15 Apr 2019 17:00:03 +0000 (10:00 -0700)]
Merge "Add getters to AudioPlaybackCaptureConfiguration" into qt-dev am: 4bea465dbb
am: 2ebde19cfa

Change-Id: I975cf26996648862c6e8c5955a5e850687d8bf95

5 years agoMerge "Ensure strings are consistent with HIDL documentation" into qt-dev
Kevin Chyn [Mon, 15 Apr 2019 16:59:03 +0000 (16:59 +0000)]
Merge "Ensure strings are consistent with HIDL documentation" into qt-dev

5 years agoMerge "Mark flaky pre-submit tests" into qt-dev am: 9cf5d50386
Yunfan Chen [Mon, 15 Apr 2019 16:46:17 +0000 (09:46 -0700)]
Merge "Mark flaky pre-submit tests" into qt-dev am: 9cf5d50386
am: 6247ac6658

Change-Id: I0ebdf6ee99b1e95cb8c72cf782a10f30960ae501

5 years agoMerge "AudioService: better vol adjustment logs" into qt-dev
Jean-Michel Trivi [Mon, 15 Apr 2019 16:42:06 +0000 (16:42 +0000)]
Merge "AudioService: better vol adjustment logs" into qt-dev

5 years agoMerge "Add getters to AudioPlaybackCaptureConfiguration" into qt-dev
Kevin Rocard [Mon, 15 Apr 2019 16:41:55 +0000 (09:41 -0700)]
Merge "Add getters to AudioPlaybackCaptureConfiguration" into qt-dev
am: 4bea465dbb

Change-Id: I3cb7f3b7667ac277a012ad9329bc2cb2c8fde1cc

5 years agoMerge "AudioPolicy: fix test API for focus policy" into qt-dev
Jean-Michel Trivi [Mon, 15 Apr 2019 16:38:09 +0000 (16:38 +0000)]
Merge "AudioPolicy: fix test API for focus policy" into qt-dev

5 years agoMerge "Fix tinting of battery percentage" into qt-dev
Fabian Kozynski [Mon, 15 Apr 2019 16:35:10 +0000 (16:35 +0000)]
Merge "Fix tinting of battery percentage" into qt-dev

5 years agoMerge "Merge "Add AudioManager.getAllowedCapturePolicy" into qt-dev am: acf6698f0c...
Android Build Merger (Role) [Mon, 15 Apr 2019 16:31:10 +0000 (16:31 +0000)]
Merge "Merge "Add AudioManager.getAllowedCapturePolicy" into qt-dev am: acf6698f0c am: 71829af911"

5 years agoMerge "Add AudioManager.getAllowedCapturePolicy" into qt-dev am: acf6698f0c
Kevin Rocard [Mon, 15 Apr 2019 16:30:22 +0000 (09:30 -0700)]
Merge "Add AudioManager.getAllowedCapturePolicy" into qt-dev am: acf6698f0c
am: 71829af911

Change-Id: I86a11415d0534d298d682c6453007bd12233fac7

5 years agoMerge "Mark flaky pre-submit tests" into qt-dev
Yunfan Chen [Mon, 15 Apr 2019 16:28:46 +0000 (09:28 -0700)]
Merge "Mark flaky pre-submit tests" into qt-dev
am: 9cf5d50386

Change-Id: Ib59cae49bf39ac271c3b8aa747a9c29d3fc31929

5 years agoMerge "Switch to HexEncoding from ByteStringUtils"
Neil Fuller [Mon, 15 Apr 2019 16:23:16 +0000 (16:23 +0000)]
Merge "Switch to HexEncoding from ByteStringUtils"

5 years agoMerge "Add AudioManager.getAllowedCapturePolicy" into qt-dev
Kevin Rocard [Mon, 15 Apr 2019 16:17:00 +0000 (09:17 -0700)]
Merge "Add AudioManager.getAllowedCapturePolicy" into qt-dev
am: acf6698f0c

Change-Id: Ie8c1fc0052382d77ec9f4c9727c73cddfc0c3e1f

5 years agoMerge "Add getters to AudioPlaybackCaptureConfiguration" into qt-dev
Kevin Rocard [Mon, 15 Apr 2019 16:02:07 +0000 (16:02 +0000)]
Merge "Add getters to AudioPlaybackCaptureConfiguration" into qt-dev

5 years agoMerge "Mark flaky pre-submit tests" into qt-dev
Yunfan Chen [Mon, 15 Apr 2019 15:52:44 +0000 (15:52 +0000)]
Merge "Mark flaky pre-submit tests" into qt-dev

5 years agoMerge "Add AudioManager.getAllowedCapturePolicy" into qt-dev
TreeHugger Robot [Mon, 15 Apr 2019 15:44:32 +0000 (15:44 +0000)]
Merge "Add AudioManager.getAllowedCapturePolicy" into qt-dev

5 years agoFix '-u <user id>' handling in 'adb ime enable' and 'adb ime set' am: 3403f2d85e
Yohei Yukawa [Mon, 15 Apr 2019 15:43:14 +0000 (08:43 -0700)]
Fix '-u <user id>' handling in 'adb ime enable' and 'adb ime set' am: 3403f2d85e
am: e39528c4f7

Change-Id: I4c8678778cadc4fa26ea310a738f549435d4e48b

5 years agoFix '-u <user id>' handling in 'adb ime enable' and 'adb ime set'
Yohei Yukawa [Mon, 15 Apr 2019 15:36:41 +0000 (08:36 -0700)]
Fix '-u <user id>' handling in 'adb ime enable' and 'adb ime set'
am: 3403f2d85e

Change-Id: I78dda9e117a873bb2f02a6fad9fdf4ea4df6b546

5 years agoAdd getters to AudioPlaybackCaptureConfiguration
Kevin Rocard [Tue, 9 Apr 2019 23:25:26 +0000 (16:25 -0700)]
Add getters to AudioPlaybackCaptureConfiguration

Unfortunately AudioMixingRule being in a different package,
some of its members had to be made public @hide to be used
by AudioPlaybackCaptureConfiguration.

Bug: 129948989
Test: atest AudioAttributesTest
Change-Id: Ie8cdf67aee9ff7cf9144a66d47c301712516cf87
Signed-off-by: Kevin Rocard <krocard@google.com>
5 years agoFix '-u <user id>' handling in 'adb ime enable' and 'adb ime set'
Yohei Yukawa [Mon, 15 Apr 2019 15:16:58 +0000 (08:16 -0700)]
Fix '-u <user id>' handling in 'adb ime enable' and 'adb ime set'

This is a follow up CL to my previous CLs [1][2], which added
'-u <user id>' option to
   adb shell ime enable <ime id>
and
   adb shell ime set <ime id>
respectively.

Those CL had a bug that was introduced during the last round of the
code review when I was addressing a review comment.  As a result,
those two commands simply fail if '-u' or '--user' option is
specified.  With this CL, those we can finally start specifying the
user ID for those two commands.

This CL also fixes a bug that output for
  adb shell ime set -u all <ime id>
are not correctly formatted.

Note that this CL only fixes a bug in debug shell commands. There
should be no user-visible behavior change in end-user use cases.

 [1]: Ia0f873e4589a9fc3f549469e3d1d966640dc2df5
      e177170f6432631d54788a37f4fb468a02468ed0
 [2]: I397cf0fb418a395dcafc0ab0d8d4e553b0f2eaab
      099f80ce9762e8b20998759fd6082bdcd6291103

Bug: 120784635
Test: Manually tested as follows:
  1. Build aosp_blueline-userdebug and flash it
  2. make -j SoftKeyboard
  3. adb install -r $OUT/system/app/SoftKeyboard/SoftKeyboard.apk
  4. adb shell pm create-user test
  5. adb shell am switch-user 10
  6. adb shell ime disable -u 0 com.example.android.softkeyboard/.SoftKeyboard
     -> Input method com.example.android.softkeyboard/.SoftKeyboard: now disabled for user #0
  7. adb shell ime enable -u 0 com.example.android.softkeyboard/.SoftKeyboard
     -> Input method com.example.android.softkeyboard/.SoftKeyboard: now enabled for user #0
  8. adb shell ime set -u 0 com.example.android.softkeyboard/.SoftKeyboard
     -> Input method com.example.android.softkeyboard/.SoftKeyboard selected for user #0
Test: Manually tested as follows.
  1. Build aosp_blueline-userdebug and flash it
  2. adb shell pm create-user test
  3. adb shell pm create-user restricted_test
  4. adb root
  5. adb shell pm set-user-restriction --user 11 no_debugging_features 1
  6. adb shell am switch-user 10
  7. adb shell am switch-user 11
  8. adb shell am switch-user 0
  9. adb shell ime set -u all com.android.inputmethod.latin/.LatinIME
     -> Input method com.android.inputmethod.latin/.LatinIME selected for user #0
        Input method com.android.inputmethod.latin/.LatinIME selected for user #10
        User #11 is restricted with DISALLOW_DEBUGGING_FEATURES.
 10. adb shell ime disable -u all com.android.inputmethod.latin/.LatinIME
     -> Input method com.android.inputmethod.latin/.LatinIME: now disabled for user #0
        Input method com.android.inputmethod.latin/.LatinIME: now disabled for user #10
        User #11 is restricted with DISALLOW_DEBUGGING_FEATURES.
Change-Id: I4e396519400c0ccd17322fe085b45456621714e7

5 years ago[automerger skipped] Merge "DO NOT MERGE Turn off LAYER_TYPE_SOFTWARE on BatteryMeter...
Evan Laird [Mon, 15 Apr 2019 15:16:26 +0000 (08:16 -0700)]
[automerger skipped] Merge "DO NOT MERGE Turn off LAYER_TYPE_SOFTWARE on BatteryMeterView" into qt-dev am: eb24d06f8d
am: 25299db420 -s ours
am skip reason: subject contains skip directive

Change-Id: Id53c95b26415f03232a42fad4e7b641f144ed4ef

5 years agoMerge "DO NOT MERGE Turn off LAYER_TYPE_SOFTWARE on BatteryMeterView" into qt-dev
Evan Laird [Mon, 15 Apr 2019 15:04:47 +0000 (08:04 -0700)]
Merge "DO NOT MERGE Turn off LAYER_TYPE_SOFTWARE on BatteryMeterView" into qt-dev
am: eb24d06f8d

Change-Id: I619e34943d8b669ca8ddfa8337f695919b52a13d

5 years agoMerge "Don't hold mPackages when clearing package state" into qt-dev am: e299aa4ea4
Patrick Baumann [Mon, 15 Apr 2019 14:40:26 +0000 (07:40 -0700)]
Merge "Don't hold mPackages when clearing package state" into qt-dev am: e299aa4ea4
am: 1342c26cb4

Change-Id: I6e10807c07016cb16d15ab51ff0c673c1cf7978a

5 years agoMerge "DO NOT MERGE Turn off LAYER_TYPE_SOFTWARE on BatteryMeterView" into qt-dev
TreeHugger Robot [Mon, 15 Apr 2019 14:36:46 +0000 (14:36 +0000)]
Merge "DO NOT MERGE Turn off LAYER_TYPE_SOFTWARE on BatteryMeterView" into qt-dev

5 years agoDO NOT MERGE Turn off LAYER_TYPE_SOFTWARE on BatteryMeterView
Evan Laird [Tue, 2 Apr 2019 16:56:00 +0000 (12:56 -0400)]
DO NOT MERGE Turn off LAYER_TYPE_SOFTWARE on BatteryMeterView

We still need to save a layer for the BlendMode.CLEAR paint to do the
right thing. But with this we can save just the layer needed to draw the
battery instead of the whole battery meter view.

Test: visual
Bug: 130536257
Change-Id: I9d5844440250ccd9174e6c001e051c9adf62a2d0
(cherry picked from commit b4c703b8e30e50fa451171be563c556704db5ef4)

5 years agoMerge "Don't hold mPackages when clearing package state" into qt-dev
Patrick Baumann [Mon, 15 Apr 2019 14:32:28 +0000 (07:32 -0700)]
Merge "Don't hold mPackages when clearing package state" into qt-dev
am: e299aa4ea4

Change-Id: I9c9f087fafbc977c2dc5950dd567ffd107b3bc45

5 years agoMerge "Don't hold mPackages when clearing package state" into qt-dev
TreeHugger Robot [Mon, 15 Apr 2019 14:15:53 +0000 (14:15 +0000)]
Merge "Don't hold mPackages when clearing package state" into qt-dev

5 years agoMerge "Fix wrong MSIME check in onImeWindowSetOnDisplay." into qt-dev am: 49c98a7b63
lumark [Mon, 15 Apr 2019 13:28:08 +0000 (06:28 -0700)]
Merge "Fix wrong MSIME check in onImeWindowSetOnDisplay." into qt-dev am: 49c98a7b63
am: 7576e77850

Change-Id: Id2a282e4f501e48e75ef63e0e5583c8e97f73fde

5 years agoMerge "Fix issue in attached layouting" into qt-dev am: 9aa2d740bd
Jorim Jaggi [Mon, 15 Apr 2019 13:20:49 +0000 (06:20 -0700)]
Merge "Fix issue in attached layouting" into qt-dev am: 9aa2d740bd
am: c6cd7560c8

Change-Id: If8ac13cd8e3e7dc15000c6e7c49bab07dcd4f4bb

5 years agoMerge "Merge "Move some telephony methods to max-sdk-p list." am: 6c702ac545 am:...
Mathew Inwood [Mon, 15 Apr 2019 13:09:50 +0000 (06:09 -0700)]
Merge "Merge "Move some telephony methods to max-sdk-p list." am: 6c702ac545 am: 5633332ecc" into qt-dev-plus-aosp
am: 083cb78ca8

Change-Id: I22230ce76976d72518725af5a06ab1a99f7383c8

5 years agoMerge "Fix wrong MSIME check in onImeWindowSetOnDisplay." into qt-dev
lumark [Mon, 15 Apr 2019 13:00:11 +0000 (06:00 -0700)]
Merge "Fix wrong MSIME check in onImeWindowSetOnDisplay." into qt-dev
am: 49c98a7b63

Change-Id: I371879f38f457b50c86175eb46fd21859767401d

5 years agoMerge "Add new metrics for ManagedProvisioning." into qt-dev am: 6243f0aa27
arangelov [Mon, 15 Apr 2019 12:54:35 +0000 (05:54 -0700)]
Merge "Add new metrics for ManagedProvisioning." into qt-dev am: 6243f0aa27
am: bea1848fb0

Change-Id: I394a3024b3ab530b74d759cfe2df3662f9f1b5e8

5 years agoMerge "Fix issue in attached layouting" into qt-dev
Jorim Jaggi [Mon, 15 Apr 2019 12:54:31 +0000 (05:54 -0700)]
Merge "Fix issue in attached layouting" into qt-dev
am: 9aa2d740bd

Change-Id: Idd371db0aae8c8be2388d82e4f8f9bcc0b7a4cf9

5 years agoMerge "Merge "Move some telephony methods to max-sdk-p list." am: 6c702ac545 am:...
Android Build Merger (Role) [Mon, 15 Apr 2019 12:45:40 +0000 (12:45 +0000)]
Merge "Merge "Move some telephony methods to max-sdk-p list." am: 6c702ac545 am: 5633332ecc" into qt-dev-plus-aosp

5 years agoMerge "Reduce transactions for acquiring and releasing provider" into qt-dev am:...
Riddle Hsu [Mon, 15 Apr 2019 12:45:31 +0000 (05:45 -0700)]
Merge "Reduce transactions for acquiring and releasing provider" into qt-dev am: 59b8b82e74
am: e6cc6440ba

Change-Id: I95a709b3c32b05695ac7e68622cde1bc3c45a525

5 years agoMerge "Move some telephony methods to max-sdk-p list." am: 6c702ac545
Mathew Inwood [Mon, 15 Apr 2019 12:45:11 +0000 (05:45 -0700)]
Merge "Move some telephony methods to max-sdk-p list." am: 6c702ac545
am: 5633332ecc

Change-Id: Ie78e931cd6f39beccf8b2a710a43275ad2aae26d

5 years agoMerge "Add new metrics for ManagedProvisioning." into qt-dev
arangelov [Mon, 15 Apr 2019 12:44:39 +0000 (05:44 -0700)]
Merge "Add new metrics for ManagedProvisioning." into qt-dev
am: 6243f0aa27

Change-Id: Ib66979ebe21efcdf2fb2ff8be9578ea9dee0cdb9

5 years agoMerge "Fix wrong MSIME check in onImeWindowSetOnDisplay." into qt-dev
TreeHugger Robot [Mon, 15 Apr 2019 12:42:30 +0000 (12:42 +0000)]
Merge "Fix wrong MSIME check in onImeWindowSetOnDisplay." into qt-dev

5 years agoMerge "Reduce transactions for acquiring and releasing provider" into qt-dev
Riddle Hsu [Mon, 15 Apr 2019 12:35:19 +0000 (05:35 -0700)]
Merge "Reduce transactions for acquiring and releasing provider" into qt-dev
am: 59b8b82e74

Change-Id: I4368e7f955b47042d0ecf62d5714c5693bdab027

5 years agoMerge "Fix issue in attached layouting" into qt-dev
Jorim Jaggi [Mon, 15 Apr 2019 12:33:57 +0000 (12:33 +0000)]
Merge "Fix issue in attached layouting" into qt-dev

5 years agoMerge "Move some telephony methods to max-sdk-p list."
Mathew Inwood [Mon, 15 Apr 2019 12:33:27 +0000 (05:33 -0700)]
Merge "Move some telephony methods to max-sdk-p list."
am: 6c702ac545

Change-Id: I6205948f0ba7d0c0bed76ea583f8bbaeb47452f6

5 years agoMerge "Add new metrics for ManagedProvisioning." into qt-dev
TreeHugger Robot [Mon, 15 Apr 2019 12:25:32 +0000 (12:25 +0000)]
Merge "Add new metrics for ManagedProvisioning." into qt-dev

5 years agoMerge "Reduce transactions for acquiring and releasing provider" into qt-dev
TreeHugger Robot [Mon, 15 Apr 2019 12:18:30 +0000 (12:18 +0000)]
Merge "Reduce transactions for acquiring and releasing provider" into qt-dev

5 years agoMerge "Move some telephony methods to max-sdk-p list."
Mathew Inwood [Mon, 15 Apr 2019 12:16:09 +0000 (12:16 +0000)]
Merge "Move some telephony methods to max-sdk-p list."

5 years agoMerge "Merge "Catch exceptions thrown from UpdateEngine#applyPayload." into qt-dev...
Alex Kershaw [Mon, 15 Apr 2019 11:42:37 +0000 (04:42 -0700)]
Merge "Merge "Catch exceptions thrown from UpdateEngine#applyPayload." into qt-dev am: d76033fd24" into qt-dev-plus-aosp
am: bef10595ef

Change-Id: Ibd27bfb518bb73718e316e5de25c87ed7cf2d278

5 years ago[automerger skipped] Merge "Update OWNERS" am: abc9b9edcc am: 1636bb34f9 -s ours
Makoto Onuki [Mon, 15 Apr 2019 11:30:30 +0000 (04:30 -0700)]
[automerger skipped] Merge "Update OWNERS" am: abc9b9edcc am: 1636bb34f9 -s ours
am: 43ccb1e990 -s ours
am skip reason: change_id I075ac3ec47743f5d9cd2acbd0cc01ce55cd1a8e3 with SHA1 878cbf8269 is in history

Change-Id: I5d9659ec75f287c1b5806eb5f554396007e72ea9

5 years agoMerge "Merge "Catch exceptions thrown from UpdateEngine#applyPayload." into qt-dev...
Android Build Merger (Role) [Mon, 15 Apr 2019 11:19:52 +0000 (11:19 +0000)]
Merge "Merge "Catch exceptions thrown from UpdateEngine#applyPayload." into qt-dev am: d76033fd24" into qt-dev-plus-aosp

5 years agoMerge "Catch exceptions thrown from UpdateEngine#applyPayload." into qt-dev
Alex Kershaw [Mon, 15 Apr 2019 11:19:28 +0000 (04:19 -0700)]
Merge "Catch exceptions thrown from UpdateEngine#applyPayload." into qt-dev
am: d76033fd24

Change-Id: I4f5fb3bc5418d616e4b8ef35023eb5086e4d58a1

5 years ago[automerger skipped] Merge "Update OWNERS" am: abc9b9edcc
Makoto Onuki [Mon, 15 Apr 2019 11:19:13 +0000 (04:19 -0700)]
[automerger skipped] Merge "Update OWNERS" am: abc9b9edcc
am: 1636bb34f9 -s ours
am skip reason: change_id I075ac3ec47743f5d9cd2acbd0cc01ce55cd1a8e3 with SHA1 878cbf8269 is in history

Change-Id: I3bbc1363a944b5b374c87bc02a9c45ca419a7aaf

5 years agoMerge "Update OWNERS"
Makoto Onuki [Mon, 15 Apr 2019 11:07:46 +0000 (04:07 -0700)]
Merge "Update OWNERS"
am: abc9b9edcc

Change-Id: I77c5fe25ef1a790c379ff160171946f79fdb316d

5 years agoMerge "Catch exceptions thrown from UpdateEngine#applyPayload." into qt-dev
TreeHugger Robot [Mon, 15 Apr 2019 11:01:49 +0000 (11:01 +0000)]
Merge "Catch exceptions thrown from UpdateEngine#applyPayload." into qt-dev