Chun-Wei Wang
e4828cb97c
Merge "Fix the algorithm counting the package failures"
2019-09-17 01:49:37 +00:00
TreeHugger Robot
76c89da69c
Merge "Fix MixedProfileOwnerTest#testLockTask_emergencyDialer failure"
2019-09-17 01:25:27 +00:00
TreeHugger Robot
def5db74a3
Merge "Apply front scrim to doze pulsing"
2019-09-17 01:20:55 +00:00
Yifan Hong
08d33aaa0f
Merge "VintfObject: Fix getHalNamesAndVersions doc" am: bc45ac13ef am: c109452058 am: 6479d51ebb
...
am: 31e27a148b
Change-Id: Iaf68cfe3d73763bab5e84cd56b495b96c5cf6f1e
2019-09-16 18:03:43 -07:00
Yifan Hong
31e27a148b
Merge "VintfObject: Fix getHalNamesAndVersions doc" am: bc45ac13ef am: c109452058
...
am: 6479d51ebb
Change-Id: I02cc8fda3340dc600d66e11c9f4077f062823d9c
2019-09-16 17:50:34 -07:00
Yifan Hong
6479d51ebb
Merge "VintfObject: Fix getHalNamesAndVersions doc" am: bc45ac13ef
...
am: c109452058
Change-Id: Ib83cfbbc8eec71394f87d3c2cd9b61b18796ba4a
2019-09-16 17:38:00 -07:00
Yifan Hong
c109452058
Merge "VintfObject: Fix getHalNamesAndVersions doc"
...
am: bc45ac13ef
Change-Id: I5148b0071b51cdcc0cc1ed1e2ac5c5e89be61b53
2019-09-16 17:19:58 -07:00
Yifan Hong
bc45ac13ef
Merge "VintfObject: Fix getHalNamesAndVersions doc"
2019-09-16 23:58:51 +00:00
TreeHugger Robot
c76c6a0176
Merge "Allow permission<->appop translation for all appop permissions"
2019-09-16 23:44:00 +00:00
Mehdi Alizadeh
f472619495
Merge changes I41e08b86,I7760f37d into qt-qpr1-dev am: 30e495d0c4
...
am: a69031d173
Change-Id: Ia43318041306a97daedc5fd2409caf61ef4f4456
2019-09-16 16:38:31 -07:00
Mehdi Alizadeh
a69031d173
Merge changes I41e08b86,I7760f37d into qt-qpr1-dev
...
am: 30e495d0c4
Change-Id: Iae876b13f07a0bfe55baff58ca672d93a0f461e3
2019-09-16 16:31:24 -07:00
TreeHugger Robot
5165896347
Merge "Rename flags in aapt2-optimize for more accuracy and consistency."
2019-09-16 23:29:49 +00:00
Mehdi Alizadeh
30e495d0c4
Merge changes I41e08b86,I7760f37d into qt-qpr1-dev
...
* changes:
Use ShortcutInfo#rank to order Sharing Shortcuts in ShareSheet
Adds tests for AppPrediction service availability check
2019-09-16 23:15:22 +00:00
Joshua Tsuji
a571f2fa86
[automerger skipped] Merge "Ignore physics animation tests that have suddenly become flaky." am: 7529e67a80 am: 829ba3dd6c am: e527f95160
...
am: d885e9b3a8 -s ours
am skip reason: change_id Ia15f767fdb251338a7e7b15be7836b6928e48ba5 with SHA1 2b991d91c6 is in history
Change-Id: I0cdc1e571b0f826bc37a030bede0151e1a50dac3
2019-09-16 15:42:44 -07:00
Jordan Liu
b68f3eefec
Merge "Merge "Add carrier config KEY_CALL_FORWARDING_WHEN_UNREACHABLE_SUPPORTED_BOOL" am: be83f253f4 am: 6671633935 am: 4fdf765e76" into qt-qpr1-dev-plus-aosp
...
am: 912e8b1d5d
Change-Id: Ia2f28b8044c376bc80dda17026189d86a76298ad
2019-09-16 15:31:54 -07:00
Mady Mellor
d0c5786f02
[automerger skipped] Merge "qt-r1-bubbles-dev @ build 5835883" into qt-qpr1-dev am: fd48588768 -s ours
...
am: 290fb2fdc4 -s ours
am skip reason: change_id Ic271a6a0f0803941dd5a84124dabf4d8c5fcc755 with SHA1 06b770cf14 is in history
Change-Id: I69dad191b81cb47b109935b14b84156c69f7fac1
2019-09-16 15:26:47 -07:00
Joshua Tsuji
d885e9b3a8
Merge "Ignore physics animation tests that have suddenly become flaky." am: 7529e67a80 am: 829ba3dd6c
...
am: e527f95160
Change-Id: I54cbbf3a9b15fff8602be6d17df65d576d86a535
2019-09-16 15:25:12 -07:00
Android Build Merger (Role)
912e8b1d5d
Merge "Merge "Add carrier config KEY_CALL_FORWARDING_WHEN_UNREACHABLE_SUPPORTED_BOOL" am: be83f253f4 am: 6671633935 am: 4fdf765e76" into qt-qpr1-dev-plus-aosp
2019-09-16 22:19:37 +00:00
Jordan Liu
a075d02808
Merge "Add carrier config KEY_CALL_FORWARDING_WHEN_UNREACHABLE_SUPPORTED_BOOL" am: be83f253f4 am: 6671633935
...
am: 4fdf765e76
Change-Id: I2d39f9a6377c532b58c0d17847e8f3e9f0d4e03b
2019-09-16 15:18:27 -07:00
Mady Mellor
290fb2fdc4
[automerger skipped] Merge "qt-r1-bubbles-dev @ build 5835883" into qt-qpr1-dev
...
am: fd48588768 -s ours
am skip reason: change_id Ic3a4ba793db7f1361678ef51c411d9eab85d9b85 with SHA1 8e10394ccc is in history
Change-Id: I9a3a503f58807eaa2c57b291f6ee416f7aec4fa2
2019-09-16 15:15:06 -07:00
Joshua Tsuji
e527f95160
Merge "Ignore physics animation tests that have suddenly become flaky." am: 7529e67a80
...
am: 829ba3dd6c
Change-Id: Ifc37d3fe02197b631c0533cf2433aa6f9a37a0ee
2019-09-16 15:12:17 -07:00
Jordan Liu
4fdf765e76
Merge "Add carrier config KEY_CALL_FORWARDING_WHEN_UNREACHABLE_SUPPORTED_BOOL" am: be83f253f4
...
am: 6671633935
Change-Id: Ie6acb1d1c72061df9a4ca60a72fd34e0d32491b6
2019-09-16 15:02:34 -07:00
Mady Mellor
fd48588768
Merge "qt-r1-bubbles-dev @ build 5835883" into qt-qpr1-dev
2019-09-16 21:55:51 +00:00
Joshua Tsuji
829ba3dd6c
Merge "Ignore physics animation tests that have suddenly become flaky."
...
am: 7529e67a80
Change-Id: Ib7e2cd892d4249ad6571d52810f90b14fe1f56d4
2019-09-16 14:55:31 -07:00
Jordan Liu
6671633935
Merge "Add carrier config KEY_CALL_FORWARDING_WHEN_UNREACHABLE_SUPPORTED_BOOL"
...
am: be83f253f4
Change-Id: Ia9c042e0bca91b8ede3f0687f4db75ebf9ce8752
2019-09-16 14:49:49 -07:00
Jean-Michel Trivi
9e187407fa
Merge "AudioService: fix missing CEC message on unmute after vol down" am: 4f86011710 am: 1d99b3aaa8 am: 784faabf21
...
am: cd1787c53e
Change-Id: I534fb439f534219a01cc8b5ee12310541a85d28b
2019-09-16 14:49:48 -07:00
TreeHugger Robot
20ecb9aeda
Merge "Camera: audio restriction API doc update"
2019-09-16 21:46:48 +00:00
Jean-Michel Trivi
cd1787c53e
Merge "AudioService: fix missing CEC message on unmute after vol down" am: 4f86011710 am: 1d99b3aaa8
...
am: 784faabf21
Change-Id: I9257ac0b800bd16b3210b817cef7cb818eba56e5
2019-09-16 14:41:17 -07:00
Philip P. Moltmann
4b38fbe1ea
Allow permission<->appop translation for all appop permissions
...
Fixes: 141034220, 141034223, 141032267
Test: CtsPermission2TestCases:atest android.permission2.cts.RuntimePermissionProperties#allAppOpPermissionNeedAnAppOp
Change-Id: I08ad83fd42b54bd3b91983e632ef221d30793b35
2019-09-16 21:40:37 +00:00
Kevin Chyn
c336db8d9b
Merge "10/n: Remove old biometric UI"
2019-09-16 21:35:32 +00:00
Treehugger Robot
7529e67a80
Merge "Ignore physics animation tests that have suddenly become flaky."
2019-09-16 21:32:43 +00:00
Jean-Michel Trivi
784faabf21
Merge "AudioService: fix missing CEC message on unmute after vol down" am: 4f86011710
...
am: 1d99b3aaa8
Change-Id: I7bf0572c66c7331e24fef67074ec82056b8c6396
2019-09-16 14:29:07 -07:00
Jordan Liu
be83f253f4
Merge "Add carrier config KEY_CALL_FORWARDING_WHEN_UNREACHABLE_SUPPORTED_BOOL"
2019-09-16 21:28:03 +00:00
Jean-Michel Trivi
1d99b3aaa8
Merge "AudioService: fix missing CEC message on unmute after vol down"
...
am: 4f86011710
Change-Id: Ife3d6e9f841ee54108cfc04048d5f8118d29aaac
2019-09-16 14:17:54 -07:00
Jean-Michel Trivi
4f86011710
Merge "AudioService: fix missing CEC message on unmute after vol down"
2019-09-16 21:04:08 +00:00
TreeHugger Robot
c48da41993
Merge "Adds app enumeration support for all components"
2019-09-16 20:16:46 +00:00
Brian Chang
d882ba40db
Rename flags in aapt2-optimize for more accuracy and consistency.
...
--enable-resource-path-shortening => --shorten-resource-paths
--enable-resource-obfuscation => --collapse-resource-names
Bug: 140883718
Test: Verified by running `aapt2 optimize
Change-Id: I697713f49b27ccf5f152c76e256234c041dc5f51
2019-09-16 13:09:56 -07:00
Joshua Tsuji
c5fab4172a
Ignore physics animation tests that have suddenly become flaky.
...
Test: atest SystemUITests
Change-Id: Ia15f767fdb251338a7e7b15be7836b6928e48ba5
Merged-In: Ia15f767fdb251338a7e7b15be7836b6928e48ba5
(cherry picked from commit 2b991d91c6 )
2019-09-16 19:55:35 +00:00
Christopher Ferris
1d40886b73
Merge "Use bionic platform headers."
2019-09-16 19:24:55 +00:00
Kevin Chyn
d837cedb92
10/n: Remove old biometric UI
...
Test: atest com.android.systemui.biometrics
Bug: 123378871
Change-Id: Ic000148f4e4540d143581ca6cc296dba34a3db08
2019-09-16 12:11:52 -07:00
Nicholas Ambur
4e76b76716
Merge "change KeyphraseEnrollmentInfo to store services"
2019-09-16 19:02:02 +00:00
TreeHugger Robot
3cec072867
Merge "Move QSCarrierGroup#setListening to background"
2019-09-16 19:01:54 +00:00
Mehdi Alizadeh
26a7dfb211
Merge "Add target type flags to set the origin of share targets" into qt-qpr1-dev am: 2a873c7628
...
am: 205bb67ec8
Change-Id: I328ba7a6ccfdc4b53e288564a1b2bd993ce89a64
2019-09-16 11:47:23 -07:00
Blake Kragten
ec5c62a806
[automerger skipped] Merge "L5 Metrics Addition:" into qt-qpr1-dev am: 9c16632a24
...
am: b0a6968f9d -s ours
am skip reason: change_id Id306d7cc27c9410a5ad73f5a0940c25f8d795686 with SHA1 bb613600fc is in history
Change-Id: I8f95783c22395e6734c522129d6698a874563bea
2019-09-16 11:45:10 -07:00
Mehdi Alizadeh
205bb67ec8
Merge "Add target type flags to set the origin of share targets" into qt-qpr1-dev
...
am: 2a873c7628
Change-Id: Iea7aa38cecabd626e803b27ede6473b714bd2d8a
2019-09-16 11:39:03 -07:00
Soonil Nagarkar
4052fc6795
Merge "Remove all code dealing with obsolete location status"
2019-09-16 18:38:57 +00:00
Blake Kragten
b0a6968f9d
Merge "L5 Metrics Addition:" into qt-qpr1-dev
...
am: 9c16632a24
Change-Id: If50095321517893b805b6ca02150c2c2fd210aab
2019-09-16 11:34:04 -07:00
Mehdi Alizadeh
2a873c7628
Merge "Add target type flags to set the origin of share targets" into qt-qpr1-dev
2019-09-16 18:31:09 +00:00
Mehdi Alizadeh
707c0cf361
Use ShortcutInfo#rank to order Sharing Shortcuts in ShareSheet
...
Sort based on rank only when directly fetching the targets from
ShortcutManager. Otherwise the target from AppPredictionService are
already ordered.
Bug: 140449186
Test: atest ChooserActivityTest
Test: Manual test to verify shortcuts have the same order in Launcher and ShareSheet when AppPredictionService is disabled
Change-Id: I41e08b86746c977c05acea8a5d0654083897741d
2019-09-16 11:28:42 -07:00
Blake Kragten
9c16632a24
Merge "L5 Metrics Addition:" into qt-qpr1-dev
2019-09-16 18:19:54 +00:00