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

221087 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Adam Lesinski
b23f1e077b AAPT2: Verify positional Java String format arguments in strings 
Change-Id: Id415969035a0d5712857c0e11e140155566a960c
 2015-11-03 12:58:12 -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
Tenghui Zhu
a66dc6e159 Merge "Use clang for libhwui" into mnc-dr-dev 
am: 61c93eb16d

* commit '61c93eb16d91bd210948af6e812517e3c03535b4':
  Use clang for libhwui
 2015-11-03 19:40:29 +00:00
Fyodor Kupolov
f63b89c0a1 UserController refactoring 
Addressed comments from the previous cl. Added getters for UserController
fields, direct access is no longer allowed. Moved the following methods:
 - getUserManagerLocked. Became getUserManager() - because locking is not
   necessary, double checked locking will suffice.
 - startUserInForeground /showUserSwitchDialog/sendUserSwitchBroadcastsLocked
 - handleIncomingUser/unsafeConvertIncomingUserLocked/isUserRunningLocked/
   getUsers/getProfileIds

Bug: 24745840
Change-Id: Id5a5cfb9604e08add29bd9a03c8fe5200bc51fef
 2015-11-03 11:34:47 -08:00
Tenghui Zhu
61c93eb16d Merge "Use clang for libhwui" into mnc-dr-dev 2015-11-03 19:25:43 +00:00
Ching Tzung Lin
9c7f6a409b Merge "Remove circular_display_mask_offset symbol and default" into cw-e-dev 
am: 7f54aa1e81

* commit '7f54aa1e814527371d54864bcbf9387553822ea7':
  Remove circular_display_mask_offset symbol and default
 2015-11-03 19:03:48 +00:00
Jeff Sharkey
e41dc59657 Yell if NDC callers are holding bad locks. 
The current MountService design heavily depends on down-callers not
holding any locks, since the vast majority of events are unsolicited
and bubble up to the framework.

This simple API gives us an easy way to track down people calling
while holding a lock they shouldn't be.

Bug: 25443096
Change-Id: Ifcbda95f00d5be8c1b88d58ca67927e76c713c3e
 2015-11-03 10:39:45 -08:00
Ching Tzung Lin
7f54aa1e81 Merge "Remove circular_display_mask_offset symbol and default" into cw-e-dev 2015-11-03 18:39:40 +00:00
Chad Brubaker
9f591aeb8b Merge "Add stub isSameTrustConfiguration API" 2015-11-03 18:38:37 +00:00
Chris Craik
d354fd2c66 Use clang for libhwui 
bug:25417885

Change-Id: I0ef8034d79ba3682925e3c2a4b7ccd833fd4f156
 2015-11-03 10:34:28 -08:00
Dianne Hackborn
a09ac2d998 Merge "Fix issue #25357209: Could not send SMS or MMS messages, had to reboot" into mnc-dr-dev am: 71e4984505 
am: 9a13cc6992

* commit '9a13cc69926c90fe75b624a9a781dc56706a6091':
  Fix issue #25357209: Could not send SMS or MMS messages, had to reboot
 2015-11-03 18:33:57 +00:00
Dianne Hackborn
9a13cc6992 Merge "Fix issue #25357209: Could not send SMS or MMS messages, had to reboot" into mnc-dr-dev 
am: 71e4984505

* commit '71e49845054a3a7dacc51efc4fe658818caec048':
  Fix issue #25357209: Could not send SMS or MMS messages, had to reboot
 2015-11-03 18:27:18 +00:00
Dianne Hackborn
71e4984505 Merge "Fix issue #25357209: Could not send SMS or MMS messages, had to reboot" into mnc-dr-dev 2015-11-03 18:21:23 +00:00
Jeff Sharkey
fcd3828f2e Merge "Fix deadlock when calling down to vold." 2015-11-03 18:19:24 +00:00
John Reck
b4e228918e Merge "Remove almost-all android::Singleton users" 2015-11-03 18:19:15 +00:00
Jeff Sharkey
5a9bb74574 Fix deadlock when calling down to vold. 
Gotta put down the lock before you can play the saxophone.

Bug: 25443096
Change-Id: I008c3a8530a2181aad20985e157c6f63208444ee
 2015-11-03 10:15:57 -08:00
John Reck
6b50780363 Remove almost-all android::Singleton users 
Bug: 25426213
Change-Id: I88e6206e8915cce95c3a8a8a82a4bb8fbf668141
 2015-11-03 10:09:59 -08:00
Felipe Leme
71b5d29971 Merge "Added serial number in the bugreport message body." 2015-11-03 18:02:48 +00:00
Gustav Sennton
8966460103 Merge "Load WebView from one out of a list of packages, reland." 2015-11-03 17:50:07 +00:00
Riley Andrews
8cee7c1711 Limit persistent ashmem backed fds to a minimum of 128kB. 
Bug 25256717

Change-Id: Ieb356006df0a6545b89de44d3d8fd4b46312b3b8
Signed-off-by: Riley Andrews <riandrews@google.com>
 2015-11-03 17:46:15 +00:00
Chris Craik
3ebc155c40 Merge "Add unit test failure messages to recordingcanvas/reorderer" 2015-11-03 17:26:34 +00:00
Nicolas Capens
3d9153b00d Merge "Check GLES2 support using EGL instead of qemu.gles" 2015-11-03 17:23:19 +00:00
Felipe Leme
a89c6e421e Added serial number in the bugreport message body. 
Also labeled information contained in the body (i.e., Build Info: and Serial Number:).

BUG: 21454488

Change-Id: I5f2a62147ca3e1989aebfbd465f3e42b96b655df
 2015-11-03 09:21:39 -08:00
Winson Chung
e6e6c996bc Merge "Adding recents experiment override." 2015-11-03 16:45:07 +00:00
Abodunrinwa Toki
a295ef2f33 Merge "Fix failing TextActivityTest." 2015-11-03 16:06:38 +00:00
Wale Ogunwale
d89b76a58d Merge "[ActivityManager] Fix NullPointerException in startNextMatchingActivity." 
am: 7810aed854

* commit '7810aed85408bddc4cc0c65e5be8d082c638d995':
  [ActivityManager] Fix NullPointerException in startNextMatchingActivity.
 2015-11-03 15:13:24 +00:00
Wale Ogunwale
7810aed854 Merge "[ActivityManager] Fix NullPointerException in startNextMatchingActivity." 2015-11-03 15:09:32 +00:00
Abodunrinwa Toki
e36c7112e7 Fix failing TextActivityTest. 
It seems like setOrientation(...) is not working.
Instead, fix the orientation of TextViewActivity to portrait.
See: I2f9372997f8301d800109981c6e1a6d4419b641d
Bug: 24495166

Change-Id: I0c5480b7ce6ba1fb8e4e4e3daabe94ebccca4dfd
 2015-11-03 14:08:03 +00:00
Thierry Strudel
45c001db40 Merge "NetworkTimeUpdateService: Grab a wakelock when manipulating system time" into mnc-dr-dev am: 1942be506e am: b1fe11fde4 am: 6efac0595f 
am: 271dd1da81

* commit '271dd1da81735a3cb0856db0dbb8634a6c4cc831':
  NetworkTimeUpdateService: Grab a wakelock when manipulating system time
 2015-11-03 06:57:24 +00:00
Thierry Strudel
271dd1da81 Merge "NetworkTimeUpdateService: Grab a wakelock when manipulating system time" into mnc-dr-dev am: 1942be506e am: b1fe11fde4 
am: 6efac0595f

* commit '6efac0595f4da7f8009aa5da26a5ca024bbb0e4f':
  NetworkTimeUpdateService: Grab a wakelock when manipulating system time
 2015-11-03 06:51:38 +00:00
Thierry Strudel
6efac0595f Merge "NetworkTimeUpdateService: Grab a wakelock when manipulating system time" into mnc-dr-dev am: 1942be506e 
am: b1fe11fde4

* commit 'b1fe11fde44b4ac56c48f91cd27ced7ac4b0469f':
  NetworkTimeUpdateService: Grab a wakelock when manipulating system time
 2015-11-03 06:45:12 +00:00
Brian Carlstrom
faa09f531f Fix layoutlib-tests build by adding dummy implementation of IWindowSession.repositionChild to BridgeWindowSession 
Change-Id: I9c3a609c76716b35595b82a33f32883d4f46c517
 2015-11-02 22:41:45 -08:00
Thierry Strudel
b1fe11fde4 Merge "NetworkTimeUpdateService: Grab a wakelock when manipulating system time" into mnc-dr-dev 
am: 1942be506e

* commit '1942be506eb16589e3059fa62ea7b718440fb386':
  NetworkTimeUpdateService: Grab a wakelock when manipulating system time
 2015-11-03 06:39:58 +00:00
Thierry Strudel
1942be506e Merge "NetworkTimeUpdateService: Grab a wakelock when manipulating system time" into mnc-dr-dev 2015-11-03 06:35:59 +00:00