Jim Miller
6097da897a
Merge \\"Fix vulnerability in LockSettings service\\" into nyc-mr1-dev am: 6ad9c16ffd
...
am: 623362c5ab
Change-Id: I7d604ab0a4c76672a765a064011574cd427aac64
2016-07-18 21:15:43 +00:00
Jim Miller
623362c5ab
Merge \"Fix vulnerability in LockSettings service\" into nyc-mr1-dev
...
am: 6ad9c16ffd
Change-Id: Id4db555de3df2d73046aa6358e6b559f4529890d
2016-07-18 21:09:37 +00:00
TreeHugger Robot
6ad9c16ffd
Merge "Fix vulnerability in LockSettings service" into nyc-mr1-dev
2016-07-18 20:54:45 +00:00
Siyamed Sinir
c237c80fee
Merge "Fix TextView.onCommitCorrection ApiDoc"
2016-07-18 20:15:31 +00:00
Tejas Khorana
0a7b51a28f
Merge "indexOfValue now uses .equals (cont.)"
2016-07-18 20:02:11 +00:00
Tejas Khorana
fb5166dafb
indexOfValue now uses .equals (cont.)
...
Addresses same issue addressed in SparseArray in LongSparseArray in
the method: indexByValue. Made a new method indexByValueByValue that
compares objects using .equals instead of ==.
Change-Id: I55735fe7ca364d0a9caab2a6909c2eaede845619
2016-07-18 12:03:14 -07:00
Abodunrinwa Toki
73746d5d24
Merge \"DO NOT MERGE: FloatingToolbar - Check that app supports RTL.\" into nyc-mr1-dev
...
am: 63b31d5729
Change-Id: I77c82ad4ce15368c92041d994e10c8a44a33667c
2016-07-18 18:05:32 +00:00
Chris Tate
1a83deb584
Merge \\"Document that WallpaperManager.getDrawable() can return null\\" into nyc-mr1-dev am: 3cec9d44b3
...
am: ca0e0b9b6c
Change-Id: Id27ec9541d4075f80a546d3df2bfd7577e38f0fc
2016-07-18 17:54:54 +00:00
Abodunrinwa Toki
63b31d5729
Merge "DO NOT MERGE: FloatingToolbar - Check that app supports RTL." into nyc-mr1-dev
2016-07-18 17:49:26 +00:00
Christopher Tate
ca0e0b9b6c
Merge \"Document that WallpaperManager.getDrawable() can return null\" into nyc-mr1-dev
...
am: 3cec9d44b3
Change-Id: I72443aa4360cb4c22c9b4faf0cf98b395097757f
2016-07-18 17:44:04 +00:00
Tejas Khorana
ac01f6c65b
Merge "indexOfValueByValue now uses .equals"
2016-07-18 17:29:50 +00:00
Chris Tate
3cec9d44b3
Merge "Document that WallpaperManager.getDrawable() can return null" into nyc-mr1-dev
2016-07-18 17:29:39 +00:00
Felipe Leme
8e1ed51e51
Merge "Added missing copyright notice."
2016-07-18 17:25:58 +00:00
Lorenzo Colitti
ef3ec0dd34
Merge \"Merge \\"Add an isListen method to NetworkRequests.\\" into nyc-mr1-dev am: b5239329b1\" into nyc-mr1-dev-plus-aosp
...
am: 17450e41b3
Change-Id: Ic71a5722ee877de73e7ffd340a5ffb84a2d4910d
2016-07-18 15:15:33 +00:00
Lorenzo Colitti
5dd90b15fb
Merge \"Add an isListen method to NetworkRequests.\" into nyc-mr1-dev
...
am: b5239329b1
Change-Id: Ib712c3c7b44d3a623d5f5facf0c7f6844c3ebb82
2016-07-18 15:08:54 +00:00
TreeHugger Robot
b5239329b1
Merge "Add an isListen method to NetworkRequests." into nyc-mr1-dev
2016-07-18 15:00:21 +00:00
Lorenzo Colitti
f4a45f4c33
Add an isListen method to NetworkRequests.
...
This allows simplification of the ConnectivityService code.
Bug: 23113288
Change-Id: I124544b99c5a920124e9a3d31cda8c6d2abc21fd
2016-07-18 18:42:26 +09:00
Andrei Stingaceanu
4e750e822f
Merge "Keyboard shortcuts: minor Activity broadcast refactor"
2016-07-18 09:39:52 +00:00
Abodunrinwa Toki
cc59a84490
Merge \\"FloatingActionMode: Fix screen coordinates.\\" into nyc-mr1-dev am: 3b8e0fdf92
...
am: c749762107
Change-Id: If82be88fcf267aef7f239e9ab30e3e594fcf945e
2016-07-17 18:26:40 +00:00
Abodunrinwa Toki
97dd8eee10
DO NOT MERGE: FloatingToolbar - Check that app supports RTL.
...
Port I36c0d72984e0abc7c6430cc7d52d8efd7341820e to nyc-mr1-dev.
Bug: 29932935
Change-Id: Icd085508f7d1dd412f4d0805e8fd01734743648e
2016-07-17 19:25:27 +01:00
Abodunrinwa Toki
c749762107
Merge \"FloatingActionMode: Fix screen coordinates.\" into nyc-mr1-dev
...
am: 3b8e0fdf92
Change-Id: If193932cfe4b79535ba8d2ce44f144899e81ee4e
2016-07-17 18:20:11 +00:00
Abodunrinwa Toki
3b8e0fdf92
Merge "FloatingActionMode: Fix screen coordinates." into nyc-mr1-dev
2016-07-17 18:07:09 +00:00
Tim Murray
36030dda49
Merge \\"Make sure StrictMode allows disk reads when calling isThreadInProcess.\\" into nyc-mr1-dev am: afa67f3d34
...
am: 62547293e3
Change-Id: Idc39bd967dfc45c9d66aaf5f28e1012c4c15bd78
2016-07-16 19:29:44 +00:00
Tim Murray
62547293e3
Merge \"Make sure StrictMode allows disk reads when calling isThreadInProcess.\" into nyc-mr1-dev
...
am: afa67f3d34
Change-Id: I2b3afb4acb9038a2d33ecf42bbbcc8c5d754ab5f
2016-07-16 19:25:37 +00:00
Tim Murray
afa67f3d34
Merge "Make sure StrictMode allows disk reads when calling isThreadInProcess." into nyc-mr1-dev
2016-07-16 19:14:30 +00:00
Tim Murray
9bc12a83b6
Make sure StrictMode allows disk reads when calling isThreadInProcess.
...
If an application thread disables disk reads on the main thread,
isThreadInProcess will trigger a strict mode violation. This is bad if
the RenderThread is created after disk reads have been disallowed.
bug 30170339
Change-Id: I6918605d11f0c586c156f3168051376c3209b3f1
2016-07-16 11:48:01 -07:00
Adam Lesinski
8024bf723c
Merge \\"Deprecate Resources constructor and updateConfiguration() method\\" into nyc-mr1-dev am: c3829f528e
...
am: 6a9f651b73
Change-Id: I27261451c872502b5f240f1e68fdd092fa9e5e67
2016-07-16 02:44:06 +00:00
Adam Lesinski
6a9f651b73
Merge \"Deprecate Resources constructor and updateConfiguration() method\" into nyc-mr1-dev
...
am: c3829f528e
Change-Id: I59c4daf39179409cc3195cda9c89ae604ec36af6
2016-07-16 02:38:24 +00:00
TreeHugger Robot
c3829f528e
Merge "Deprecate Resources constructor and updateConfiguration() method" into nyc-mr1-dev
2016-07-16 02:33:55 +00:00
Adam Lesinski
aa19d5e49e
Deprecate Resources constructor and updateConfiguration() method
...
These methods were never meant to be public. Instead, developers
can use Context#createConfigurationContext().
Bug:30088019
Bug:29999297
Change-Id: I2b864136163deda0af99fa3bfe9ef4ee1077341a
2016-07-15 18:01:48 -07:00
Jim Miller
29d157bf05
Fix vulnerability in LockSettings service
...
Fixes bug 30003944
Change-Id: I8700d4424c6186c8d5e71d2fdede0223ad86904d
2016-07-15 17:28:53 -07:00
Makoto Onuki
d36651717e
Merge \\"Cache the default launcher.\\" into nyc-mr1-dev am: cf99263662
...
am: 6406be311c
Change-Id: If7d3f5325388242a196d78f8429c4aba65ef041e
2016-07-15 23:34:53 +00:00
Ashutosh Joshi
d51413ec49
Merge \\"Loading NanoApps now works.\\" into nyc-mr1-dev am: 095979b463
...
am: 820ab55e1c
Change-Id: Ib92f140990ed577483bcafdbdc87118f2528144e
2016-07-15 23:28:28 +00:00
Makoto Onuki
35dcfebd1e
Merge \\"Fix the allowed icon type error message\\" into nyc-mr1-dev am: fd57d549cf
...
am: 3e3f0f1ba8
Change-Id: Iaa3eb26436dfa339ee7e095562344394dcd56b53
2016-07-15 23:28:20 +00:00
Mike Tsao
b933b9acd6
Merge \\"Back up Night Light settings\\" into nyc-mr1-dev am: 9a0e444c22
...
am: d4584a8fb5
Change-Id: I15db4e270c6306fc666c9f33914f242e9e21a1fd
2016-07-15 23:28:17 +00:00
Adrian Roos
ab66a2cd5e
Merge \\"Notification: Apply small icon level\\" into nyc-mr1-dev am: 9d8de73530
...
am: 8b942b2404
Change-Id: I8471581ac27fb1c35126635bdc655b8c8ddea328
2016-07-15 23:25:27 +00:00
Adrian Roos
5810a1c252
Merge \\"Add way to set live wallpaper across users\\" into nyc-mr1-dev am: 9a7c3bd577
...
am: 119840eb91
Change-Id: I16436af5b7ada58113d846b9836d302061730177
2016-07-15 23:25:19 +00:00
Svetoslav Ganov
951f0e1d4d
Merge \\"Prevent apps to overlay other apps via toast windows\\" into nyc-mr1-dev am: e2d148b008
...
am: cd263d56d2
Change-Id: I4971baf5ef2a522f8acea091023936e033f23cea
2016-07-15 23:13:59 +00:00
Christopher Tate
41dc83bd57
Document that WallpaperManager.getDrawable() can return null
...
Bug 30164766
Change-Id: Idc03a41ea3fab3772de4f24551765dff78eb6d7f
2016-07-15 15:59:23 -07:00
Makoto Onuki
6406be311c
Merge \"Cache the default launcher.\" into nyc-mr1-dev
...
am: cf99263662
Change-Id: If8d15587702dad81d9a9025e13dec9820456287b
2016-07-15 22:26:15 +00:00
Makoto Onuki
cf99263662
Merge "Cache the default launcher." into nyc-mr1-dev
2016-07-15 22:22:34 +00:00
Ashutosh Joshi
820ab55e1c
Merge \"Loading NanoApps now works.\" into nyc-mr1-dev
...
am: 095979b463
Change-Id: I8035e04cc0ca040357a8799136c9b31702a151c0
2016-07-15 22:21:01 +00:00
Ashutosh Joshi
095979b463
Merge "Loading NanoApps now works." into nyc-mr1-dev
2016-07-15 22:12:42 +00:00
Makoto Onuki
3e3f0f1ba8
Merge \"Fix the allowed icon type error message\" into nyc-mr1-dev
...
am: fd57d549cf
Change-Id: Ibff8d87533d075f0af95ab98d44f67fd4405a951
2016-07-15 21:50:46 +00:00
TreeHugger Robot
fd57d549cf
Merge "Fix the allowed icon type error message" into nyc-mr1-dev
2016-07-15 21:43:03 +00:00
Mike Tsao
d4584a8fb5
Merge \"Back up Night Light settings\" into nyc-mr1-dev
...
am: 9a0e444c22
Change-Id: I4bc968dfced4671fecb140c50ce759b02d78c4a1
2016-07-15 21:33:57 +00:00
TreeHugger Robot
9a0e444c22
Merge "Back up Night Light settings" into nyc-mr1-dev
2016-07-15 21:28:34 +00:00
Adrian Roos
8b942b2404
Merge \"Notification: Apply small icon level\" into nyc-mr1-dev
...
am: 9d8de73530
Change-Id: Iac5f0b6e210355867f79cbc7f48165517ba11a26
2016-07-15 21:16:41 +00:00
Adrian Roos
119840eb91
Merge \"Add way to set live wallpaper across users\" into nyc-mr1-dev
...
am: 9a7c3bd577
Change-Id: Ia5630143df774d76d5867e8e9541775e07e1c5df
2016-07-15 21:16:36 +00:00
Adrian Roos
9d8de73530
Merge "Notification: Apply small icon level" into nyc-mr1-dev
2016-07-15 21:09:37 +00:00