drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
221,067 Commits 1 Branch 0 Tags
Commit Graph

221067 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
80f9d74054 Merge commit \'bce5116b8d10c91436445cd0a0830bb51702bfd4\' into HEAD am: 2e8c3c11b7 
am: 7624931a37

* commit '7624931a3788a50f82512072f36e77bf0af5e28f':
 2015-11-03 23:46:38 +00:00
Wale Ogunwale
b7243ae41d Merge "[ActivityManager] Fix NullPointerException in startNextMatchingActivity." am: 7810aed854 am: d89b76a58d 
am: 8401a8d0c5

* commit '8401a8d0c5bad075a7d46a68a30cd9af4c0d4413':
  [ActivityManager] Fix NullPointerException in startNextMatchingActivity.
 2015-11-03 23:39:11 +00:00
Glenn Kasten
99b95fdc55 Merge "BluetoothMidiDevice: change write type to support JamStik" am: 6079b990f1 am: 613c63c742 
am: a10d826b1b

* commit 'a10d826b1bfcd3b919193e85476df0336d03c622':
  BluetoothMidiDevice: change write type to support JamStik
 2015-11-03 23:37:48 +00:00
Glenn Kasten
47bb36cf25 Merge "BLE-MIDI: change binding for BluetoothMidiService" am: 5831944a6e am: bd32753700 
am: ff4e4425b7

* commit 'ff4e4425b7e032feba1afc81ddeec7ad17e8a7ea':
  BLE-MIDI: change binding for BluetoothMidiService
 2015-11-03 23:36:27 +00:00
Ian Pedowitz
18896e0893 Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev am: 966d6040c6 am: 95fc53b029 am: d6f3e38738 
am: 87455c7397

* commit '87455c7397605fba4bf3ad04af8df3c599a7a6ba':
  Limit persistent ashmem backed fds to a minimum of 128kB.
 2015-11-03 23:34:54 +00:00
Bill Yi
7624931a37 Merge commit \'bce5116b8d10c91436445cd0a0830bb51702bfd4\' into HEAD 
am: 2e8c3c11b7

* commit '2e8c3c11b7f482f01b1ff76a6217eaf129253809':
 2015-11-03 23:33:07 +00:00
Wale Ogunwale
8401a8d0c5 Merge "[ActivityManager] Fix NullPointerException in startNextMatchingActivity." am: 7810aed854 
am: d89b76a58d

* commit 'd89b76a58dcffa7dbc5974d14c7914f44233bef3':
  [ActivityManager] Fix NullPointerException in startNextMatchingActivity.
 2015-11-03 23:29:47 +00:00
Glenn Kasten
a10d826b1b Merge "BluetoothMidiDevice: change write type to support JamStik" am: 6079b990f1 
am: 613c63c742

* commit '613c63c742f1609297156fffe6169ee17db895f4':
  BluetoothMidiDevice: change write type to support JamStik
 2015-11-03 23:28:10 +00:00
Glenn Kasten
ff4e4425b7 Merge "BLE-MIDI: change binding for BluetoothMidiService" am: 5831944a6e 
am: bd32753700

* commit 'bd3275370000d657ea86e3a42f1bd76343b2e6a5':
  BLE-MIDI: change binding for BluetoothMidiService
 2015-11-03 23:26:41 +00:00
Winson Chung
b59db97fc7 Merge "Updating freeform layout to be static at the top of recents." 2015-11-03 23:16:03 +00:00
Glenn Kasten
7cc4db18ca Merge commit 'ca2daddfea' into temp 
Change-Id: I4efdb25d63be2c805059b1035cfccae2885a96fd
 2015-11-03 15:08:12 -08:00
Steve McKay
541b168c03 Merge "Show only selection count in ActionBar." 2015-11-03 22:52:09 +00:00
Steve McKay
dc127a0919 Merge "Don't show advanced menu in downloads ui." 2015-11-03 22:50:05 +00:00
Jeff Sharkey
dde4ecbb93 Merge "Yell when calling installd with PM lock held." 2015-11-03 22:48:08 +00:00
Steve McKay
9c62fd8dd6 Don't show advanced menu in downloads ui. 
Also, don't show search, and file size....and maybe others.

Bug: 25383741
Change-Id: I4bc867254b89011786fdf087b371974ee80d09da
 2015-11-03 14:45:30 -08:00
Jeff Sharkey
8948c01eb7 Yell when calling installd with PM lock held. 
As a matter of policy, we should never be holding the mPackages lock
while calling down into installd.  This little bit of logic helps us
catch accidental cases where this happens.

Change-Id: I676c81df43ef936ffd36290d45a79429630c1b4b
 2015-11-03 14:44:20 -08:00
Steve McKay
639938f3dc Merge "Handle SpacerItem on click correctly." 2015-11-03 22:42:20 +00:00
Bill Yi
2e8c3c11b7 Merge commit 'bce5116b8d10c91436445cd0a0830bb51702bfd4' into HEAD 2015-11-03 14:29:59 -08:00
Ching Tzung Lin
a93d871e5c Merge "Remove circular_display_mask_offset symbol and default" into cw-e-dev am: 7f54aa1e81 am: 9c7f6a409b 
am: 7078a44687

* commit '7078a446874bdb2a51b9eae8b41f9d1ec0bce86a':
  Remove circular_display_mask_offset symbol and default
 2015-11-03 22:28:49 +00:00
Nicolas Capens
a18de73ede Merge "Assume OpenGL ES 2.0 support for qemu.gles > 0" 2015-11-03 22:26:21 +00:00
Ian Pedowitz
87455c7397 Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev am: 966d6040c6 am: 95fc53b029 
am: d6f3e38738

* commit 'd6f3e38738c88821b28b2571d034fc1b189a35de':
  Limit persistent ashmem backed fds to a minimum of 128kB.
 2015-11-03 22:21:48 +00:00
Nicolas Capens
ac465cef41 Assume OpenGL ES 2.0 support for qemu.gles > 0 
Bug 25435727

Change-Id: I1d11c2f03849f1244bdd83e47aa53776acfba6fd
 2015-11-03 17:18:35 -05:00
Winson
a5e6b36034 Updating freeform layout to be static at the top of recents. 
Change-Id: I5118d03c115080e05447d325097419b9a1c6f8b4
 2015-11-03 14:18:03 -08:00
Chet Haase
1d17ee041d Merge "Un-hide FloatProperty and IntProperty" 2015-11-03 22:16:14 +00:00
Ian Pedowitz
d6f3e38738 Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev am: 966d6040c6 
am: 95fc53b029

* commit '95fc53b0293a6361c7ff8a412897a869f07664c6':
  Limit persistent ashmem backed fds to a minimum of 128kB.
 2015-11-03 22:13:54 +00:00
Ian Pedowitz
95fc53b029 Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev 
am: 966d6040c6

* commit '966d6040c6b171c75e9fb0ca942e84f9cf4d0dff':
  Limit persistent ashmem backed fds to a minimum of 128kB.
 2015-11-03 22:05:23 +00:00
Steve McKay
35820cfe96 Handle SpacerItem on click correctly. 
Bug: 13319202
Change-Id: I22f556f512f55cc09eead462a4eb8cea99dc5e64
 2015-11-03 14:01:34 -08:00
Ian Pedowitz
966d6040c6 Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev 2015-11-03 21:58:30 +00:00
Dianne Hackborn
094f08efa1 Merge "resolve merge conflicts of 3aee38c86e to master." 2015-11-03 21:51:07 +00:00
Alan Viverette
ad0edadeab Merge "If LayerDrawable child doesn't have constant state, use shallow copy" 2015-11-03 21:43:46 +00:00
Chet Haase
8240c97b01 Un-hide FloatProperty and IntProperty 
These simple utility classes (used internally since Property was first introduced
way back in Jellybean) are the best way to avoid autoboxing when using the Property
approach to ObjectAnimator. But since their hidden, developers have to use the
autoboxing version (Property, the superclass) or know to come up with their own
primitive-optimized property subclasses.

This CL simply un-hides these two classes to make them usable outside of the framework.

Issue #21722783 Make [Int|Float]Property public

Change-Id: I7f3a456d108bf48587d711255d3577cce3ac5e24
 2015-11-03 13:41:46 -08:00
Steve McKay
fafb81b74c Merge "Use StubProvider for functional tests." 2015-11-03 21:34:14 +00:00
Steve McKay
0c3c695469 Use StubProvider for functional tests. 
Add a "UiBot" class for driving the UI from tests.
Add a "DocumentsProviderHelper" class for convenient test doc setup.
Update FilesActivityUiTest to use "TargetContext" which is
    necessary in order to perform ContentProvider
    operations.
Fix a bug where CopyTest relied on implicit order of roots.
Don't include guava in tests...since it breaks functional tests (incompatible class def).
Add test coverage for:
- basic roots list.
- basic files list.
- Live updates to files list.
- basic delete operations.

Bug: 24988170
Change-Id: I2ec01a5e1a474314cb33efb6e92df0f61dfcc1da
NOTE: This is currently broken at the point I try to init files in the stub roots.
 2015-11-03 13:18:00 -08:00
Adam Lesinski
570b6bde76 Merge "AAPT2: Add Manifest fixing/validation" 2015-11-03 21:02:36 +00:00
Adam Lesinski
588396044e Merge "AAPT2: Add support for comments in R.java" 2015-11-03 21:01:41 +00:00
Glenn Kasten
ca2daddfea Merge commit 'd8a8500429' into new 
Change-Id: I13e6c1d3a63e298ddebcc83a229fa497dd5eb129
 2015-11-03 12:59:07 -08:00
Dianne Hackborn
24937d235d resolve merge conflicts of 3aee38c86e to master. 
Change-Id: I9ff3f92b37e24f5f0527a0034b159920f6d7ffe1
 2015-11-03 12:47:12 -08:00
John Reck
4d5bb87190 Merge "Revert "Check GLES2 support using EGL instead of qemu.gles"" 2015-11-03 20:40:42 +00:00
John Reck
069fb3a03a Revert "Check GLES2 support using EGL instead of qemu.gles" 
This reverts commit 0f897d2fea84c1632377b84f6241d54a8d85f7a3.

Change-Id: Iaf5b22b6b1a5bdb16dd0aaf674d90c09d1bc24a7
 2015-11-03 20:39:51 +00:00
Alan Viverette
4d47d2595e If LayerDrawable child doesn't have constant state, use shallow copy 
Avoid NPE if mutate() is called on a LayerDrawable with a child that
doesn't support constant state.

Bug: 25438651
Change-Id: I6bf5a90484fda44a7b5fd10ce7b798eaa799b68e
 2015-11-03 15:39:15 -05:00
Fyodor Kupolov
92fe44e966 Merge "UserController refactoring" 2015-11-03 20:23:24 +00:00
Fyodor Kupolov
598ee3f6c2 Merge "Introduced short-term lock for UMS internal state" 2015-11-03 20:06:25 +00:00
Ben Kwa
68dfdb6525 Merge "Fix focus issues on animated items." 2015-11-03 20:00:40 +00:00
Ben Kwa
e48e4ca564 Fix focus issues on animated items. 
Implement a custom ItemAnimator to enable focus to persist across change
animations in the DirectoryFragment's RecyclerView.

Note that this is a temporary stop-gap - a better fix would be to have
the RecyclerView restore focus to the appropriate item after a change
animation.

BUG=24802917

Change-Id: I4e4e6f758a2ea87e6235533860863c822d71a27a
 2015-11-03 11:59:24 -08:00
Fyodor Kupolov
8240275381 Introduced short-term lock for UMS internal state 
Added mUsersLock - short-term lock for internal state, when interaction and
synchronization with PM is not required. Modifications to mUsers and
mRemovingUserIds must be guarded by 3 locks: mInstallLock, mPackagesLock and
mUsersLock. While reads can use mUsersLock.

Testing revealed that the following methods in UMS often cause contention:
- exists
- getUserInfo
- getProfileParent

They all now use a short-term lock mUsersLock for reads.

Bug: 24979571
Change-Id: Ie3a22ea7cbb450c7969800fe2a4a2b2516165e5b
 2015-11-03 11:56:33 -08:00
Tenghui Zhu
0cda530e0e Merge "Use clang for libhwui" into mnc-dr-dev am: 61c93eb16d am: a66dc6e159 
am: a32f221db0

* commit 'a32f221db0361c9047fd61373fbf815c37d958f8':
  Use clang for libhwui
 2015-11-03 19:55:52 +00:00
Jeff Sharkey
f695d3ae82 Merge "Yell if NDC callers are holding bad locks." 2015-11-03 19:50:54 +00:00
Tenghui Zhu
a32f221db0 Merge "Use clang for libhwui" into mnc-dr-dev am: 61c93eb16d 
am: a66dc6e159

* commit 'a66dc6e159bd8f4997a9253d5590807c02358d84':
  Use clang for libhwui
 2015-11-03 19:49:20 +00:00
Ching Tzung Lin
7078a44687 Merge "Remove circular_display_mask_offset symbol and default" into cw-e-dev am: 7f54aa1e81 
am: 9c7f6a409b

* commit '9c7f6a409b516328378aa9b882de16c4700c76c4':
  Remove circular_display_mask_offset symbol and default
 2015-11-03 19:43:02 +00:00
Dianne Hackborn
3aee38c86e Merge "Fix issue #25357209: Could not send SMS or MMS messages, had to reboot" into mnc-dr-dev am: 71e4984505 am: 9a13cc6992 
am: a09ac2d998

* commit 'a09ac2d998fdc901fb65b57a061cc445922e081f':
  Fix issue #25357209: Could not send SMS or MMS messages, had to reboot
 2015-11-03 19:40:43 +00:00