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

106278 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Dianne Hackborn
b14e42f121 Merge "Cleanup some of the thread merging." 2013-05-09 22:30:30 +00: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
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
Dianne Hackborn
cb35969708 Merge "DO NOT MERGE. Fix issue #8868003: Recents thumbnails scale..." into jb-mr2-dev 2013-05-09 17:19:57 +00:00
John Spurlock
68fcaa2c0b Merge "Navigation hideybar via new system ui opt-in flag." 2013-05-09 13:39:24 +00:00
Derek Sollenberger
07da9df62b am e3326143: am 2c76016c: Merge "Fix error where clips/matrices are incorrectly transferred." into jb-mr2-dev 
* commit 'e3326143c63e791863c1fd95599fb9db74fb4eed':
  Fix error where clips/matrices are incorrectly transferred.
 2013-05-09 05:05:47 -07:00
Derek Sollenberger
e3326143c6 am 2c76016c: Merge "Fix error where clips/matrices are incorrectly transferred." into jb-mr2-dev 
* commit '2c76016cbc1e426ab30d322745dfb6d4e6784138':
  Fix error where clips/matrices are incorrectly transferred.
 2013-05-09 05:02:52 -07:00
Derek Sollenberger
2c76016cbc Merge "Fix error where clips/matrices are incorrectly transferred." into jb-mr2-dev 2013-05-09 11:59:48 +00:00
Guang Zhu
6eee6ebc68 Revert "The default home intent needs CATEGORY_DEFAULT" 
This reverts commit 1fea6b374f612ca8cedc17de873526f0f7c42a4e.

Bug: 8878319
 2013-05-08 22:19:52 -07:00
Matthew Xie
32ab77b4c5 Donot bind to GATT service when BLE is not supported 
bug 8664724

Change-Id: I9b9222cd5877babcded73798a5d1ff13fd10e791
 2013-05-08 19:26:57 -07:00
Romain Guy
dad7bd706a Merge "Load OpenGL drivers libraries in Zygote" 2013-05-09 01:29:12 +00:00
Romain Guy
74c691221b Load OpenGL drivers libraries in Zygote 
This does not initialize EGL/GL.

Change-Id: I951ae0b7defee86eb06821ea807af3e829f4a73c
 2013-05-08 18:14:37 -07:00
Dianne Hackborn
bee1fb9363 DO NOT MERGE. Fix issue #8868003: Recents thumbnails scale... 
...+ zoom to wrong place

We need to make sure the overscan insets are never negative.

Change-Id: I6ca82acc2a6c887085a5d14d03a55ea78451e4b6
 2013-05-08 18:05:58 -07:00
Daniel Sandler
fa98345745 am 617055d7: am 5d6dc425: Merge "Filter out dangerous CharSequences in Notification." into jb-mr2-dev 
* commit '617055d7a9e2c30d1a99bf7e596f8d9e32fab723':
  Filter out dangerous CharSequences in Notification.
 2013-05-08 17:32:50 -07:00
Daniel Sandler
617055d7a9 am 5d6dc425: Merge "Filter out dangerous CharSequences in Notification." into jb-mr2-dev 
* commit '5d6dc425287e5651e3a1fdc32591b8791dd9dd18':
  Filter out dangerous CharSequences in Notification.
 2013-05-08 17:30:43 -07:00
Daniel Sandler
5d6dc42528 Merge "Filter out dangerous CharSequences in Notification." into jb-mr2-dev 2013-05-09 00:28:11 +00:00
Christopher Tate
9809e0d2d7 am 6312a196: am cfb09fac: Merge "The default home intent needs CATEGORY_DEFAULT" into jb-mr2-dev 
* commit '6312a1968c5e16e193b5b6d3c2f4b92b2de9311d':
  The default home intent needs CATEGORY_DEFAULT
 2013-05-08 16:15:30 -07:00
Christopher Tate
6312a1968c am cfb09fac: Merge "The default home intent needs CATEGORY_DEFAULT" into jb-mr2-dev 
* commit 'cfb09fac73716291468b61f20ee1b7818d1dcfd1':
  The default home intent needs CATEGORY_DEFAULT
 2013-05-08 16:13:20 -07:00
Christopher Tate
cfb09fac73 Merge "The default home intent needs CATEGORY_DEFAULT" into jb-mr2-dev 2013-05-08 23:09:49 +00:00
Stephen Hines
6fd5e7ce41 Merge "Switch Fountain(Fbo) to use RSSurfaceView instead of RSTextureView." 2013-05-08 22:52:01 +00:00
Dmitry Shmidt
dbdcaa766f Merge "Enable Opportunistic Key Caching on WPA2-Enterprise Networks" 2013-05-08 22:26:15 +00:00
Xia Wang
130ea5fc12 am 3cbe3b27: am 4550dba5: Merge "Add wifi association test" into jb-mr2-dev 
* commit '3cbe3b271c164c81676b0da1a303d5e5d396037c':
  Add wifi association test
 2013-05-08 15:23:09 -07:00
Xia Wang
3cbe3b271c am 4550dba5: Merge "Add wifi association test" into jb-mr2-dev 
* commit '4550dba53d49a689de6000e5e5864c28f91dd945':
  Add wifi association test
 2013-05-08 15:21:12 -07:00
Xia Wang
4550dba53d Merge "Add wifi association test" into jb-mr2-dev 2013-05-08 22:17:35 +00:00
Svetoslav
4190a634f0 am 5055e35d: am 0dd85e4e: Merge "Dynamically togglable accessibility features improperly handled." into jb-mr2-dev 
* commit '5055e35dfed39a87999664a7662ddcaaadcfa342':
  Dynamically togglable accessibility features improperly handled.
 2013-05-08 15:05:31 -07:00
Yorke Lee
8b70a2166b am 3672624c: am 35b7b0b8: Merge "Add system setting key for dialpad autocomplete" into jb-mr2-dev 
* commit '3672624cdc8849f7b4944cff501bddb9a14bbdc0':
  Add system setting key for dialpad autocomplete
 2013-05-08 15:05:25 -07:00
Michael Jurka
82f92ee5bd am 7741b63c: am 6dee0a0f: Merge "Fix bug where thumbnails flashed more often in Recents" into jb-mr2-dev 
* commit '7741b63c5a8e14b5123c4b735dc768cf55fa2ed5':
  Fix bug where thumbnails flashed more often in Recents
 2013-05-08 15:05:18 -07:00