OSDN Git Service
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
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: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
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
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 [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
Chalard Jean [Fri, 23 Mar 2018 07:33:02 +0000 (07:33 +0000)]
Merge "Have the status bar listen to all macro-users VPN changes."
Felipe Leme [Fri, 23 Mar 2018 07:28:21 +0000 (07:28 +0000)]
Merge "Improved autofill logging and dumping." into pi-dev am:
63df4e248a
am:
c39b648a80
Change-Id: Ifc409bae7d1e8b1c6d2f84be9c1ca7bef308966f
Sungsoo Lim [Fri, 23 Mar 2018 07:21:17 +0000 (07:21 +0000)]
Merge "Use SessionPlaylistAgent in MediaSession2Impl" into pi-dev
am:
ff1c9fa576
Change-Id: I8eb8afef8366a071a923f398463579527f5cb37d
Jordan Liu [Fri, 23 Mar 2018 07:21:15 +0000 (07:21 +0000)]
Merge "Add multisim notifications for SST" am:
1a6228e595 am:
3a647cd833
am:
d2fa6075a0
Change-Id: I23cb48061489e200831ef161a3b1aaa9a23d204b
TreeHugger Robot [Fri, 23 Mar 2018 07:15:30 +0000 (07:15 +0000)]
Merge "Make android.test.mock.stubs in Android.bp"
Selim Cinek [Fri, 23 Mar 2018 07:12:20 +0000 (07:12 +0000)]
Merge "Fixed an issue where notifications were invisible on AOD" into pi-dev am:
d4115f501d
am:
de932bdf90
Change-Id: Icdea366821e0365bce7115c4b2a34f9c22e0fb79
TreeHugger Robot [Fri, 23 Mar 2018 07:08:08 +0000 (07:08 +0000)]
Merge "Use SessionPlaylistAgent in MediaSession2Impl" into pi-dev
Selim Cinek [Fri, 23 Mar 2018 07:05:00 +0000 (07:05 +0000)]
Merge "Performing consistent vibration effects when opening notifications" into pi-dev am:
62eb45f2fc
am:
b16aa93d89
Change-Id: If0f183b07baa3f0e06ae3fdfaedd403fdd5088d2
Selim Cinek [Fri, 23 Mar 2018 06:55:00 +0000 (06:55 +0000)]
Merge "Fixed an issue where the heads-up icon location was wrong" into pi-dev am:
194cca21b1
am:
15e5254040
Change-Id: Ic34a9d085ed49709e318ceffd52ad8c25be2ab9d
Chalard Jean [Fri, 23 Mar 2018 06:48:49 +0000 (06:48 +0000)]
Merge "Have PermissionMonitor arbiter which app can access background networks" into pi-dev
am:
1f654aa247
Change-Id: I8d725b07e59654232ee41b82aac007dc6a495a01
Lucas Dupin [Fri, 23 Mar 2018 06:46:21 +0000 (06:46 +0000)]
Merge changes I2d09a84e,I111aab35 into pi-dev am:
4cfd9f242c
am:
3da0b8effc
Change-Id: I2c43c2eb35bb31964b3ace55b4ff51d0ee83029c
Chalard Jean [Fri, 23 Mar 2018 06:36:47 +0000 (06:36 +0000)]
Merge "Have PermissionMonitor arbiter which app can access background networks" into pi-dev
Jaewan Kim [Fri, 23 Mar 2018 06:34:27 +0000 (06:34 +0000)]
Merge "MediaSession2: Add more detailed documentation for addPlaylistItem()" into pi-dev am:
e41b39d6e9
am:
9ee3dcbd65
Change-Id: I1a91abc52be1e0b3be31581409dfad3db1fc3000
Hyundo Moon [Fri, 23 Mar 2018 06:20:10 +0000 (06:20 +0000)]
Merge "MediaSession2: Protect MediaSessionManager APIs with permission" into pi-dev
am:
9e5a7f2a63
Change-Id: Id70eb6d8fe60a8755b73bfe6be2f93c2c3de6bcb
Chalard Jean [Fri, 23 Mar 2018 06:15:00 +0000 (06:15 +0000)]
Merge "Have PermissionMonitor arbiter which app can access background networks"
Jack He [Tue, 13 Feb 2018 05:00:24 +0000 (21:00 -0800)]
Bluetooth: Enable in-band ringing in vibration mode (1/4)
* Add AudioSystem.FOR_VIBRATE_RINGING mode to match the native layer
AUDIO_POLICY_FORCE_FOR_VIBRATE_RINGING force mode
* Switch to this mode when Bluetooth SCO is connected
* Modify AudioService.muteRingerModeStreams() method to not mute ringer
volume when Bluetooth SCO is ON. Also, when ringer is unmuted, mirror
speaker ringtone volume on Bluetooth SCO ringer
Bug:
72647074
Test: Call phone in vibration mode and hear ringtone on HFP enabled
headset, verify that ringtone is only played through headset.
Then disconnect headset and call again to verify that ringtone
does not play through phone speaker in vibration mode.
Change-Id: I7d642020710c085f0e1f27c750c74b0e2fb57398
Hyundo Moon [Fri, 23 Mar 2018 06:07:17 +0000 (06:07 +0000)]
Merge "MediaSession2: Protect MediaSessionManager APIs with permission" into pi-dev
Chen Xu [Fri, 23 Mar 2018 06:06:28 +0000 (06:06 +0000)]
[automerger skipped]Merge "new WFC registration failure notification string" am:
8bcb7aa971
am:
88959d3ceb -s ours
Change-Id: I0dc40d059ea8e7ccfe3f4974f7ee4d248e147890
Chen Xu [Fri, 23 Mar 2018 06:04:58 +0000 (06:04 +0000)]
Merge "new WFC registration failure notification string" into pi-dev am:
397b0d0dd5
am:
7ebfe28c95
Change-Id: Ifc3dcad108c565ba31145606c5f2b12c3d398fe3
Felipe Leme [Fri, 23 Mar 2018 06:00:12 +0000 (06:00 +0000)]
Merge "Improved autofill logging and dumping." into pi-dev
am:
63df4e248a
Change-Id: Ifffb1f5266fe5702cf211fbd998f7260bb959e88
Jean-Michel Trivi [Fri, 23 Mar 2018 06:00:08 +0000 (06:00 +0000)]
Merge "Merge "Hide Media*2 APIs" into pi-dev am:
d847d7d0a9" into pi-dev-plus-aosp
am:
afe151935a
Change-Id: I40f0b08af3387975e4ca30f6da38b6942ee21077
Chen Xu [Fri, 23 Mar 2018 05:59:05 +0000 (05:59 +0000)]
Merge "new WFC registration failure notification string"
am:
8bcb7aa971
Change-Id: I7784e82e4b788597ba9c35da7175b485230ab227
Remi NGUYEN VAN [Fri, 23 Mar 2018 05:50:25 +0000 (05:50 +0000)]
Merge "Add method to NetworkStatsService for UID stats." am:
db89ca3c12 am:
af2fafe743
am:
5eaa226243
Change-Id: I31c5b9b4a7c6e72910152415894a137f000a5858
Felipe Leme [Fri, 23 Mar 2018 05:48:26 +0000 (05:48 +0000)]
Merge "Improved autofill logging and dumping." into pi-dev
Aseem Kumar [Fri, 23 Mar 2018 05:09:34 +0000 (22:09 -0700)]
Delete unimplemented APIs from RecoveryController.
Bug:
74859770
Test: make update-api builds
Change-Id: Ic547e0ee2ef13995389a71369ffa736a7d83b78a
Christine Franks [Fri, 23 Mar 2018 05:13:20 +0000 (05:13 +0000)]
Merge "Allow developer options in retail mode" into pi-dev am:
0f4545ac64
am:
a9f6576c8b
Change-Id: I1d214eab76c8b19b2955b7844be31735d79ba384
Jordan Liu [Fri, 23 Mar 2018 05:10:35 +0000 (05:10 +0000)]
Merge "Add multisim notifications for SST" am:
1a6228e595
am:
3a647cd833
Change-Id: I11e378d2633851ab4658074a9cfb42da346749ea
Jordan Liu [Fri, 23 Mar 2018 05:04:15 +0000 (05:04 +0000)]
Merge "Add multisim notifications for SST"
am:
1a6228e595
Change-Id: I2fc3c9195da6bf47d6dcaca26d793e956619ccfa
Jakub Pawlowski [Thu, 22 Mar 2018 19:31:21 +0000 (12:31 -0700)]
Hearing Aid: pass proper stream type to getStreamVolumeDB
Bug:
69623109
Test: Connect to Hearing Aid, make phone call, adjust volume to maximum
value.
Change-Id: Ib615d8dee11c48bf8d6e954b84a40ab7a3f3a4ba
Selim Cinek [Fri, 23 Mar 2018 04:57:21 +0000 (04:57 +0000)]
Merge "Fixed an issue where notifications were invisible on AOD" into pi-dev
am:
d4115f501d
Change-Id: I9dfa218bc30003581e8488d7b9d72bb192a19547
Selim Cinek [Fri, 23 Mar 2018 04:52:37 +0000 (04:52 +0000)]
Merge "Performing consistent vibration effects when opening notifications" into pi-dev
am:
62eb45f2fc
Change-Id: Ib58ef722368d53097f1af4f0a697513ba911d379
Selim Cinek [Fri, 23 Mar 2018 04:48:13 +0000 (04:48 +0000)]
Merge "Fixed an issue where the heads-up icon location was wrong" into pi-dev
am:
194cca21b1
Change-Id: I3bbf2e2eb3882a8a13e456df1bf143cc823c8eec
Lucas Dupin [Fri, 23 Mar 2018 04:44:16 +0000 (04:44 +0000)]
Merge changes I2d09a84e,I111aab35 into pi-dev
am:
4cfd9f242c
Change-Id: I178fbaa3d299326674b0da1fb58dd36122719f2d
Felipe Leme [Fri, 23 Mar 2018 04:40:30 +0000 (04:40 +0000)]
Merge "Always set FLAG_SAVE_ON_ALL_VIEWS_INVISIBLE on SaveInfo when on compat mode." into pi-dev am:
0cdac33f8f
am:
307af3b7d2
Change-Id: I6a221dc1adc0d03bcfcae65dcebd532d412367a4
Jaewan Kim [Fri, 23 Mar 2018 04:39:05 +0000 (04:39 +0000)]
Merge "MediaSession2: Add more detailed documentation for addPlaylistItem()" into pi-dev
am:
e41b39d6e9
Change-Id: I8882a20c5b50c1c13850bff3e162fa5b2be4d4f7
Chalard Jean [Tue, 20 Mar 2018 10:13:57 +0000 (19:13 +0900)]
Have PermissionMonitor arbiter which app can access background networks
This will let ConnectivityService send the right callbacks to the
relevant apps.
Test: manual with apps
runtest frameworks-net
cts
new tests for this functionality
Bug:
67408339
Change-Id: I6f08efd9e73c7e191f833d7f307a3bf4c9e2f0b4
Calin Juravle [Fri, 23 Mar 2018 04:37:13 +0000 (04:37 +0000)]
Merge "Add extra checks around the profile file descriptor." into pi-dev am:
2df6aa4178
am:
7fac461750
Change-Id: I1142460bc563335abf1146b6c6406dc3090f85c4
John W. Bruce [Fri, 23 Mar 2018 04:33:54 +0000 (04:33 +0000)]
Merge "Document CryptoInfo Settings for CENC 2016 & HLS Audio" into pi-dev am:
6ab6a9d433
am:
889da15d94
Change-Id: I9ef9a16a6175840f8f72800400bcdc6d2ec9684e
Selim Cinek [Fri, 23 Mar 2018 04:30:32 +0000 (04:30 +0000)]
Merge "Updated the styling for notifications" into pi-dev am:
51856fde2b
am:
eabdcf3bef
Change-Id: Ic2a3454078e81ebd564549c1c3984fee6aef7c9d
Selim Cinek [Fri, 23 Mar 2018 04:27:29 +0000 (04:27 +0000)]
Merge "Fixed an issue where the roundness of a notification could be wrong" into pi-dev am:
65cb06cfc5
am:
00882302a1
Change-Id: I2fc235fb0e547518b90d321a47a9d96cb7b4ab99
Selim Cinek [Fri, 23 Mar 2018 04:21:33 +0000 (04:21 +0000)]
Merge "Ensuring that headsups go away when unpinning via active edge" into pi-dev am:
6ece0f3f62
am:
bc64c0d565
Change-Id: I668bf4f0978d505fa419852a1d87733893771b30
TreeHugger Robot [Fri, 23 Mar 2018 04:15:38 +0000 (04:15 +0000)]
Merge "Fixed an issue where notifications were invisible on AOD" into pi-dev
OSDN Git Service
