OSDN Git Service
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
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
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
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
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
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"
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
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
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
timhypeng [Thu, 22 Mar 2018 09:53:17 +0000 (17:53 +0800)]
Add new status strings in connected devices for audio switch
Bug:
74134939
Test: make -j32 RunSettingsRoboTests
make -j40 RunSettingsLibRoboTests
Change-Id: I4579073572d1dc2d2c6d347efb28161cf718292e
Chen Xu [Fri, 23 Mar 2018 04:10:53 +0000 (04:10 +0000)]
Merge "new WFC registration failure notification string" into pi-dev
am:
397b0d0dd5
Change-Id: Ic7cfa7ea9d7fb0526843ca5e2cfc82fc73202826
Julien Desprez [Fri, 23 Mar 2018 04:08:31 +0000 (04:08 +0000)]
Merge "Add TestablesTests to device-tests for APCT suite" into pi-dev am:
d9bd20b0dc
am:
7f4cea8520
Change-Id: I860bd3b9402b4b9b446451a926f5a39a84e6da46
Android Build Merger (Role) [Fri, 23 Mar 2018 04:04:30 +0000 (04:04 +0000)]
Merge "Merge "Hide Media*2 APIs" into pi-dev am:
d847d7d0a9" into pi-dev-plus-aosp
Jean-Michel Trivi [Fri, 23 Mar 2018 04:04:01 +0000 (04:04 +0000)]
Merge "Hide Media*2 APIs" into pi-dev
am:
d847d7d0a9
Change-Id: I29a18f6592ecc3f79483dacea6ca294a226ca792
Remi NGUYEN VAN [Fri, 23 Mar 2018 04:01:09 +0000 (04:01 +0000)]
Merge "Add method to NetworkStatsService for UID stats." am:
db89ca3c12
am:
af2fafe743
Change-Id: I2527d95000c7500c824ede70f87ecb38e21ed323
Jack Yu [Fri, 23 Mar 2018 04:01:02 +0000 (04:01 +0000)]
Merge "Enable Checkstyle for "repo upload" for more projects." am:
dd6764a522 am:
2ff91e5132
am:
2ea5e20c8b
Change-Id: Ieefa63b3c341a9f00e0a697c94d08f7962385950
Chen Xu [Fri, 23 Mar 2018 04:00:25 +0000 (04:00 +0000)]
Merge "new WFC registration failure notification string"
Remi NGUYEN VAN [Fri, 23 Mar 2018 03:54:13 +0000 (03:54 +0000)]
Merge "Add method to NetworkStatsService for UID stats."
am:
db89ca3c12
Change-Id: I2c6cba3ebbc8c23ade754cfd411ac54a561b020a
Treehugger Robot [Fri, 23 Mar 2018 03:47:48 +0000 (03:47 +0000)]
Merge "Add multisim notifications for SST"
TreeHugger Robot [Fri, 23 Mar 2018 03:43:49 +0000 (03:43 +0000)]
Merge "Performing consistent vibration effects when opening notifications" into pi-dev
TreeHugger Robot [Fri, 23 Mar 2018 03:39:29 +0000 (03:39 +0000)]
Merge "Fixed an issue where the heads-up icon location was wrong" into pi-dev
Seigo Nonaka [Fri, 23 Mar 2018 03:34:31 +0000 (03:34 +0000)]
Merge "Make PrecomputedText Spannable for supporting selection" into pi-dev am:
02c8d1b07f
am:
42033475dd
Change-Id: Ibac099cd1256e4a87299196dcfeda8d50c900197
Christine Franks [Fri, 23 Mar 2018 03:31:48 +0000 (03:31 +0000)]
Merge "Allow developer options in retail mode" into pi-dev
am:
0f4545ac64
Change-Id: Idf9fb0805d81e6078ed8bdb029c6f885b0813004
Yao Chen [Fri, 23 Mar 2018 03:30:00 +0000 (03:30 +0000)]
Merge "Fix StorageManager stack use after scope." into pi-dev am:
5f8939eecd
am:
e8ccd358a9
Change-Id: I7cca8861fb716739c1367d9ae60c720ee660f64b
Mehdi Alizadeh [Fri, 23 Mar 2018 03:26:33 +0000 (03:26 +0000)]
Changes ONN notification texts to re-use with CNN am:
32a7c19c5b
am:
97508e7d06
Change-Id: Iad5a46dbfe117d7bdab7fb4e943a2842d69f6f90
Mehdi Alizadeh [Fri, 23 Mar 2018 03:24:28 +0000 (03:24 +0000)]
Adds entries for Soft AP channel and bandwidth am:
2449819b69
am:
31591ee648
Change-Id: I3d739db2715cb7fe6b3e35bcd76d51c7b1923b80
TreeHugger Robot [Fri, 23 Mar 2018 03:23:27 +0000 (03:23 +0000)]
Merge changes I2d09a84e,I111aab35 into pi-dev
* changes:
Do not show bouncer when fading away
KeyguardBouncer#isShowing fix
Nathan Harold [Fri, 23 Mar 2018 03:18:25 +0000 (03:18 +0000)]
Merge "Add MANAGE_IPSEC_TUNNELS Permission" into pi-dev am:
0205fd1064
am:
4ca771aa5c
Change-Id: I60dcb191a9aea3ff513a4c46c2c59d7f068e843c
Felipe Leme [Fri, 23 Mar 2018 03:11:32 +0000 (03:11 +0000)]
Merge "Always set FLAG_SAVE_ON_ALL_VIEWS_INVISIBLE on SaveInfo when on compat mode." into pi-dev
am:
0cdac33f8f
Change-Id: Ic974a584f3e71e4bb618b9e2f1b83121ca327071
Kweku Adams [Fri, 23 Mar 2018 03:09:59 +0000 (03:09 +0000)]
Merge "Only print out services if they did something." into pi-dev am:
3c0f0b3e8b
am:
f2e9567dbf
Change-Id: Ic537fd85096f9fc410ff2ba9bcfcdea736121470
Calin Juravle [Fri, 23 Mar 2018 03:07:44 +0000 (03:07 +0000)]
Merge "Add extra checks around the profile file descriptor." into pi-dev
am:
2df6aa4178
Change-Id: Ibe5118538ab78dbe3cd390387359fd8af267854e
John W. Bruce [Fri, 23 Mar 2018 03:04:54 +0000 (03:04 +0000)]
Merge "Document CryptoInfo Settings for CENC 2016 & HLS Audio" into pi-dev
am:
6ab6a9d433
Change-Id: I720bd982b19a619f28ab4fe96a66e9683dbb7d14
Torne (Richard Coles) [Fri, 23 Mar 2018 03:01:20 +0000 (03:01 +0000)]
Merge "Don't try to create a process group when not root." into pi-dev am:
5526509f17
am:
bf62c96a1c
Change-Id: I7c90572f2adc29914ba0861dc53c312708b716f8
Selim Cinek [Fri, 23 Mar 2018 03:01:17 +0000 (03:01 +0000)]
Merge "Updated the styling for notifications" into pi-dev
am:
51856fde2b
Change-Id: I8d7b12955763d4d286119e976901fb55cb7a023e
Selim Cinek [Fri, 23 Mar 2018 02:58:17 +0000 (02:58 +0000)]
Merge "Fixed an issue where the roundness of a notification could be wrong" into pi-dev
am:
65cb06cfc5
Change-Id: I0800723e0c6b1b4b0b277d1a2b69859bb0e791cd
Selim Cinek [Fri, 23 Mar 2018 02:52:34 +0000 (02:52 +0000)]
Merge "Ensuring that headsups go away when unpinning via active edge" into pi-dev
am:
6ece0f3f62
Change-Id: I0e77a746106a975bf75cf7e3a932e5925ae9d30b
Philip P. Moltmann [Fri, 23 Mar 2018 02:48:21 +0000 (02:48 +0000)]
Merge "Allow apps to call startRecognition(UUID, Bundle, ComponentName, RecognitionConfig) via reflection" into pi-dev am:
a93efabc24
am:
5a57a8ebf4
Change-Id: I76f406c42a4cb57a9fb00b4fb64f205d6af965fa
Jaewan Kim [Fri, 23 Mar 2018 02:47:25 +0000 (02:47 +0000)]
Merge "MediaSession2: Add more detailed documentation for addPlaylistItem()" into pi-dev
Julien Desprez [Fri, 23 Mar 2018 02:42:37 +0000 (02:42 +0000)]
Merge "Add TestablesTests to device-tests for APCT suite" into pi-dev
am:
d9bd20b0dc
Change-Id: I8520c9f2ea4b7f26c8e9dc75aadb5fb4497e0f5b
Remi NGUYEN VAN [Fri, 23 Mar 2018 02:39:00 +0000 (02:39 +0000)]
Merge "Add method to NetworkStatsService for UID stats."
Abodunrinwa Toki [Fri, 23 Mar 2018 02:31:56 +0000 (02:31 +0000)]
Merge "Fix smart_linkify_enabled flag." into pi-dev am:
e9a7cb8158
am:
27d8cf774a
Change-Id: I4d0c13b480cdd0f2fa134716575e86630a7e90d4
Jack Yu [Fri, 23 Mar 2018 02:31:36 +0000 (02:31 +0000)]
Merge "Enable Checkstyle for "repo upload" for more projects." am:
dd6764a522
am:
2ff91e5132
Change-Id: Ie880f61f511ad51011607c531c9028376e5683d1
Jack Yu [Fri, 23 Mar 2018 02:25:24 +0000 (02:25 +0000)]
Merge "Enable Checkstyle for "repo upload" for more projects."
am:
dd6764a522
Change-Id: I0398c058a35fd644aa949375a53719ba85572408
Amin Shaikh [Fri, 23 Mar 2018 02:24:25 +0000 (02:24 +0000)]
Merge "QS edit mode fixes." into pi-dev am:
c6de4240d5
am:
ca84bcaee6
Change-Id: I2b1412cf3bded51ce6b326d79ad786c392fd7cc7
Matthew Ng [Fri, 23 Mar 2018 02:16:57 +0000 (02:16 +0000)]
Merge "Fixes hiding track for quick scrub" into pi-dev am:
4fb9723faa
am:
9b32313a78
Change-Id: I9b2c30f81a318d58508049fc6fca6d1dcb29fe5f
Selim Cinek [Fri, 23 Mar 2018 02:10:29 +0000 (19:10 -0700)]
Fixed an issue where notifications were invisible on AOD
Because of the new screen off animation, the shelf would
be positioned wrongly and therefore the icons would
be clipped.
We'll have to revisit this positioning, when we do the real AOD
layout, for now we place the invisible shelf at the bottom
of the last notification.
Change-Id: If2bd7c71957585ac73ace004221e48c5b5f134af
Fixes:
76160478
Test: add ambient notification, observe normal clipping
Seigo Nonaka [Fri, 23 Mar 2018 02:08:23 +0000 (02:08 +0000)]
Merge "Make PrecomputedText Spannable for supporting selection" into pi-dev
am:
02c8d1b07f
Change-Id: Ida44cb2d564b0b16272915f7f0f181b98452c1ca
Adrian Roos [Fri, 23 Mar 2018 02:07:01 +0000 (02:07 +0000)]
Merge "PhoneWindowTest: promote to presubmit" into pi-dev am:
7fd2abdf41
am:
0787d4be5a
Change-Id: I76c039596e43e161715ee8aee1ef021dd46e2520
Yao Chen [Fri, 23 Mar 2018 02:03:38 +0000 (02:03 +0000)]
Merge "Fix StorageManager stack use after scope." into pi-dev
am:
5f8939eecd
Change-Id: I32bef5d320a48e3387f4ebb353038c29823ebcc0
Mehdi Alizadeh [Fri, 23 Mar 2018 02:00:35 +0000 (02:00 +0000)]
Changes ONN notification texts to re-use with CNN
am:
32a7c19c5b
Change-Id: Ida9491722180ffef81ec28b7faeba5967fc48d4a
Mehdi Alizadeh [Fri, 23 Mar 2018 01:59:22 +0000 (01:59 +0000)]
Adds entries for Soft AP channel and bandwidth
am:
2449819b69
Change-Id: Ie9da4bfe579d2cc72c16b43558d5e4ebdd75300a
Nathan Harold [Fri, 23 Mar 2018 01:57:41 +0000 (01:57 +0000)]
Merge "Add MANAGE_IPSEC_TUNNELS Permission" into pi-dev
am:
0205fd1064
Change-Id: I7f1c987901c3634fb81d93402d5cb0af80fff11e
Rose Liu [Fri, 23 Mar 2018 01:55:59 +0000 (01:55 +0000)]
Merge "Assign -1 as default value of window type and owner uid." into pi-dev am:
a194d92495
am:
0da0266bdf
Change-Id: I7e52c530a059592fefb14503b09cd0f416584e67
Kweku Adams [Fri, 23 Mar 2018 01:50:24 +0000 (01:50 +0000)]
Merge "Only print out services if they did something." into pi-dev
am:
3c0f0b3e8b
Change-Id: Ie216a8b8e75a4e8e384e1390fe8cda97a64171af
Torne (Richard Coles) [Fri, 23 Mar 2018 01:41:53 +0000 (01:41 +0000)]
Merge "Don't try to create a process group when not root." into pi-dev
am:
5526509f17
Change-Id: If2278523802ed4c29ff2b63641b72d31c2a5fbb9
Felipe Leme [Fri, 23 Mar 2018 01:38:29 +0000 (01:38 +0000)]
Merge "Removed urlBarResourceId." into pi-dev am:
3a31f6c5cc
am:
e40a0838ba
Change-Id: I13688d0b8ce95910eae74e814030b78e28054be8
Philip P. Moltmann [Fri, 23 Mar 2018 01:34:08 +0000 (01:34 +0000)]
Merge "Allow apps to call startRecognition(UUID, Bundle, ComponentName, RecognitionConfig) via reflection" into pi-dev
am:
a93efabc24
Change-Id: I13a35a1fbfd26bdb646823b258914299620807dc
Chen Xu [Fri, 23 Mar 2018 01:33:08 +0000 (01:33 +0000)]
Merge "new WFC registration failure notification string" into pi-dev
Abodunrinwa Toki [Fri, 23 Mar 2018 01:26:34 +0000 (01:26 +0000)]
Merge "Fix smart_linkify_enabled flag." into pi-dev
am:
e9a7cb8158
Change-Id: I8789a58acd22898dfa0ff301132efbafbf8ab8d8
Amin Shaikh [Fri, 23 Mar 2018 01:18:25 +0000 (01:18 +0000)]
Merge "QS edit mode fixes." into pi-dev
am:
c6de4240d5
Change-Id: I33179a69d3805e454e04655e8760c8d322d89377
Suprabh Shukla [Fri, 23 Mar 2018 01:17:09 +0000 (01:17 +0000)]
Merge "APIs to suspend packages with SUSPEND_APPS permission" into pi-dev am:
6affc07065
am:
31b5990893
Change-Id: Ib95745ca26362a9624b704b217b4d9078d0ade7c
OSDN Git Service
