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

106356 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
980c49d307 Merge "resolved conflicts for merge of 069d7e9b to master" 2013-05-10 00:08:25 +00:00
Amith Yamasani
ecd5afe1ef resolved conflicts for merge of 069d7e9b to master 
Change-Id: Ia8fd5de3d4cc275fd358132bcb2c198d1e7b6877
 2013-05-09 17:07:08 -07:00
Jim Miller
0055383554 Merge "Attempt to fix NPE in keyguard" into jb-mr2-dev 2013-05-10 00:03:56 +00:00
Chris Craik
d4b43b3cf3 Fix off by one error in log tracking 
bug:8875715

Additionally moves op logging before the op is executed, to print
correctly, in pre-order traversal

Change-Id: I4e9566261f8363c73739d183e6d82b854f72ffad
 2013-05-09 17:00:46 -07:00
Mathias Agopian
1519882f52 Merge "surfaceflinger is now always running in its own process" 2013-05-09 23:58:42 +00:00
Dianne Hackborn
83d6df27d4 Merge "Help on issue #8863955: Google Services keeping phone awake..." into jb-mr2-dev 2013-05-09 23:47:22 +00:00
Scott Main
4e3773d3f6 Merge "update homepage with IO Live banner" into jb-mr1.1-docs 2013-05-09 23:30:09 +00:00
Chet Haase
2d4edcf2e1 am a9d5adea: am fb32c824: Merge "Fix start delay jank in ViewPropertyAnimator" into jb-mr2-dev 
* commit 'a9d5adea9e9676d19b7a50ce3d6c673c16ee7a6d':
  Fix start delay jank in ViewPropertyAnimator
 2013-05-09 16:28:33 -07:00
Matthew Xie
b50619cc14 am c0c7cebe: am b566c466: Merge "Donot bind to GATT service when BLE is not supported" into jb-mr2-dev 
* commit 'c0c7cebe3f5da99aeb48eb62bffbaf3183814194':
  Donot bind to GATT service when BLE is not supported
 2013-05-09 16:28:30 -07:00
Jeff Brown
da58f92bfa am b2f6842d: Merge "Add an API to allow a callback to request active scans." into jb-mr2-dev 
* commit 'b2f6842d5528345e02a91218fbe58c3e0ca8bafb':
  Add an API to allow a callback to request active scans.
 2013-05-09 16:23:43 -07:00
Jeff Brown
507a3c77d5 am 2298d68e: Merge "Fix bug managing wifi display routes." into jb-mr2-dev 
* commit '2298d68e72afa9cf311af394b61f92f75385bbbf':
  Fix bug managing wifi display routes.
 2013-05-09 16:23:40 -07:00
Jim Miller
982d21b9dc Attempt to fix NPE in keyguard 
This attempts to fix a bug where it looks like we have null content in
one of the widget pages in keyguard.

Based on the bug description, it's likely the transport control was just
removed from the view hierarchy.  Not sure how the content can be null
in this case, but this will hopefully prevent the crash and give us some
insight into what caused it.

Fixes bug 8886916

Change-Id: I22c26c49f22fa5b06987e8199070a9aaead2ff8a
 2013-05-09 16:23:34 -07:00
Amith Yamasani
069d7e9b81 am 153919ed: Merge "Cache the scaled avatar drawables in the keyguard user switcher" into jb-mr2-dev 
* commit '153919ed2f128fb5d1b55782ea89fadcc20fc841':
  Cache the scaled avatar drawables in the keyguard user switcher
 2013-05-09 16:23:31 -07:00
Chet Haase
a9d5adea9e am fb32c824: Merge "Fix start delay jank in ViewPropertyAnimator" into jb-mr2-dev 
* commit 'fb32c82412111983236f44cbc8fd90f113d7ea34':
  Fix start delay jank in ViewPropertyAnimator
 2013-05-09 16:23:29 -07:00
Matthew Xie
c0c7cebe3f am b566c466: Merge "Donot bind to GATT service when BLE is not supported" into jb-mr2-dev 
* commit 'b566c466c73d351d01e64d1c9ba609133efc4ffd':
  Donot bind to GATT service when BLE is not supported
 2013-05-09 16:23:26 -07:00
Jeff Brown
b2f6842d55 Merge "Add an API to allow a callback to request active scans." into jb-mr2-dev 2013-05-09 23:04:26 +00:00
Jeff Brown
2298d68e72 Merge "Fix bug managing wifi display routes." into jb-mr2-dev 2013-05-09 23:03:58 +00:00
Marco Nelissen
13bfebd6b7 Add VideoView.getAudioSessionId() 
This lets apps get the audio session id of the video being played, so
they can apply effects to the audio track.
b/8767565

Change-Id: Iaa39d97d0b6fb528ed04b52d579afa58444ebcfe
 2013-05-09 15:50:38 -07:00
Dianne Hackborn
b14e42f121 Merge "Cleanup some of the thread merging." 2013-05-09 22:30:30 +00:00
Dianne Hackborn
af17baa271 Help on issue #8863955: Google Services keeping phone awake... 
...because of Google Play Services

Raise the limit on the number of wake locks we track per uid.

Get rid of the separate limit for the system process, since it
now isn't any larger than the new limit for regular processes.

Change-Id: Ic10c81cad7d4ad4aabf1f53f78191a0973a1d784
 2013-05-09 15:27:47 -07:00
Amith Yamasani
153919ed2f Merge "Cache the scaled avatar drawables in the keyguard user switcher" into jb-mr2-dev 2013-05-09 22:17:51 +00:00
Chet Haase
fb32c82412 Merge "Fix start delay jank in ViewPropertyAnimator" into jb-mr2-dev 2013-05-09 22:09:18 +00:00
Mathias Agopian
4bdc882800 surfaceflinger is now always running in its own process 
Change-Id: I4e04e1aa181b3ebe661354edd0b8dbbfd7a623a6
 2013-05-09 14:57:05 -07:00
Amith Yamasani
6fc1d4e8e6 Cache the scaled avatar drawables in the keyguard user switcher 
Loading the avatar icons and drawing them into the sized bitmap
turns out to be quite expensive and the cost increases with number
of users. Caching them shaves off several hundred milliseconds from
Keyguard inflation time during user switching on the lockscreen.

For instance, 15ms vs. 750ms with 3 avatars on a certain 7" tablet.

Bug: 7986933
Change-Id: I3e2065bfa25aa263133ba204ca364c3b04d7c0ff
 2013-05-09 14:44:38 -07:00
Jeff Brown
66f3b39ec4 Add an API to allow a callback to request active scans. 
This API is needed by the support library media router to ensure
that wifi display routes can be discovered while the route
chooser dialog is open.

Bug: 8175766
Change-Id: I3773773d93384aa4a3c009e71a5444ee8ce37caf
 2013-05-09 14:44:08 -07:00
Chet Haase
dcfbd6a2c9 Fix start delay jank in ViewPropertyAnimator 
Issue #8892620 start delay jank in ViewPropertyAnimator

Change-Id: I17a57ac3351fb2c1516b594d135aa9ce9f78c88e
 2013-05-09 14:40:21 -07:00
Daniel Sandler
203a91a6ca am abd37bcf: am ffe3b5b8: Merge "Exempt the notification panel from animation lockout." into jb-mr2-dev 
* commit 'abd37bcfac84ff85dbcd719d27b014a6eb01d5e0':
  Exempt the notification panel from animation lockout.
 2013-05-09 14:19:48 -07:00
Derek Sollenberger
0c8c0add4e am c195ef73: am bee78812: Merge "Fix bug where we incorrectly clipped the bounds to the device size." into jb-mr2-dev 
* commit 'c195ef73445c3ba605355798b9f1f9a78bc52f11':
  Fix bug where we incorrectly clipped the bounds to the device size.
 2013-05-09 14:19:45 -07:00
Matthew Xie
b566c466c7 Merge "Donot bind to GATT service when BLE is not supported" into jb-mr2-dev 2013-05-09 21:14:47 +00:00
Raph Levien
8987f06f9c resolved conflicts for merge of 7e433f10 to master 
Change-Id: Ifa3a144c791c0143c62f4aa23a5db57a93c32a17
 2013-05-09 14:08:14 -07:00
Jeff Brown
77e59fef24 Fix bug managing wifi display routes. 
We could sometimes crash due to some inconsistencies in the
way the wifi display routes were updates when connecting,
disconnecting or scanning wifi displays.

Bug: 8837094
Change-Id: I10c7ccb163ec33c4ea107dfcb5074741049fe955
 2013-05-09 13:42:57 -07:00
John Spurlock
31761ed227 Merge "Handle missing status/nav bar case inside hideybar check." 2013-05-09 20:24:49 +00:00
John Spurlock
e3b642ea4d Handle missing status/nav bar case inside hideybar check. 
Don't assume mNavigationBar != null.

Bug: 8890313
Change-Id: If2745b32a8502df629199edbf5493fe8d197a7d3
 2013-05-09 16:20:36 -04:00
Amith Yamasani
7e028153da am fb37bb67: am 73094fbc: Merge "Don\'t allow non-authorized apps to access auth tokens" into jb-mr2-dev 
* commit 'fb37bb67ec8ec2180e7afb51e748a7f56cabae23':
  Don't allow non-authorized apps to access auth tokens
 2013-05-09 12:39:18 -07:00
Daniel Sandler
b68de582fc am 06c31ff4: am 60ac308e: Merge "Defend against a system server crash." into jb-mr2-dev 
* commit '06c31ff4cd949dc5444569257123a05642475d34':
  Defend against a system server crash.
 2013-05-09 12:39:12 -07:00
Dianne Hackborn
bd8a17abad am 4d2ee536: (-s ours) am cb359697: Merge "DO NOT MERGE. Fix issue #8868003: Recents thumbnails scale..." into jb-mr2-dev 
* commit '4d2ee536aeb3f667614e3d683c44f869b973ab42':
  DO NOT MERGE.  Fix issue #8868003: Recents thumbnails scale...
 2013-05-09 12:39:07 -07:00
Daniel Sandler
abd37bcfac am ffe3b5b8: Merge "Exempt the notification panel from animation lockout." into jb-mr2-dev 
* commit 'ffe3b5b89fa58f7b12a2fc690c89480fc16a9fd6':
  Exempt the notification panel from animation lockout.
 2013-05-09 11:30:58 -07:00
Daniel Sandler
ffe3b5b89f Merge "Exempt the notification panel from animation lockout." into jb-mr2-dev 2013-05-09 18:28:42 +00:00
Romain Guy
ed96ea2a07 Merge "Add the ability to disable OpenGL drivers preloading Bug #8888857" 2013-05-09 18:28:10 +00:00
Derek Sollenberger
c195ef7344 am bee78812: Merge "Fix bug where we incorrectly clipped the bounds to the device size." into jb-mr2-dev 
* commit 'bee78812d0b3fc3d877ed0d954a0bb21ab7f2f3b':
  Fix bug where we incorrectly clipped the bounds to the device size.
 2013-05-09 11:26:29 -07:00
Derek Sollenberger
bee78812d0 Merge "Fix bug where we incorrectly clipped the bounds to the device size." into jb-mr2-dev 2013-05-09 18:23:57 +00:00
Romain Guy
c5e3638c06 Add the ability to disable OpenGL drivers preloading 
Bug #8888857

Set ro.zygote.disable_gl_preload to true in the build properties.

Change-Id: Idd93ebb4bbd2861ce60af03ed14819a5cfa70dec
 2013-05-09 11:08:17 -07:00
Raph Levien
7e433f10a3 am dde8e539: Merge "Fix bug 8717690 Full-width Latin Letters Garbled on Tumblr App" into jb-mr2-dev 
* commit 'dde8e539c3d76c98360e4cd1151cb15cba78a6b0':
  Fix bug 8717690 Full-width Latin Letters Garbled on Tumblr App
 2013-05-09 11:07:33 -07:00
Raph Levien
dde8e539c3 Merge "Fix bug 8717690 Full-width Latin Letters Garbled on Tumblr App" into jb-mr2-dev 2013-05-09 18:04:39 +00:00
Derek Sollenberger
708144e828 Fix bug where we incorrectly clipped the bounds to the device size. 
This CL also updates the documenation to make it clear that the API
returns in local space, not clipped to the size of the bitmap/device.

bug: 8747526
Change-Id: I389844672ce955341863f9940c3b401ab00dc1dc
 2013-05-09 14:00:29 -04:00
Amith Yamasani
fb37bb67ec am 73094fbc: Merge "Don\'t allow non-authorized apps to access auth tokens" into jb-mr2-dev 
* commit '73094fbc23a4f6142f790f63b66ae5b553fb6e55':
  Don't allow non-authorized apps to access auth tokens
 2013-05-09 10:47:08 -07:00
Amith Yamasani
73094fbc23 Merge "Don't allow non-authorized apps to access auth tokens" into jb-mr2-dev 2013-05-09 17:43:16 +00:00
Daniel Sandler
06c31ff4cd am 60ac308e: Merge "Defend against a system server crash." into jb-mr2-dev 
* commit '60ac308e1da302716fd6c5d805c513221039bac2':
  Defend against a system server crash.
 2013-05-09 10:31:51 -07:00
Daniel Sandler
60ac308e1d Merge "Defend against a system server crash." into jb-mr2-dev 2013-05-09 17:29:05 +00:00
Dianne Hackborn
4d2ee536ae am cb359697: Merge "DO NOT MERGE. Fix issue #8868003: Recents thumbnails scale..." into jb-mr2-dev 
* commit 'cb35969708e88057bda7c54c7b3ac1d606ad95c5':
  DO NOT MERGE.  Fix issue #8868003: Recents thumbnails scale...
 2013-05-09 10:23:08 -07:00