OSDN Git Service
Leif Hendrik Wilden [Fri, 23 Mar 2018 17:22:33 +0000 (17:22 +0000)]
Merge "Support CATEGORY_LEANBACK_LAUNCHER on tv devices." into pi-dev am:
f3f86dd09e
am:
9f73182dfa
Change-Id: I7e86dbdc4d194890174b72b41ac09f306a26122c
Jakub Pawlowski [Fri, 23 Mar 2018 17:16:35 +0000 (17:16 +0000)]
Merge "Trigger ACTION_AUDIO_BECOMING_NOISY when Hearing Aid is disconnected" into pi-dev am:
85e7716a14
am:
1f5d8f62a4
Change-Id: I78d01735a78d25953b888dbcaecf02cd26d061c9
Leif Hendrik Wilden [Fri, 23 Mar 2018 17:16:24 +0000 (17:16 +0000)]
Merge "Support CATEGORY_LEANBACK_LAUNCHER on tv devices." into pi-dev
am:
f3f86dd09e
Change-Id: I4e6b2ea56e3e97fe8bc15424decd19e26085e5f0
Jakub Pawlowski [Fri, 23 Mar 2018 17:08:45 +0000 (17:08 +0000)]
Merge "Trigger ACTION_AUDIO_BECOMING_NOISY when Hearing Aid is disconnected" into pi-dev
am:
85e7716a14
Change-Id: I6a8a88054bf115b1d02139c988f8ca062795d055
TreeHugger Robot [Fri, 23 Mar 2018 17:06:02 +0000 (17:06 +0000)]
Merge "Support CATEGORY_LEANBACK_LAUNCHER on tv devices." into pi-dev
Mathew Inwood [Fri, 23 Mar 2018 17:01:26 +0000 (17:01 +0000)]
[automerger skipped]Merge "resolve merge conflicts of
daef557352934e5a6e20a45bd2a01c832f657e42 to pi-dev-plus-aosp" into pi-dev-plus-aosp
am:
c9c72d26af -s ours
Change-Id: I24d1346aaf8c46ad8a524d786498bc2e8f7de8a4
TreeHugger Robot [Fri, 23 Mar 2018 16:56:31 +0000 (16:56 +0000)]
Merge "Trigger ACTION_AUDIO_BECOMING_NOISY when Hearing Aid is disconnected" into pi-dev
Mathew Inwood [Fri, 23 Mar 2018 16:48:11 +0000 (16:48 +0000)]
Merge "resolve merge conflicts of
daef557352934e5a6e20a45bd2a01c832f657e42 to pi-dev-plus-aosp" into pi-dev-plus-aosp
Mathew Inwood [Fri, 23 Mar 2018 15:58:52 +0000 (15:58 +0000)]
resolve merge conflicts of
daef557352934e5a6e20a45bd2a01c832f657e42 to pi-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Merged-In: Idd73c9938592c5c4d67cfb9efefdffed0dd5f262
Change-Id: I3d1aeb30b755ca05f32dcd3c46335d1611e0bb50
Ricky Wai [Fri, 23 Mar 2018 16:26:40 +0000 (16:26 +0000)]
Merge "Use sha256 of a string as seed in RapporEncoder.insecureEncoder" into pi-dev am:
651ac4d119
am:
b2528c0291
Change-Id: I7dcd2edd9978577842838513c1e1c4880bb5b3f8
Ricky Wai [Fri, 23 Mar 2018 16:19:46 +0000 (16:19 +0000)]
Merge "Use sha256 of a string as seed in RapporEncoder.insecureEncoder" into pi-dev
am:
651ac4d119
Change-Id: Ie468743be5b369e49eacda9707e76e010639a7fe
David Brazdil [Fri, 23 Mar 2018 16:17:21 +0000 (16:17 +0000)]
Merge "Add hidden API on light greylist" into pi-dev am:
a63484c0d6
am:
3f8be75c1f
Change-Id: I8ab7ab024cb58a641b564b048cf1830e7456e372
David Brazdil [Fri, 23 Mar 2018 16:05:41 +0000 (16:05 +0000)]
Merge "Add hidden API on light greylist" into pi-dev
am:
a63484c0d6
Change-Id: Ibb80e612711777dfecf3c0b0385a3573924acda4
Ralph Nathan [Fri, 23 Mar 2018 16:02:37 +0000 (16:02 +0000)]
Merge "Permissions: Don't autogrant all permissions on Android Things" into pi-dev am:
4a94e42bed
am:
db9619d725
Change-Id: If920163810ecb4501a2b4a1740074efd0462ed18
Bo Zhu [Fri, 23 Mar 2018 15:57:36 +0000 (15:57 +0000)]
Merge "Unhide the enum/function for the password hashing algorithm scrypt" into pi-dev am:
9ec7026e92
am:
2e815c6e74
Change-Id: I3374a90dbdee1feb2eeecd054da6069c3e630802
Ricky Wai [Fri, 23 Mar 2018 15:55:28 +0000 (15:55 +0000)]
Merge "Use sha256 of a string as seed in RapporEncoder.insecureEncoder" into pi-dev
Ralph Nathan [Fri, 23 Mar 2018 15:49:05 +0000 (15:49 +0000)]
Merge "Permissions: Don't autogrant all permissions on Android Things" into pi-dev
am:
4a94e42bed
Change-Id: I02a0a70021875cc2efbda56bd71e91136acf4519
Bo Zhu [Fri, 23 Mar 2018 15:44:56 +0000 (15:44 +0000)]
Merge "Unhide the enum/function for the password hashing algorithm scrypt" into pi-dev
am:
9ec7026e92
Change-Id: I0026b0ef43e9918811591f416a370dff84254df4
David Brazdil [Fri, 23 Mar 2018 15:41:11 +0000 (15:41 +0000)]
Merge "Add hidden API on light greylist" into pi-dev
arangelov [Fri, 23 Mar 2018 15:28:22 +0000 (15:28 +0000)]
Merge "Add debug logs for TransferOwnershipMetadataManagerTest cases." into pi-dev am:
3384343629
am:
545024f7f9
Change-Id: I17cece56a15ba5b24556941c32cb09662cdbc938
Ralph Nathan [Fri, 23 Mar 2018 15:26:55 +0000 (15:26 +0000)]
Merge "Permissions: Don't autogrant all permissions on Android Things" into pi-dev
Bo Zhu [Fri, 23 Mar 2018 15:25:36 +0000 (15:25 +0000)]
Merge "Unhide the enum/function for the password hashing algorithm scrypt" into pi-dev
arangelov [Fri, 23 Mar 2018 15:18:53 +0000 (15:18 +0000)]
Merge "Add debug logs for TransferOwnershipMetadataManagerTest cases." into pi-dev
am:
3384343629
Change-Id: Ia9a8fb3b04b39327b96c6b219d1e3d61e636980e
TreeHugger Robot [Fri, 23 Mar 2018 15:05:14 +0000 (15:05 +0000)]
Merge "Add debug logs for TransferOwnershipMetadataManagerTest cases." into pi-dev
Mathew Inwood [Fri, 23 Mar 2018 15:02:12 +0000 (15:02 +0000)]
Merge "More flexible API enforcement policy."
am:
69e1cbc3fe
Change-Id: I8b54dcbca3991b2b076e0648e3948c80d74351d3
Adrian Roos [Fri, 23 Mar 2018 15:01:49 +0000 (15:01 +0000)]
Merge "DisplayCutout: do not animate cutout (and rounded corner) overlay during rotation" into pi-dev am:
5ee32ac1af
am:
323c56d76e
Change-Id: Ie5ab49761ff1254d19ce326a48ce81fa0e7c1e5d
Adrian Roos [Fri, 23 Mar 2018 14:55:13 +0000 (14:55 +0000)]
Merge "DisplayCutout: do not animate cutout (and rounded corner) overlay during rotation" into pi-dev
am:
5ee32ac1af
Change-Id: Ia811a4d2aa47a41aa4a97d04ac4dcd7b562b48f4
TreeHugger Robot [Fri, 23 Mar 2018 14:45:44 +0000 (14:45 +0000)]
Merge "DisplayCutout: do not animate cutout (and rounded corner) overlay during rotation" into pi-dev
Wyatt Riley [Fri, 23 Mar 2018 14:02:39 +0000 (14:02 +0000)]
Merge "Deprecating unused fields from GnssMeasurement" into pi-dev am:
a106a1a6b4
am:
ea5ad6d83f
Change-Id: Idab41f714fba955b9043db3cfe70915c452647f5
Wyatt Riley [Fri, 23 Mar 2018 13:50:08 +0000 (13:50 +0000)]
Merge "Deprecating unused fields from GnssMeasurement" into pi-dev
am:
a106a1a6b4
Change-Id: I26e0c6849773447cf29c388b2801a221264966bd
David Srbecky [Fri, 23 Mar 2018 13:42:46 +0000 (13:42 +0000)]
[automerger skipped]Merge "Fix mini-debug-info generation for apps with wrap.sh script." into pi-dev am:
6ae5d863de -s ours
am:
e4cf1fda34 -s ours
Change-Id: Iae158e0ea2d1950f969e55c121d862dfc7232e5a
TreeHugger Robot [Fri, 23 Mar 2018 13:41:46 +0000 (13:41 +0000)]
Merge "Deprecating unused fields from GnssMeasurement" into pi-dev
David Brazdil [Fri, 23 Mar 2018 13:39:32 +0000 (13:39 +0000)]
Add hidden API on light greylist
Used by a CTS test
Bug:
64382372
Bug:
76166763
Bug:
76117220
Test: atest CtsActivityManagerDeviceTestCases:DisplaySizeTest
Change-Id: I37ccb7bc820e467d1cc5fd7f3c0dc696b466ff32
David Srbecky [Fri, 23 Mar 2018 13:36:04 +0000 (13:36 +0000)]
[automerger skipped]Merge "Fix mini-debug-info generation for apps with wrap.sh script." into pi-dev
am:
6ae5d863de -s ours
Change-Id: I2795f7e629b3f92afe1c012f331b6e868530c89d
Amin Shaikh [Fri, 23 Mar 2018 13:30:12 +0000 (13:30 +0000)]
Merge "Hide user switcher from QS on phones." into pi-dev am:
cfa0bc22ee
am:
16ed820733
Change-Id: I3486dd34309c87086eabd97395dce0e8c43903b8
Mathew Inwood [Fri, 23 Mar 2018 13:29:03 +0000 (13:29 +0000)]
Merge "More flexible API enforcement policy."
David Srbecky [Fri, 23 Mar 2018 13:27:21 +0000 (13:27 +0000)]
Merge "Fix mini-debug-info generation for apps with wrap.sh script." into pi-dev
Amin Shaikh [Fri, 23 Mar 2018 13:23:29 +0000 (13:23 +0000)]
Merge "Add 1dp between mobile type and signal icons." into pi-dev am:
573a757b0c
am:
e8017f5d98
Change-Id: I8be43d65413ee2c84d4eb4b08e325aca052735de
Amin Shaikh [Fri, 23 Mar 2018 13:22:01 +0000 (13:22 +0000)]
Merge "Hide user switcher from QS on phones." into pi-dev
am:
cfa0bc22ee
Change-Id: I0e6ec7529bba4189970e47a511dbbbcf39a9d5c1
Anthony Stange [Fri, 23 Mar 2018 13:18:12 +0000 (13:18 +0000)]
Merge "Add new key from Settings.java to settings.proto." into pi-dev am:
e08a6aa804
am:
fd959bc19c
Change-Id: I8d320f220bbdd6427b107783b95ae862283b2a28
Amin Shaikh [Fri, 23 Mar 2018 13:17:10 +0000 (13:17 +0000)]
Merge "Add 1dp between mobile type and signal icons." into pi-dev
am:
573a757b0c
Change-Id: I9557410be49bb873d4fbd70dea9e47c9ad541b1e
TreeHugger Robot [Fri, 23 Mar 2018 13:09:30 +0000 (13:09 +0000)]
Merge "Hide user switcher from QS on phones." into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 13:08:28 +0000 (13:08 +0000)]
Merge "Add 1dp between mobile type and signal icons." into pi-dev
Anthony Stange [Fri, 23 Mar 2018 13:03:40 +0000 (13:03 +0000)]
Merge "Add new key from Settings.java to settings.proto." into pi-dev
am:
e08a6aa804
Change-Id: Ic801aa98c7511be5e005b71bd1b37e0de687b303
TreeHugger Robot [Fri, 23 Mar 2018 12:54:28 +0000 (12:54 +0000)]
Merge "Add new key from Settings.java to settings.proto." into pi-dev
Adrian Roos [Wed, 21 Mar 2018 18:52:09 +0000 (19:52 +0100)]
DisplayCutout: do not animate cutout (and rounded corner) overlay during rotation
Moves the rounded corner overlay to the overlay layer to prevent it
from getting rotated, since physical features of the display cannot
rotate.
Note that they are still below the screenshot, so not visible during
the transition (because the buffers are not synchronized to the rotation
properly yet).
Also makes sure that only priviliged processes can do this, because the
overlay layer can obscure SystemUI.
Bug:
76102595
Test: Enable cutouts, rotate screen, verify cutout overlay does not participate in the animation
Change-Id: I65dd0bc5b038cca2ba4265c7e7dc93f3264c4d89
Jorim Jaggi [Fri, 23 Mar 2018 12:29:55 +0000 (12:29 +0000)]
Merge "Fix NPE when animation doesn't get started" into pi-dev am:
8b881b29bf
am:
b5eff77b0b
Change-Id: I2407a1f95ef48ef071be2964df128d048304ed44
David Srbecky [Fri, 23 Mar 2018 12:25:06 +0000 (12:25 +0000)]
Merge "Fix mini-debug-info generation for apps with wrap.sh script." am:
5c3521d54f am:
5a0a33a8fb
am:
fe6b24fec6
Change-Id: I9a97cdf7748d964f0f87b95495f7d456af13b839
Jorim Jaggi [Fri, 23 Mar 2018 12:23:58 +0000 (12:23 +0000)]
Merge "Fix NPE when animation doesn't get started" into pi-dev
am:
8b881b29bf
Change-Id: I78bbbfbac2bf9249be3509ac0021d5f869c89f7b
David Srbecky [Fri, 23 Mar 2018 12:17:32 +0000 (12:17 +0000)]
Merge "Fix mini-debug-info generation for apps with wrap.sh script." am:
5c3521d54f
am:
5a0a33a8fb
Change-Id: I39f465a4f6b7cef73217d353a0d6d301298e29d4
Jorim Jaggi [Fri, 23 Mar 2018 12:11:19 +0000 (12:11 +0000)]
Merge "Fix NPE when animation doesn't get started" into pi-dev
David Srbecky [Fri, 23 Mar 2018 12:10:41 +0000 (12:10 +0000)]
Merge "Fix mini-debug-info generation for apps with wrap.sh script."
am:
5c3521d54f
Change-Id: I22f7893925d2d774cc3e3f10287fb54ae1acf0e1
Mike Reed [Fri, 23 Mar 2018 11:52:49 +0000 (11:52 +0000)]
Merge "detect api version, and start respecting offsets" into pi-dev am:
dfdc379144
am:
90405d02cd
Change-Id: Ied06df3460e90779e3015e6ba64406a068df5472
Mathew Inwood [Fri, 23 Mar 2018 10:05:01 +0000 (10:05 +0000)]
More flexible API enforcement policy.
This CL adds the basics to set black, dark gray or light gray list
enforcement, rather than just black as before. It's not possible to
actually set the policy per-package yet.
PackageDexOptimizer still uses a single bit, for API checks on/off, rather
than the new enum. It assumes blacklist enforcement internally. This can
be improved in a follow up CL.
(cherry-picked from commit
e52130ae4cf3b046b38a09fc7cc7712f5b7fb83d)
Test: m
Test: Boot device
BUG:
73337509
Change-Id: Ic0d5b8fa631c2bd583b6fc52b2ee3708c8113f59
Merged-In: Idd73c9938592c5c4d67cfb9efefdffed0dd5f262
Aseem Kumar [Fri, 23 Mar 2018 11:44:23 +0000 (11:44 +0000)]
Merge "Delete unimplemented APIs from RecoveryController." into pi-dev am:
0ed26bc8b1
am:
b0add1f630
Change-Id: I6a03ba603aa44d0ecc0b3b10dd27b896a4d0879f
Mike Reed [Fri, 23 Mar 2018 11:41:16 +0000 (11:41 +0000)]
Merge "detect api version, and start respecting offsets" into pi-dev
am:
dfdc379144
Change-Id: I92000b3131857c97f155a0e92811e113b6b406fc
Aseem Kumar [Fri, 23 Mar 2018 11:31:14 +0000 (11:31 +0000)]
Merge "Delete unimplemented APIs from RecoveryController." into pi-dev
am:
0ed26bc8b1
Change-Id: I7f5abe06978db5f421bfd831ead6e2bc0ebe4cee
TreeHugger Robot [Fri, 23 Mar 2018 11:25:19 +0000 (11:25 +0000)]
Merge "detect api version, and start respecting offsets" into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 11:19:06 +0000 (11:19 +0000)]
Merge "Delete unimplemented APIs from RecoveryController." into pi-dev
Anthony Stange [Wed, 21 Mar 2018 15:04:09 +0000 (15:04 +0000)]
Add new key from Settings.java to settings.proto.
Bug:
71765044
Test: Presubmits
Change-Id: I28f19791e26a07c9bf6846bbf99c774682cdf18f
David Srbecky [Wed, 21 Mar 2018 12:58:00 +0000 (12:58 +0000)]
Fix mini-debug-info generation for apps with wrap.sh script.
Debuggable apps enable mini-debug-info after fork, however, this does not
work with apps with wrap.sh script since they follow different code path.
Enable mini-debug-info generation for those as well.
Bug:
74070426
Test: check that app with wrap.sh generates debug info for JIT now
(cherry picked from commit
28a89370f02b0c33d9580e870da086b7391d1500)
Merged-In: I489ac3c82bcced8fc0448ed5666f67009cbb043d
Change-Id: I22db2e889e918eb4b64c722289f7c046bb499d1d
David Srbecky [Fri, 23 Mar 2018 10:50:32 +0000 (10:50 +0000)]
Merge "Fix mini-debug-info generation for apps with wrap.sh script."
Shuhei Miyazaki [Fri, 23 Mar 2018 10:46:59 +0000 (10:46 +0000)]
Merge "audioservice: Add a property for default voice call volume" am:
9d9782ec7e am:
2e27496bdc
am:
1779acef57
Change-Id: Ia4ee98d95f2bc8176fb822208bf1f752e129a669
Shuhei Miyazaki [Fri, 23 Mar 2018 10:39:20 +0000 (10:39 +0000)]
Merge "audioservice: Add a property for default voice call volume" am:
9d9782ec7e
am:
2e27496bdc
Change-Id: I07ffee7104476b5153d079e5892bbae8f35708b5
Shuhei Miyazaki [Fri, 23 Mar 2018 10:32:54 +0000 (10:32 +0000)]
Merge "audioservice: Add a property for default voice call volume"
am:
9d9782ec7e
Change-Id: I1830205ecc1a7e7198be1f01095b9043a95af79f
Jordan Liu [Fri, 23 Mar 2018 10:01:18 +0000 (10:01 +0000)]
[automerger skipped]Merge "Add multisim notifications for SST" into pi-dev am:
d935bd4236 -s ours
am:
95c3ccab50 -s ours
Change-Id: I22bc2b37f7eee5f74a8c5613deb4169d7674a1bf
Jordan Liu [Fri, 23 Mar 2018 09:54:27 +0000 (09:54 +0000)]
[automerger skipped]Merge "Add multisim notifications for SST" into pi-dev
am:
d935bd4236 -s ours
Change-Id: I29335d9f9900e879cc84992bebf5109a73279cd6
TreeHugger Robot [Fri, 23 Mar 2018 09:42:40 +0000 (09:42 +0000)]
Merge "Add multisim notifications for SST" into pi-dev
Chalard Jean [Fri, 23 Mar 2018 09:42:35 +0000 (09:42 +0000)]
Merge "Have the status bar listen to all macro-users VPN changes." into pi-dev am:
afc61792cb
am:
b1c8a92746
Change-Id: Ia9b4f846ec8c8fb35230507947963ed4a803577e
Chalard Jean [Fri, 23 Mar 2018 09:36:25 +0000 (09:36 +0000)]
Merge "Have the status bar listen to all macro-users VPN changes." am:
b16a6053fe am:
eb358dadac
am:
1d884f2797
Change-Id: Iabaa49f7a7de618ff45c662f04402f1bb3d4c5f1
Chalard Jean [Fri, 23 Mar 2018 09:35:34 +0000 (09:35 +0000)]
Merge "Have the status bar listen to all macro-users VPN changes." into pi-dev
am:
afc61792cb
Change-Id: I4e9887a438abfa1a5c9456c73c019c96193e9111
Chalard Jean [Fri, 23 Mar 2018 09:29:28 +0000 (09:29 +0000)]
Merge "Have the status bar listen to all macro-users VPN changes." am:
b16a6053fe
am:
eb358dadac
Change-Id: Ib4daa5f4136662721794bd8bcd4f185cb2944824
TreeHugger Robot [Fri, 23 Mar 2018 09:26:46 +0000 (09:26 +0000)]
Merge "Have the status bar listen to all macro-users VPN changes." into pi-dev
Bo Zhu [Fri, 23 Mar 2018 09:25:36 +0000 (09:25 +0000)]
Merge "Regenerate counterId when a new cert XML file is successfully imported" into pi-dev am:
8f4fae9d84
am:
6ad1f05842
Change-Id: Ia708a585683177252dfe64b4239e5fd1173dabf9
Chalard Jean [Fri, 23 Mar 2018 09:22:36 +0000 (09:22 +0000)]
Merge "Have the status bar listen to all macro-users VPN changes."
am:
b16a6053fe
Change-Id: Icc4fe4fbdb75c90abaaee8009f08f1220536686e
Robert Carr [Fri, 23 Mar 2018 09:20:40 +0000 (09:20 +0000)]
Merge "Layer input method on top while transitioning." into pi-dev am:
e47deacaab
am:
4d7b702abe
Change-Id: Ifedb1ff82143dfc4ed70f3ca6b4d4a86c0ed4b26
Bo Zhu [Fri, 23 Mar 2018 09:11:05 +0000 (09:11 +0000)]
Merge "Regenerate counterId when a new cert XML file is successfully imported" into pi-dev
am:
8f4fae9d84
Change-Id: I5e4cf1cd5320815b8eab40178703e674a87640c5
Android Build Merger (Role) [Fri, 23 Mar 2018 09:03:33 +0000 (09:03 +0000)]
Merge "Merge "Bluetooth: Enable in-band ringing in vibration mode (1/4)" into pi-dev am:
cbb8cd77d5 am:
e58e7bf155"
Jack He [Fri, 23 Mar 2018 09:02:36 +0000 (09:02 +0000)]
Merge "Bluetooth: Enable in-band ringing in vibration mode (1/4)" into pi-dev am:
cbb8cd77d5
am:
e58e7bf155
Change-Id: Iaf338b1dcc1036deb9fb5a67a12f4ae1b63e032b
TreeHugger Robot [Fri, 23 Mar 2018 08:59:47 +0000 (08:59 +0000)]
Merge "Regenerate counterId when a new cert XML file is successfully imported" into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 08:58:53 +0000 (08:58 +0000)]
Merge "Revert "Revert "More flexible API enforcement policy."""
Robert Carr [Fri, 23 Mar 2018 08:58:49 +0000 (08:58 +0000)]
Merge "Layer input method on top while transitioning." into pi-dev
am:
e47deacaab
Change-Id: Ie1dea52d7ca9ccc1d6b3da65c3dff18ef62670f8
Jakub Pawlowski [Fri, 23 Mar 2018 08:57:47 +0000 (08:57 +0000)]
Merge "Hearing Aid: pass proper stream type to getStreamVolumeDB" into pi-dev am:
3cc1a3a2e6
am:
965deb1776
Change-Id: Ie133d3202b566b6ebce9e8e21fabfa2d1a8c838c
Jack He [Fri, 23 Mar 2018 08:43:52 +0000 (08:43 +0000)]
Merge "Bluetooth: Enable in-band ringing in vibration mode (1/4)" into pi-dev
am:
cbb8cd77d5
Change-Id: I6bde37abe9c41ef3b2bf0ee0829eed340eb0842a
TreeHugger Robot [Fri, 23 Mar 2018 08:42:57 +0000 (08:42 +0000)]
Merge "Layer input method on top while transitioning." into pi-dev
Chalard Jean [Fri, 23 Mar 2018 08:39:11 +0000 (08:39 +0000)]
Merge "Have PermissionMonitor arbiter which app can access background networks" am:
06f0fc04e7 am:
d1052c2cfa
am:
d60406a963
Change-Id: I870b0a94720a16b9111abab9ef36094a61b1c4cc
Jakub Pawlowski [Fri, 23 Mar 2018 08:38:26 +0000 (08:38 +0000)]
Merge "Hearing Aid: pass proper stream type to getStreamVolumeDB" into pi-dev
am:
3cc1a3a2e6
Change-Id: Ifb38ca475a5d65672a89767038f96198ce68b770
Treehugger Robot [Fri, 23 Mar 2018 08:38:21 +0000 (08:38 +0000)]
Merge "audioservice: Add a property for default voice call volume"
timhypeng [Fri, 23 Mar 2018 08:24:21 +0000 (08:24 +0000)]
Merge "Add new status strings in connected devices for audio switch" into pi-dev am:
0d56af250f
am:
ebaa904df5
Change-Id: Iae457c4587bd59b5df36ffdbb7941240db5dce37
TreeHugger Robot [Fri, 23 Mar 2018 08:22:56 +0000 (08:22 +0000)]
Merge "Bluetooth: Enable in-band ringing in vibration mode (1/4)" into pi-dev
Chalard Jean [Fri, 23 Mar 2018 08:22:47 +0000 (08:22 +0000)]
Merge "Have PermissionMonitor arbiter which app can access background networks" am:
06f0fc04e7
am:
d1052c2cfa
Change-Id: I803bdbfd9344d3d2a8bd312f98a1f63636e47cd9
TreeHugger Robot [Fri, 23 Mar 2018 08:14:49 +0000 (08:14 +0000)]
Merge "Hearing Aid: pass proper stream type to getStreamVolumeDB" into pi-dev
Chalard Jean [Fri, 23 Mar 2018 08:12:51 +0000 (08:12 +0000)]
Merge "Have PermissionMonitor arbiter which app can access background networks"
am:
06f0fc04e7
Change-Id: Ic05e362af58d667b5be84c3bd421c9250927abe2
Sungsoo Lim [Fri, 23 Mar 2018 08:05:47 +0000 (08:05 +0000)]
Merge "Use SessionPlaylistAgent in MediaSession2Impl" into pi-dev am:
ff1c9fa576
am:
da1a34f4fc
Change-Id: Ia09e298f793c95fe79cf28c6e553151effa7ca1f
timhypeng [Fri, 23 Mar 2018 08:01:32 +0000 (08:01 +0000)]
Merge "Add new status strings in connected devices for audio switch" into pi-dev
am:
0d56af250f
Change-Id: I250ced843b3eedeba3335bacd8d2dadb3ac8ce94
Chalard Jean [Fri, 23 Mar 2018 08:01:22 +0000 (08:01 +0000)]
Merge "Have PermissionMonitor arbiter which app can access background networks" into pi-dev am:
1f654aa247
am:
973344d514
Change-Id: I1866f8d8c78f1c10dce629ca815b07625a0343ca
Hyundo Moon [Fri, 23 Mar 2018 07:49:42 +0000 (07:49 +0000)]
Merge "MediaSession2: Protect MediaSessionManager APIs with permission" into pi-dev am:
9e5a7f2a63
am:
07d23014b3
Change-Id: Ia0fdc6d9808b8270c7e344d187a427ab959e3ecc
TreeHugger Robot [Fri, 23 Mar 2018 07:47:40 +0000 (07:47 +0000)]
Merge "Add new status strings in connected devices for audio switch" into pi-dev
Jordan Liu [Thu, 15 Mar 2018 19:19:11 +0000 (12:19 -0700)]
Add multisim notifications for SST
ServiceStateTracker posts notifications for restricted state and
rejection cause for CS registrations which need to be customzied for
multisim cases.
Bug:
69928579
Test: ServiceStateTrackerTest
Change-Id: Ia7db81da6dd858b99113432a97fb489dbebe2436
Merged-In: Ia7db81da6dd858b99113432a97fb489dbebe2436
Chen Xu [Fri, 23 Mar 2018 07:35:56 +0000 (07:35 +0000)]
[automerger skipped]Merge "new WFC registration failure notification string" am:
8bcb7aa971 am:
88959d3ceb -s ours
am:
f6a55b6d6d -s ours
Change-Id: I8468a8874d5dfefae94e6b08eafe4d5bcfdc1001
OSDN Git Service
