Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
274,569 Commits 3 Branches 0 Tags
77dbac341a3c6f423191a9e173f67edfce209ddb
Commit Graph

68720 Commits

Author SHA1 Message Date
Nicolas Prévot
77dbac341a Merge \\"Don\\'t append userIds for the current user\\'s clipData uris.\\" into nyc-mr1-dev am: e723ed8b51 
am: 91b6f5e44f

Change-Id: I8e85d2e6df9768a48b5d3589304f60a23c9ab182
 2016-07-19 16:20:14 +00:00
Nicolas Prevot
91b6f5e44f Merge \"Don\'t append userIds for the current user\'s clipData uris.\" into nyc-mr1-dev 
am: e723ed8b51

Change-Id: Idf3bf3c6baea706a15df5e68c50d79723a100d9f
 2016-07-19 16:15:27 +00:00
Nicolas Prévot
e723ed8b51 Merge "Don't append userIds for the current user's clipData uris." into nyc-mr1-dev 2016-07-19 16:06:44 +00:00
TreeHugger Robot
c1b775584d Merge "Remove synchronized from static methods in WebView." 2016-07-19 11:42:01 +00:00
Justin Klaassen
3fac1a8c5c Merge \\"Cleanup TwilightService\\" into nyc-mr1-dev am: e5aeca3dc9 
am: 6c02076e73

Change-Id: Ib3aad9f409c01338ce9be5d433db55d87d511daf
 2016-07-19 02:16:25 +00:00
Justin Klaassen
6c02076e73 Merge \"Cleanup TwilightService\" into nyc-mr1-dev 
am: e5aeca3dc9

Change-Id: Iac61d988c3432b8f78eb7d06dd3bb8d706fec621
 2016-07-19 02:11:00 +00:00
Justin Klaassen
6384878d69 Cleanup TwilightService 
TwilightService now just reports the current twilight state, it's up to
clients to provide their own locking mechanism (e.g. always day or
night).

Bug: 29620105
Change-Id: I2a8bb544eab0f44d269c59f36a53fbdf842b423a
 2016-07-18 16:57:15 -07:00
Svetoslav Ganov
f6d56f92ff Merge "Update windows before sending a window state change event" 2016-07-18 21:54:14 +00:00
Adam Lesinski
daa3e9cd80 Merge \\"Record UID of wakeup packets\\" into nyc-mr1-dev am: 117cf8de91 
am: d279c1291e

Change-Id: I6973342d48a8a8cebe8f4515c6d67d271dbcf7f7
 2016-07-18 21:29:56 +00:00
Hongming Jin
280a87d3a5 Merge "AccountManager: Make account session APIs public api." 2016-07-18 21:24:08 +00:00
Adam Lesinski
d279c1291e Merge \"Record UID of wakeup packets\" into nyc-mr1-dev 
am: 117cf8de91

Change-Id: Id4e843eef00a623353fe3027de13460aa92e699f
 2016-07-18 21:15:48 +00:00
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
117cf8de91 Merge "Record UID of wakeup packets" into nyc-mr1-dev 2016-07-18 20:58:15 +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
Adam Lesinski
5f056f6d87 Record UID of wakeup packets 
Bug:28931278
Change-Id: I50a3b6a8026b4d06aaa2730cd531658d280ddb73
 2016-07-18 12:30:46 -07: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
Torne (Richard Coles)
59375a015a Remove synchronized from static methods in WebView. 
ART uses the class object's embedded monitor to protect class
initialization - the same monitor used by "synchronized" applied to
static methods. This can cause deadlock in extremely rare cases of
preemption during WebView code loading.

Remove synchronized from all static methods in WebView, to avoid this
deadlock. In most cases the synchronized is simply unnecessary in the
Chromium-based WebView implementation; in CookieSyncManager we instead
use a separately allocated Lock object to preserve thread safety.

Bug: 27417671
Change-Id: I13049f23fc984b77a3f4c203a5c698858c64abfe
 2016-07-18 18:45:24 +01: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