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

68735 Commits

Author SHA1 Message Date
Makoto Onuki
e1f90ac94a Merge \\"Stop adding FLAG_ACTIVITY_RESET_TASK_IF_NEEDED when...\\" into nyc-mr1-dev am: ceadb1a86a 
am: c74ed0d6dc

Change-Id: I0c66444e1352af26bf7c039271a5bee952eb5e52
 2016-07-20 00:32:17 +00:00
Makoto Onuki
c74ed0d6dc Merge \"Stop adding FLAG_ACTIVITY_RESET_TASK_IF_NEEDED when...\" into nyc-mr1-dev 
am: ceadb1a86a

Change-Id: If26f5a2e8f2a0533b145025734e5819e72a48b28
 2016-07-20 00:24:42 +00:00
Makoto Onuki
ceadb1a86a Merge "Stop adding FLAG_ACTIVITY_RESET_TASK_IF_NEEDED when..." into nyc-mr1-dev 2016-07-19 23:57:32 +00:00
Mikhail Naganov
232ac757fb Merge "Protect MIDI framework against client blocks in MidiReceiver.onSend" 2016-07-19 22:50:06 +00:00
Michael Kwan
b20f4f0efb Merge \\"Fix padding on round devices for AlertDialogs.\\" into nyc-mr1-dev am: 0cd4addd36 
am: e42b256d0d

Change-Id: Ia1d0a12f8ec520325ef0ece2c74faed0a51dbfd3
 2016-07-19 19:12:00 +00:00
Michael Kwan
e42b256d0d Merge \"Fix padding on round devices for AlertDialogs.\" into nyc-mr1-dev 
am: 0cd4addd36

Change-Id: I5287b5cae2d18edc5dc2c5fbc2998c63fadbe583
 2016-07-19 18:57:11 +00:00
TreeHugger Robot
0cd4addd36 Merge "Fix padding on round devices for AlertDialogs." into nyc-mr1-dev 2016-07-19 18:48:31 +00:00
TreeHugger Robot
8fedc0e857 Merge "Updated JavaDoc for getApplicationRestrictions" 2016-07-19 18:46:44 +00:00
Yuichi Biwa
9cead0d166 Merge \\"ChooserActivity: Cannot start app that the icon overflows the layout\\" into nyc-mr1-dev am: 586f23c14b 
am: 8b059e8aa1

Change-Id: I13f36de289f0990967e4e5fc967ea64ecfbc0ab8
 2016-07-19 18:38:52 +00:00
Yuichi Biwa
8b059e8aa1 Merge \"ChooserActivity: Cannot start app that the icon overflows the layout\" into nyc-mr1-dev 
am: 586f23c14b

Change-Id: Ie6abdf3303e9f91ae474aca112e39576685d0e5d
 2016-07-19 18:33:40 +00:00
Makoto Onuki
347a6bd820 Stop adding FLAG_ACTIVITY_RESET_TASK_IF_NEEDED when... 
starting a shortcut.

- Also add API surface to support launching multiple intents

- Also add SM.isRateLimitingActive() which was supposed to be
added but was not due to a bad rebase.

Bug 30218829

Change-Id: I82d60ec0df1e2b889538705f9f8870ee727dd55d
 2016-07-19 11:17:12 -07:00
Fyodor Kupolov
4e9af06576 Updated JavaDoc for getApplicationRestrictions 
The method performs disk I/O and shouldn't be called on the main thread.

Bug: 28303952
Change-Id: Iab4d79158b32858baac4147ab73c6ac7aaa51b5b
 2016-07-19 10:28:31 -07:00
Michael Kwan
814508166c Fix padding on round devices for AlertDialogs. 
Bug: 27482353
Change-Id: Ic9ee4abe84f9172db64dba398af2c0058921fa3f
 2016-07-19 10:18:41 -07:00
Yuichi Biwa
4f3a843ea9 ChooserActivity: Cannot start app that the icon overflows the layout 
Symptom:
When sharing an image from Album, ChooserActivity can be shown.
But then the app to be located to the bottom part of the list may not
be started even if user tap it.

Root cause:
ChooserActivity uses ResolverDrawerLayout. And ResolverDrawerLayout
can display only some items on the list (known as "Collapse mode").
When the item clipping along the bottom edge is tapped by the user,
ResolverDrawerLayout tries to expand the list and scroll it to a
better position, instead of starting an application.
In this problem case, ResolverDrawerLayout continues to try to expand
the list whenever tapping, so an application will never start.

Solution:
Change a condition so that mOpenOnClick becomes true only when the list
has been collapsed (mCollapseOffset > 0).

Bug: 30153542

Change-Id: I576fb6c8b6a91d79c1e0d46d069146779f4dbd17
 2016-07-19 10:04:41 -07:00
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