OSDN Git Service
Mike Reed [Tue, 23 Apr 2019 17:57:35 +0000 (13:57 -0400)]
use colormatrix w/o legacy apis
Test: make
Change-Id: I01e29bd36ed3788c4f996092c81310c17f5039cd
Yunfan Chen [Tue, 23 Apr 2019 09:48:02 +0000 (02:48 -0700)]
Merge "Restore window to undefined instead of freeform windowing mode" into qt-dev am:
7c3708170c
am:
d7b885d8da
Change-Id: I165677f932881cb9b46af34fb10241ba05550908
Xiao Ma [Tue, 23 Apr 2019 09:42:37 +0000 (02:42 -0700)]
[automerger skipped] Merge "provide a resource overlay to configure customized DNS Server." into qt-dev am:
27ad19ee9e -s ours
am:
9f7760dd21 -s ours
am skip reason: change_id I123b3d4516cc6ba6d17629eb74daf448ba7121eb with SHA1
a4d0122048 is in history
Change-Id: I37d42112fbe79882265e44c55cc16ad44797ad4e
Yunfan Chen [Tue, 23 Apr 2019 09:33:44 +0000 (02:33 -0700)]
Merge "Restore window to undefined instead of freeform windowing mode" into qt-dev
am:
7c3708170c
Change-Id: I7c728394b290c0a965022cfc1e9f73728af3afd3
Tadashi G. Takaoka [Tue, 23 Apr 2019 09:33:33 +0000 (02:33 -0700)]
Merge "Remove CtsActivityManagerDeviceTestCases reference" into qt-dev am:
c4fbf3f080
am:
31b7cbd9e6
Change-Id: I857270f33417e77e2f64b28770c6b897227e9e6c
Xiao Ma [Tue, 23 Apr 2019 09:28:06 +0000 (02:28 -0700)]
[automerger skipped] Merge "provide a resource overlay to configure customized DNS Server." into qt-dev
am:
27ad19ee9e -s ours
am skip reason: change_id I123b3d4516cc6ba6d17629eb74daf448ba7121eb with SHA1
a4d0122048 is in history
Change-Id: Ia4a68691a8f7113c9575b4856a47f9c011a21653
Mathew Inwood [Tue, 23 Apr 2019 09:24:26 +0000 (02:24 -0700)]
Merge "Move some telephony methods to max-sdk-p list." into qt-dev am:
33ff97d7f6
am:
ddb5cf9e2a
Change-Id: I4eef9dedede0c33d3e8ca644a7dd213edf70877c
Tadashi G. Takaoka [Tue, 23 Apr 2019 09:20:37 +0000 (02:20 -0700)]
Merge "Remove CtsActivityManagerDeviceTestCases reference" into qt-dev
am:
c4fbf3f080
Change-Id: I7c2e12b324da15c5028e4df246374fabb7df72dc
TreeHugger Robot [Tue, 23 Apr 2019 09:15:26 +0000 (09:15 +0000)]
Merge "Restore window to undefined instead of freeform windowing mode" into qt-dev
Mathew Inwood [Tue, 23 Apr 2019 09:14:53 +0000 (02:14 -0700)]
Merge "Move some telephony methods to max-sdk-p list." into qt-dev
am:
33ff97d7f6
Change-Id: Idff38b84f152c6c231a2f34a13dff9458ca051b1
TreeHugger Robot [Tue, 23 Apr 2019 09:05:45 +0000 (09:05 +0000)]
Merge "provide a resource overlay to configure customized DNS Server." into qt-dev
Lorenzo Colitti [Tue, 23 Apr 2019 09:05:07 +0000 (02:05 -0700)]
Merge "Freeze the networkstack-aidl-interfaces interface" am:
950767f9f9 am:
6c88bf9bd7
am:
9b89cdaaf4
Change-Id: Ide252f5f20da432e35cf85e46f503bcc3fa81260
TreeHugger Robot [Tue, 23 Apr 2019 09:00:25 +0000 (09:00 +0000)]
Merge "Remove CtsActivityManagerDeviceTestCases reference" into qt-dev
TreeHugger Robot [Tue, 23 Apr 2019 08:58:36 +0000 (08:58 +0000)]
Merge "Move some telephony methods to max-sdk-p list." into qt-dev
Lorenzo Colitti [Tue, 23 Apr 2019 08:55:01 +0000 (01:55 -0700)]
Merge "Freeze the networkstack-aidl-interfaces interface" am:
950767f9f9
am:
6c88bf9bd7
Change-Id: I0bc827a6c7995eb7b50b4afeed11317ad8e29666
Lorenzo Colitti [Tue, 23 Apr 2019 08:45:40 +0000 (01:45 -0700)]
Merge "Freeze the networkstack-aidl-interfaces interface"
am:
950767f9f9
Change-Id: I32e335756927110e3200f002d32f9e1e8acfd779
Lorenzo Colitti [Tue, 23 Apr 2019 08:33:41 +0000 (08:33 +0000)]
Merge "Freeze the networkstack-aidl-interfaces interface"
Junyu Lai [Tue, 23 Apr 2019 08:30:08 +0000 (01:30 -0700)]
Merge "[KA11] Verify fd ownership and allocate resource for NattKeepalive" am:
fb36d44462 am:
91dab790e7
am:
df9591a4dc
Change-Id: I4ddfe4c8a54b4ad42926aad7e4e02319899b8d51
Junyu Lai [Tue, 23 Apr 2019 08:18:54 +0000 (01:18 -0700)]
Merge "[KA11] Verify fd ownership and allocate resource for NattKeepalive" am:
fb36d44462
am:
91dab790e7
Change-Id: I410acc19ceb13e32c65cbdf3095da9db0802470c
Junyu Lai [Tue, 23 Apr 2019 08:08:39 +0000 (01:08 -0700)]
Merge "[KA11] Verify fd ownership and allocate resource for NattKeepalive"
am:
fb36d44462
Change-Id: I2f5e0e11494866b054668c9224a8732cd8c035f9
Junyu Lai [Tue, 23 Apr 2019 07:48:08 +0000 (07:48 +0000)]
Merge "[KA11] Verify fd ownership and allocate resource for NattKeepalive"
Chalard Jean [Tue, 23 Apr 2019 07:47:13 +0000 (00:47 -0700)]
[automerger skipped] Merge "Fix an argument to the legacy broadcast" into qt-dev am:
27f23459d2 -s ours
am:
58d9ece0d3 -s ours
am skip reason: change_id I0fc408d546ae9d72b7dd9415e502252b484d4329 with SHA1
807983b976 is in history
Change-Id: I39ee787e815baef40e84b4e9a09216c1dfcafe99
Chalard Jean [Tue, 23 Apr 2019 07:35:35 +0000 (00:35 -0700)]
[automerger skipped] Merge "Fix a bug where + before % is ignored" into qt-dev am:
55a1d5bd5f -s ours
am:
243b5c104c -s ours
am skip reason: change_id Ibe73a33264569b08cac4c00b4dda838f1e5551fc with SHA1
76c76902a6 is in history
Change-Id: Id24dc43d37a453e9dfd1b09b1317f88716f5f3ee
Chalard Jean [Tue, 23 Apr 2019 07:27:22 +0000 (00:27 -0700)]
[automerger skipped] Merge "Fix an argument to the legacy broadcast" into qt-dev
am:
27f23459d2 -s ours
am skip reason: change_id I0fc408d546ae9d72b7dd9415e502252b484d4329 with SHA1
807983b976 is in history
Change-Id: I5ebe636715e8cf1ea5e42d12236c1f5fa07c38d0
Chalard Jean [Tue, 23 Apr 2019 07:22:24 +0000 (00:22 -0700)]
[automerger skipped] Merge "Fix a bug where + before % is ignored" into qt-dev
am:
55a1d5bd5f -s ours
am skip reason: change_id Ibe73a33264569b08cac4c00b4dda838f1e5551fc with SHA1
76c76902a6 is in history
Change-Id: I1cb91f0b62492eb0c1ffa9112d7a3d94164852e0
Chalard Jean [Tue, 23 Apr 2019 07:04:26 +0000 (07:04 +0000)]
Merge "Fix an argument to the legacy broadcast" into qt-dev
Chalard Jean [Tue, 23 Apr 2019 07:03:24 +0000 (07:03 +0000)]
Merge "Fix a bug where + before % is ignored" into qt-dev
Remi NGUYEN VAN [Fri, 5 Apr 2019 06:15:48 +0000 (15:15 +0900)]
Freeze the networkstack-aidl-interfaces interface
This freezes the interface as of the latest beta build, not the tip of
tree. IIpClient#setL2KeyAndGroupHint is not in the frozen definition in
particular.
Generated with:
m networkstack-aidl-interfaces-freeze-api \
ipmemorystore-aidl-interfaces-freeze-api
Test: flashed, booted, WiFi and captive portal working
Bug:
128803828
Change-Id: Ideabe73fc93bbefca2d624ee9ca190cf31419424
Mingguang Xu [Tue, 23 Apr 2019 06:29:00 +0000 (23:29 -0700)]
Merge "Wifi usability: Add timestamp in WifiUsabilityStats" into qt-dev am:
b09eed2309
am:
4f25136892
Change-Id: I8716085e8c19f13875789c86066edafacbceb292
Mingguang Xu [Tue, 23 Apr 2019 06:17:39 +0000 (23:17 -0700)]
Merge "Wifi usability: Add timestamp in WifiUsabilityStats" into qt-dev
am:
b09eed2309
Change-Id: I4ad447892ab421fa99908214de86e95e96fc001a
Mingguang Xu [Tue, 23 Apr 2019 06:00:22 +0000 (06:00 +0000)]
Merge "Wifi usability: Add timestamp in WifiUsabilityStats" into qt-dev
Jean-Michel Trivi [Tue, 23 Apr 2019 05:38:27 +0000 (22:38 -0700)]
Merge "AudioService: manage hearing aid volume for calls" into qt-dev am:
0591251363
am:
1e0b25bcd8
Change-Id: Id03f3934cf6fc6fb3d006de64bc2ebe60e36a25e
Jean-Michel Trivi [Tue, 23 Apr 2019 05:29:37 +0000 (22:29 -0700)]
Merge "AudioService: manage hearing aid volume for calls" into qt-dev
am:
0591251363
Change-Id: Ibeec03cb9e0ee4accc736e3f833e8ef425b57137
Jean-Michel Trivi [Tue, 23 Apr 2019 05:07:11 +0000 (05:07 +0000)]
Merge "AudioService: manage hearing aid volume for calls" into qt-dev
Kyunglyul Hyun [Tue, 23 Apr 2019 05:02:12 +0000 (05:02 +0000)]
Merge "Media: enables MR2PS to update provider info"
Yiwei Zhang [Tue, 23 Apr 2019 03:43:27 +0000 (20:43 -0700)]
Merge "Vulkan Doc: update descriptions for Vulkan feature flags" into qt-dev am:
606f1c9ffb
am:
568781e4da
Change-Id: I0ef45b6e77904383f7ab329b7e58f21129bb6df8
Sara Kato [Tue, 23 Apr 2019 03:29:39 +0000 (20:29 -0700)]
Merge "Add @Nullable annotation to getAccessibilityWindowId" into qt-dev am:
9498153dfd
am:
ddd0ab8333
Change-Id: I9e17466384348b7a1720edc42c06e34ce8dd880f
Jeff Chang [Tue, 23 Apr 2019 03:13:23 +0000 (20:13 -0700)]
Merge "Adjust toast window parameters to support FLAG_SHOW_WHEN_LOCKED" into qt-dev am:
77e2b7b4ca
am:
28b2b70180
Change-Id: Ibf3b4818636eab6b25f4d773ef0e3d62872f6759
Rob Carr [Tue, 23 Apr 2019 02:55:45 +0000 (19:55 -0700)]
Merge "DimLayer: More release fixes." into qt-dev am:
0d168340d1
am:
f7d9056c5b
Change-Id: I72f9ddefbe85517294e3541c60f4c09683fd15c6
Amin Shaikh [Tue, 23 Apr 2019 02:49:47 +0000 (19:49 -0700)]
Merge "Merge "Update dark mode custom accent colors." into qt-dev am:
79760f0745" into qt-dev-plus-aosp
am:
0d1fec58c0
Change-Id: I0a08c69dadca230385f62893be31599c906a8fe5
junyulai [Tue, 16 Apr 2019 11:32:32 +0000 (19:32 +0800)]
[KA11] Verify fd ownership and allocate resource for NattKeepalive
Since socket keepalive APIs for UDP encapsulation sockets are
public to generic app. In order to ensure the given fd is valid,
this change verifies the resource id inside the UDP
encapsulation socket by using methods provided by IpSecService.
Bug:
125517194
Fix:
123968920
Test: 1. atest FrameworksNetTests --generate-new-metrics 10
2. atestcom.android.server.ConnectivityServiceTest \
#testNattSocketKeepalives --generate-new-metrics 100
Change-Id: I408aacc19b364683854d15a095c34e72389a6e5b
sqian [Tue, 23 Apr 2019 02:38:23 +0000 (19:38 -0700)]
Merge "Fix urn compare in EmergencyNumber" am:
1f55cbf416 am:
c85174ba3d
am:
4e9dde6737
Change-Id: Ie71fdec7c9c50fc3b0b02c16f0f8bf16ef1ab1e1
Chalard Jean [Thu, 11 Apr 2019 05:09:07 +0000 (14:09 +0900)]
Fix an argument to the legacy broadcast
Test: new test for this
Fixes:
62650382
Change-Id: I918b8271d3c3c058553ca888cb54cd36a6efba66
Merged-In: I0fc408d546ae9d72b7dd9415e502252b484d4329
Merged-In: I9282930106d1eee3274d9e5c4e89de60e929a0e6
Priyank Singh [Tue, 23 Apr 2019 02:31:21 +0000 (19:31 -0700)]
Merge "Handle NPE when the notification shade is opened via click on button." into qt-dev am:
62ad8b9ccc
am:
51fe5f6367
Change-Id: Ied8dd39e33bda121eee2d04e8dade60e103a5dbb
Yiwei Zhang [Tue, 23 Apr 2019 02:26:57 +0000 (19:26 -0700)]
Merge "Vulkan Doc: update descriptions for Vulkan feature flags" into qt-dev
am:
606f1c9ffb
Change-Id: I7dcd205ea53ff81eadb701b074d07591d4b35a95
Pengquan Meng [Tue, 23 Apr 2019 02:25:39 +0000 (19:25 -0700)]
Add carrier display name related CarrierConfig am:
057b94f43b
am:
ecd1f78937
Change-Id: I4e1210360ad872d08a2ac549de2628ebc4e3d2f3
Tadashi G. Takaoka [Tue, 23 Apr 2019 02:01:48 +0000 (11:01 +0900)]
Remove CtsActivityManagerDeviceTestCases reference
Bug:
130526034
Test: atest --test-mapping frameworks/base/services/core/java/com/android/server/am
Change-Id: I68e3645bc5fc32c5c577551c18b9e8560c3f1216
Sara Kato [Tue, 23 Apr 2019 02:17:05 +0000 (19:17 -0700)]
Merge "Add @Nullable annotation to getAccessibilityWindowId" into qt-dev
am:
9498153dfd
Change-Id: I5ff7a8c6e5130c6e5c38cfb181c17a2093eef5a3
Sunny Goyal [Tue, 23 Apr 2019 02:15:19 +0000 (19:15 -0700)]
Merge "Adding null check when unregistering slice relay handler" into qt-dev am:
29fe1106dd
am:
f0c2178c1a
Change-Id: I20beeb020698f4138b6a05ace59810c28147e23c
Jeff Chang [Tue, 23 Apr 2019 02:10:45 +0000 (19:10 -0700)]
Merge "Adjust toast window parameters to support FLAG_SHOW_WHEN_LOCKED" into qt-dev
am:
77e2b7b4ca
Change-Id: I12371d35dc82745a458ba92a8a6a69e49e9dd882
Rob Carr [Tue, 23 Apr 2019 02:04:39 +0000 (19:04 -0700)]
Merge "DimLayer: More release fixes." into qt-dev
am:
0d168340d1
Change-Id: Iac648c69e352050d7aa84595b9a72c5defae8705
TreeHugger Robot [Tue, 23 Apr 2019 02:04:05 +0000 (02:04 +0000)]
Merge "Vulkan Doc: update descriptions for Vulkan feature flags" into qt-dev
Hui Yu [Tue, 23 Apr 2019 02:01:03 +0000 (19:01 -0700)]
Merge "No service timeout when debbuger is attached" into qt-dev am:
095ab6c3c7
am:
848ed58bb3
Change-Id: I55fe308d7ff7790d4d18c7aa2e49b119f849ce04
Matt Pietal [Tue, 23 Apr 2019 01:54:15 +0000 (18:54 -0700)]
Merge "Sharesheet - Dark theme tweaks" into qt-dev am:
ef25fb621b
am:
0aa2c5ad5f
Change-Id: Icac0f7d137fde7e81bed8fae45707b031693c669
Android Build Merger (Role) [Tue, 23 Apr 2019 01:53:26 +0000 (01:53 +0000)]
Merge "Merge "Update dark mode custom accent colors." into qt-dev am:
79760f0745" into qt-dev-plus-aosp
Amin Shaikh [Tue, 23 Apr 2019 01:52:46 +0000 (18:52 -0700)]
Merge "Update dark mode custom accent colors." into qt-dev
am:
79760f0745
Change-Id: I8190b01fee17bc67d38310c97149fa725b4d83aa
sqian [Tue, 23 Apr 2019 01:49:35 +0000 (18:49 -0700)]
Merge "Fix urn compare in EmergencyNumber" am:
1f55cbf416
am:
c85174ba3d
Change-Id: Ic7c6db0747d594f54212c81da008cca20b471b71
Chalard Jean [Tue, 23 Apr 2019 01:45:25 +0000 (18:45 -0700)]
Merge "Fix an argument to the legacy broadcast" am:
b00786fe21 am:
b39b829601
am:
807983b976
Change-Id: I9282930106d1eee3274d9e5c4e89de60e929a0e6
Priyank Singh [Tue, 23 Apr 2019 01:42:53 +0000 (18:42 -0700)]
Merge "Handle NPE when the notification shade is opened via click on button." into qt-dev
am:
62ad8b9ccc
Change-Id: I6d985834d3da90e91c54f144aaa8108fffce9c38
sqian [Tue, 23 Apr 2019 01:39:09 +0000 (18:39 -0700)]
Merge "Fix urn compare in EmergencyNumber"
am:
1f55cbf416
Change-Id: I722e0b9093a569aa609ed9b239dc517442e74a2f
Pengquan Meng [Tue, 23 Apr 2019 01:37:06 +0000 (18:37 -0700)]
Add carrier display name related CarrierConfig
am:
057b94f43b
Change-Id: Ifcf272fa5f0a5c56c58d6124883296d171bc9266
Sunny Goyal [Tue, 23 Apr 2019 01:34:28 +0000 (18:34 -0700)]
Merge "Adding null check when unregistering slice relay handler" into qt-dev
am:
29fe1106dd
Change-Id: Ic406c2e0b8e07e1812713e1b4e5b7b5a7b7ac17f
Treehugger Robot [Tue, 23 Apr 2019 01:29:25 +0000 (01:29 +0000)]
Merge "Fix urn compare in EmergencyNumber"
Sara Kato [Tue, 23 Apr 2019 01:28:23 +0000 (01:28 +0000)]
Merge "Add @Nullable annotation to getAccessibilityWindowId" into qt-dev
Hui Yu [Tue, 23 Apr 2019 01:27:47 +0000 (18:27 -0700)]
Merge "No service timeout when debbuger is attached" into qt-dev
am:
095ab6c3c7
Change-Id: Ic54c3c80063f670238c00a028d5aac55f142a4ec
Jeff Chang [Tue, 23 Apr 2019 01:25:48 +0000 (01:25 +0000)]
Merge "Adjust toast window parameters to support FLAG_SHOW_WHEN_LOCKED" into qt-dev
Matt Pietal [Tue, 23 Apr 2019 01:19:08 +0000 (18:19 -0700)]
Merge "Sharesheet - Dark theme tweaks" into qt-dev
am:
ef25fb621b
Change-Id: Iacefefd32d21cace3e739d4f8cc4d441cbae1cad
Rob Carr [Tue, 23 Apr 2019 01:15:20 +0000 (01:15 +0000)]
Merge "DimLayer: More release fixes." into qt-dev
TreeHugger Robot [Tue, 23 Apr 2019 01:13:59 +0000 (01:13 +0000)]
Merge "Update dark mode custom accent colors." into qt-dev
Chalard Jean [Tue, 23 Apr 2019 01:12:27 +0000 (18:12 -0700)]
Merge "Fix an argument to the legacy broadcast" am:
b00786fe21
am:
b39b829601
Change-Id: I0fc408d546ae9d72b7dd9415e502252b484d4329
Brad Stenning [Tue, 23 Apr 2019 01:08:54 +0000 (18:08 -0700)]
Merge "Fix NPE for devices that don't use a lock icon on the bouncer." into qt-dev am:
55bf4fd6b6
am:
5174fc8663
Change-Id: Ic3b1a4f42fc7a8bf5539dbe601ea87d424027315
Chalard Jean [Tue, 23 Apr 2019 01:00:01 +0000 (18:00 -0700)]
Merge "Fix an argument to the legacy broadcast"
am:
b00786fe21
Change-Id: I76149167598a862a2cc519fbf0b08df0887b27f0
Colin Cross [Tue, 23 Apr 2019 00:54:30 +0000 (17:54 -0700)]
[automerger skipped] Merge "Remove framework.aidl rules" into qt-dev am:
696a644fab -s ours
am:
ee6a391abf -s ours
am skip reason: change_id I4e8ee725e660e52aa56c2a10b626dff517669869 with SHA1
b9cb74b048 is in history
Change-Id: I583ef2fc024e610b311e46da97514ad86a30ae96
Brad Stenning [Tue, 23 Apr 2019 00:49:03 +0000 (17:49 -0700)]
Merge "Fix NPE for devices that don't use a lock icon on the bouncer." into qt-dev
am:
55bf4fd6b6
Change-Id: If39b55c2c62760ad8db0ba37cbfaefc94694a6a8
TreeHugger Robot [Tue, 23 Apr 2019 00:44:47 +0000 (00:44 +0000)]
Merge "Handle NPE when the notification shade is opened via click on button." into qt-dev
Colin Cross [Tue, 23 Apr 2019 00:38:49 +0000 (17:38 -0700)]
[automerger skipped] Remove framework.aidl rules am:
b9cb74b048 -s ours
am:
bac6e6e98e -s ours
am skip reason: change_id I4e8ee725e660e52aa56c2a10b626dff517669869 with SHA1
196fa2947e is in history
Change-Id: I177aeab0816f551ea4f01146f6a7d445012e1e5c
Chalard Jean [Tue, 23 Apr 2019 00:38:10 +0000 (00:38 +0000)]
Merge "Fix an argument to the legacy broadcast"
Colin Cross [Tue, 23 Apr 2019 00:29:55 +0000 (17:29 -0700)]
[automerger skipped] Merge "Remove framework.aidl rules" into qt-dev
am:
696a644fab -s ours
am skip reason: change_id I4e8ee725e660e52aa56c2a10b626dff517669869 with SHA1
b9cb74b048 is in history
Change-Id: Ibf11932dff9f955902ff7ff64f902d9a44b7c22b
Colin Cross [Tue, 23 Apr 2019 00:17:49 +0000 (17:17 -0700)]
[automerger skipped] Remove framework.aidl rules
am:
b9cb74b048 -s ours
am skip reason: change_id I4e8ee725e660e52aa56c2a10b626dff517669869 with SHA1
196fa2947e is in history
Change-Id: I5669d9c865041295c5f6134dd75d8d945cc056ab
Pengquan Meng [Thu, 18 Apr 2019 02:36:58 +0000 (19:36 -0700)]
Add carrier display name related CarrierConfig
Bug:
122921456
Test: build
Change-Id: I79836b2912be5223a2269e660bfaadf4aa72b930
TreeHugger Robot [Tue, 23 Apr 2019 00:04:28 +0000 (00:04 +0000)]
Merge "Adding null check when unregistering slice relay handler" into qt-dev
TreeHugger Robot [Mon, 22 Apr 2019 23:58:26 +0000 (23:58 +0000)]
Merge "No service timeout when debbuger is attached" into qt-dev
TreeHugger Robot [Mon, 22 Apr 2019 23:56:27 +0000 (23:56 +0000)]
Merge "Sharesheet - Dark theme tweaks" into qt-dev
Android Build Merger (Role) [Mon, 22 Apr 2019 23:53:55 +0000 (23:53 +0000)]
Merge "[automerger skipped] Merge "Fixed content capture whitelist for specific activities." into qt-dev am:
845d5ee587 am:
2d137edf28 -s ours am skip reason: change_id I2c76a01bd98c4154c4c59099f1368232d2dba80d with SHA1
41e9eb0aed is in history"
Felipe Leme [Mon, 22 Apr 2019 23:51:53 +0000 (16:51 -0700)]
[automerger skipped] Merge "Fixed content capture whitelist for specific activities." into qt-dev am:
845d5ee587
am:
2d137edf28 -s ours
am skip reason: change_id I2c76a01bd98c4154c4c59099f1368232d2dba80d with SHA1
41e9eb0aed is in history
Change-Id: Id918f6def22dd05ec1a86a51aba03eb0548125f8
Christian Wailes [Mon, 22 Apr 2019 23:50:36 +0000 (23:50 +0000)]
Merge "Load the default graphics driver in USAPs."
Jean-Michel Trivi [Mon, 22 Apr 2019 19:21:50 +0000 (12:21 -0700)]
AudioService: manage hearing aid volume for calls
Add a mechanism to support audio devices that behave like "absolute
volume" in AVRCP, but that support multiple use cases based on
the audio mode.
Treat hearing aid as such a device:
any change in audio mode will cause the volume of the corresponding
dominent use case to be applied.
Fix a typo in SCO client death that caused a class cast issue.
Bug:
131091438
Bug:
129163231
Test: set hearing aid volume to X for media, take phone call and set volume to Y,
end call, verify volume is X for media.
Change-Id: Id778f69b98825c83b7137917bd81e973298ab8bb
TreeHugger Robot [Mon, 22 Apr 2019 23:30:57 +0000 (23:30 +0000)]
Merge "Fix NPE for devices that don't use a lock icon on the bouncer." into qt-dev
Colin Cross [Mon, 22 Apr 2019 23:26:55 +0000 (23:26 +0000)]
Merge "Remove framework.aidl rules" into qt-dev
Felipe Leme [Mon, 22 Apr 2019 23:24:14 +0000 (16:24 -0700)]
Merge "Fixed content capture whitelist for specific activities." into qt-dev
am:
845d5ee587
Change-Id: I7b4817d097067667e518ad8e58bd2ed5f17c2b8d
Fan Zhang [Mon, 22 Apr 2019 23:08:44 +0000 (16:08 -0700)]
Merge "Add logging enums for 3 new SIM related pages." into qt-dev am:
7feb1a1f7d
am:
d448910f18
Change-Id: Iff05b9b871c649df8854dbdddd7123c1a918ab51
Howard Ro [Mon, 22 Apr 2019 22:58:29 +0000 (15:58 -0700)]
Merge "Add apex packages to uid_mapping" into qt-dev am:
330a3d89fa
am:
d2209bbab5
Change-Id: Ib98b5342763699923c0394d070328def498b974f
TreeHugger Robot [Mon, 22 Apr 2019 22:34:09 +0000 (22:34 +0000)]
Merge "Fixed content capture whitelist for specific activities." into qt-dev
Robert Snoeberger [Mon, 22 Apr 2019 22:32:55 +0000 (15:32 -0700)]
Merge "Add doc for system health guidelines for AOD clock faces." into qt-dev am:
c7c2a50e7d
am:
a7de96305d
Change-Id: I5a7ba2acb14e01aa549adc9ab08fb754a65e324c
Chenbo Feng [Mon, 22 Apr 2019 22:27:09 +0000 (15:27 -0700)]
[automerger skipped] Merge "Add smoke test for jni library" into qt-dev am:
47159d969f -s ours
am:
2c8ffbcc5a -s ours
am skip reason: change_id Id24e7f0558b5643e4ad7393e85f1f0a2bd875615 with SHA1
5f8a630da7 is in history
Change-Id: I4d76e5a101ca4ca460649dbe02e8915e175101a0
Fan Zhang [Mon, 22 Apr 2019 22:22:20 +0000 (15:22 -0700)]
Merge "Add logging enums for 3 new SIM related pages." into qt-dev
am:
7feb1a1f7d
Change-Id: I620189316adfff96ba305427d30e0eee02e15a6f
Beverly [Mon, 22 Apr 2019 22:21:29 +0000 (15:21 -0700)]
Merge "Set min width of checkbox to 48dp" into qt-dev am:
f49ca51851
am:
4d22832cb1
Change-Id: I8b0c9eba559bce8da90fed34b050d60ed48513b1
Howard Ro [Mon, 22 Apr 2019 22:11:06 +0000 (15:11 -0700)]
Merge "Add apex packages to uid_mapping" into qt-dev
am:
330a3d89fa
Change-Id: I7fe7037887e22cde409ef8a2177e5974fcfe7633
Chris Tate [Mon, 22 Apr 2019 22:08:55 +0000 (15:08 -0700)]
Merge "Remove spurious Slog.wtf()" into qt-dev am:
ef4c181a05
am:
6f6e0afb01
Change-Id: Iefcb10c3c855b3acba8eeeaa9ffc217995548318
Mathieu Chartier [Mon, 22 Apr 2019 21:54:07 +0000 (14:54 -0700)]
[automerger skipped] Merge "Disable iorap test mapping" am:
46b3d6d05d am:
27ee83dca3 -s ours
am:
fcfbc9c584 -s ours
am skip reason: change_id I17befa52ebad92413122253f692168cf93cbab6e with SHA1
6565a34d7f is in history
Change-Id: I1bdcb157715f7e18f81e528990288d07be1c451b
OSDN Git Service
