Jeff Sharkey
d11c21f371
DO NOT MERGE. Clarify FileObserver docs for null value. am: c041f5a3b8
...
am: a341d70602
Change-Id: Ib737218df19aed7f09ba142cce4fc9c62edffd5d
2016-08-31 23:29:26 +00:00
Jeff Sharkey
a341d70602
DO NOT MERGE. Clarify FileObserver docs for null value.
...
am: c041f5a3b8
Change-Id: I3c0f0098eed321419c8d0e2a1a66c2bf380df8d1
2016-08-31 23:22:04 +00:00
Jeff Sharkey
c041f5a3b8
DO NOT MERGE. Clarify FileObserver docs for null value.
...
Change-Id: I7dc0b0d26220d6eb82f956a9860cfb6aeccfd12f
Test: none
Bug: 30511606
(cherry picked from commit 902316d553 )
2016-08-31 21:42:54 +00:00
Robert Carr
0ceb3cd785
PopupWindow: Gravity fixes. am: 085160612d
...
am: a732ea6c1f
Change-Id: Ide4ccd6cbfef913392a46b89486de064e0196ad6
2016-08-31 19:31:48 +00:00
Robert Carr
a732ea6c1f
PopupWindow: Gravity fixes.
...
am: 085160612d
Change-Id: Ia9477ead7cf1cdd942817f2f427053c6187a1cdf
2016-08-31 19:26:55 +00:00
Rob Carr
8330a91def
Merge "PopupWindow: Gravity fixes." into nyc-mr1-dev
2016-08-31 19:21:52 +00:00
Jakub Pawlowski
8348bd2317
Merge "Separate advertiser from GATT client (1/4)" am: 5f87c4539a am: 40a16ea242
...
am: 9f341e4e49
Change-Id: Ic3461b98449636cfc125890f255b1332d0ef5132
2016-08-31 18:28:45 +00:00
Jakub Pawlowski
9f341e4e49
Merge "Separate advertiser from GATT client (1/4)" am: 5f87c4539a
...
am: 40a16ea242
Change-Id: I0d08f623e78fdd779b39083d0da3a45aee72ff3c
2016-08-31 18:21:00 +00:00
Jakub Pawlowski
5f87c4539a
Merge "Separate advertiser from GATT client (1/4)"
2016-08-31 18:05:27 +00:00
Neil Fuller
0aa7d4bb3f
Merge "Fix receive timeout on LocalSocket" am: 7a9c0cd854 am: 680ec020a1
...
am: ef1fb4889a
Change-Id: Ie4befe516f369d903a61f22aab15e40ac09193a3
2016-08-31 16:47:33 +00:00
Neil Fuller
ef1fb4889a
Merge "Fix receive timeout on LocalSocket" am: 7a9c0cd854
...
am: 680ec020a1
Change-Id: I9b5622a91cf459844ee3513191b45994d51c86a7
2016-08-31 16:43:22 +00:00
Neil Fuller
7a9c0cd854
Merge "Fix receive timeout on LocalSocket"
2016-08-31 16:28:17 +00:00
Jakub Pawlowski
a480f7fe28
Separate advertiser from GATT client (1/4)
...
Bug: 30622771
Change-Id: I08c0498f8a1ea04423d3e864e9a60c7c78f1dbad
2016-08-31 03:36:53 -07:00
Neil Fuller
a8280a5d34
Fix receive timeout on LocalSocket
...
The receive timeout stopped being set incorrect due to commit
c80af6d8 . There is an associated CTS regression test in cts/.
Test: Ran CTS test android.net.cts.LocalSocketTest
Bug: 31205169
Change-Id: I99808478946f8eae502c49d2cb83465648b9c904
2016-08-31 11:32:17 +01:00
Svetoslav Ganov
a2c1196dc2
Properly close fd backing a MemoryIntArray am: fe2462f3a6
...
am: b7be22cdaf
Change-Id: Ie598d2310fff4d72f618ecfa9e2efae78c595a10
2016-08-31 01:04:00 +00:00
Svetoslav Ganov
b7be22cdaf
Properly close fd backing a MemoryIntArray
...
am: fe2462f3a6
Change-Id: Iaf35af209d210ba0aa6239bdeb0c81a079d25543
2016-08-31 00:56:32 +00:00
TreeHugger Robot
43896cbc02
Merge "Properly close fd backing a MemoryIntArray" into nyc-mr1-dev
2016-08-31 00:49:42 +00:00
sergeyv
bb37b7b613
TextureView: clean up displaylists am: 17dd01b693
...
am: ac2ca87e92
Change-Id: I69adecc118bed63acf46f6a1a64c9cc7e376edaa
2016-08-31 00:37:51 +00:00
sergeyv
ac2ca87e92
TextureView: clean up displaylists
...
am: 17dd01b693
Change-Id: Ib32a64f032b9f7230414f038417b2151f1e6e4be
2016-08-31 00:32:17 +00:00
TreeHugger Robot
c0e2e0ad62
Merge "TextureView: clean up displaylists" into nyc-mr1-dev
2016-08-31 00:26:46 +00:00
Jason Monk
297d238130
Backup system QS tiles DO NOT MERGE
...
am: 37bd2be160
Change-Id: I5d291b5ee504acf40386cbce4edaf5b20a1a3d3d
2016-08-30 22:50:10 +00:00
Makoto Onuki
e08b704cb7
Update CP2 javadoc am: 93d94ebac2
...
am: e3972019dc
Change-Id: Ia988c68813311b042c6ba9fbaa3c486935e5566b
2016-08-30 22:49:57 +00:00
Makoto Onuki
e3972019dc
Update CP2 javadoc
...
am: 93d94ebac2
Change-Id: I2b1cddae5407257aaad84f4b9dd492fe69ae5d27
2016-08-30 22:42:41 +00:00
Makoto Onuki
82babe050a
Merge "Update CP2 javadoc" into nyc-mr1-dev
2016-08-30 22:31:22 +00:00
sergeyv
17dd01b693
TextureView: clean up displaylists
...
bug:31066756
Change-Id: Ibc61825ad1ed12479e9de18cc06be7401d3fc93a
2016-08-30 14:03:32 -07:00
Lorenzo Colitti
98ed392cf7
Network switch notifications: rate & daily limits am: 84e6f1232c am: 858499b2c0
...
am: 2c535a4f7c
Change-Id: I166dd693345ed9a63411f5f1ed6bdf33015b1957
2016-08-30 20:32:52 +00:00
Lorenzo Colitti
2c535a4f7c
Network switch notifications: rate & daily limits am: 84e6f1232c
...
am: 858499b2c0
Change-Id: I9cf27874626c3034ef4fb4fc23ec75f3e1ac5f3f
2016-08-30 20:24:14 +00:00
Lorenzo Colitti
858499b2c0
Network switch notifications: rate & daily limits
...
am: 84e6f1232c
Change-Id: Ibf6fa695c5f8ef11c99fe075b59a36f52c5c177b
2016-08-30 20:17:33 +00:00
Jason Monk
37bd2be160
Backup system QS tiles DO NOT MERGE
...
Add QS tiles to the backup list. Non-system tiles will get removed
since they won't be installed when restore happens.
Change-Id: Iccf6e773384c45bd4d1f10c21aa8af356b3920d2
Bug: 28782938
2016-08-30 15:48:15 -04:00
Eino-Ville Talvala
b13b6bd20e
android.view.Surface: Add parceling warning am: f005f5ed88
...
am: 286b1a83e4
Change-Id: I799dca3ed9da618ec88b8d554520aba649918d94
2016-08-30 17:57:12 +00:00
Eino-Ville Talvala
286b1a83e4
android.view.Surface: Add parceling warning
...
am: f005f5ed88
Change-Id: Id2c772873fbf98653e751036790484d0fbf7bb16
2016-08-30 17:50:12 +00:00
Eino-Ville Talvala
0656931d18
Merge "android.view.Surface: Add parceling warning" into nyc-mr1-dev
2016-08-30 17:44:11 +00:00
Raph Levien
84c45e7085
Enforce consistent sizes for arrays in SpannableStringInternal
...
am: 9cde7244b6
Change-Id: Ie1fa575d83754d39a6bc30ba542411709f7a2c46
2016-08-30 17:36:33 +00:00
Raph Levien
5d628b1e45
Merge "Enforce consistent sizes for arrays in SpannableStringInternal" into nyc-dev
2016-08-30 17:25:58 +00:00
Lorenzo Colitti
84e6f1232c
Network switch notifications: rate & daily limits
...
This patch adds a daily limit to the maximum number of notifications
shown when switching networks.
It also adds a rate limit to prevent rapid successive notifications in
flapping scenarios.
Bug: 31132499
Change-Id: Iccb6d0899646ea6df3cfad32a421922263e0eb85
2016-08-31 00:36:11 +09:00
Ned Burns
dc47505734
Add rotary encoder support to scrolling containers
...
am: 20ad073581
Change-Id: Icb513cdc1d6e035dbb111b16a64d99899c571e42
2016-08-30 03:14:23 +00:00
TreeHugger Robot
aa09263379
Merge "Add rotary encoder support to scrolling containers" into cw-f-dev
2016-08-30 03:10:48 +00:00
Jorim Jaggi
c5bafe26cb
Add animation when unoccluding windows (1/2) am: 6626f54e65
...
am: 314c05db45
Change-Id: I0e9d85e8f90d00fe835c0622438ac5b6afd2b52d
2016-08-30 02:33:24 +00:00
Svetoslav Ganov
fe2462f3a6
Properly close fd backing a MemoryIntArray
...
Use ParcelFileDescriptor only as an IPC transport
to make sure MemoryIntArray manges its backing fd.
Bug:30310689
Change-Id: Ib3cc13ef4ae2a744e5f7a96099570e0431847bce
2016-08-30 02:26:19 +00:00
Eino-Ville Talvala
f005f5ed88
android.view.Surface: Add parceling warning
...
Surface is parcelled partly in java, partly in native, and any fields
added in java have to be accounted for in the native side as well.
Add a warning to avoid issues in the future
Bug: 31162160
Change-Id: I48ca1bc3eea29f1ac3d3065f6defb6ed2be4052a
2016-08-29 17:51:23 -07:00
Mitchell Wills
722de5f9d0
DO NOT MERGE Manually merge commit 'f28778064383821ccf48c9570191f34a24aa513f' into nyc-mr1-dev-plus-aosp
...
Change-Id: I7cb1f97a5b931c2057a811d7947f47ad7320ef1c
2016-08-29 17:46:44 -07:00
The Android Automerger
f287780643
Manually merge commit 'b0b6afc' into nyc-dev-plus-aosp
2016-08-30 00:26:21 +00:00
Jorim Jaggi
314c05db45
Add animation when unoccluding windows (1/2)
...
am: 6626f54e65
Change-Id: I09be1e1b7d830067c354c6cdfd940deafa027a22
2016-08-30 00:25:52 +00:00
Ned Burns
20ad073581
Add rotary encoder support to scrolling containers
...
Change-Id: I1b7a2a60ac9864f2639af81fff810db601b2fbd4
2016-08-29 20:09:23 -04:00
Chris Craik
dbf69818a2
Cherry pick TextureView fixes
...
am: 2e8a8a2432
Change-Id: I0f650bf2647f9141f9639a4e8875170640d78237
2016-08-29 23:41:22 +00:00
John Reck
8eaa65b867
Merge "Cherry pick TextureView fixes" into nyc-dev
2016-08-29 23:33:57 +00:00
Yohei Yukawa
87b9a88c32
Make sure IME focus is synced to View focus
...
am: 8eb07090a4
Change-Id: Ia0db5adc86c72f122a5b9bab91962ffa2923469a
2016-08-29 22:40:07 +00:00
TreeHugger Robot
b7efddfc41
Merge "Make sure IME focus is synced to View focus" into nyc-dev
2016-08-29 22:35:23 +00:00
Alan Viverette
01ba422091
Set up view state before attaching, jump drawables if needed
...
am: c328f042a6
Change-Id: Ie3df4a2e889577a7a64adc1fff4d773529da0d61
2016-08-29 22:18:28 +00:00
Chris Craik
2e8a8a2432
Cherry pick TextureView fixes
...
The following changes are in this commit:
Avoid destroying TextureView surfaces for onStop
bug:30238922
TextureViews will hold onto their backing surfaces, which will allow
them to resume gracefully when the app's surfaces are saved.
Now only resources that are destroyed for onStop are DisplayLists.
(cherry picked from commit 391d560402 )
TextureView: destroy layer on destroyHardwareResources event
bug:30468770
(cherry picked from commit 1c16c37d86 )
Fix NPE in TextureView
Bug: 30651595
(cherry picked from commit 3c2587f26e )
Fix NPE in TextureView
Bug: 30779663
(cherry picked from commit 7e237189c2 )
Fix maps resume being blank
Bug: 30889568
Fixes an issue where mLayer didn't have
the mSurface set on it in certain resume
scenarios.
(cherry picked from commit 03df0834e6 )
2016-08-29 14:22:13 -07:00