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

106258 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Romain Guy
ed96ea2a07 Merge "Add the ability to disable OpenGL drivers preloading Bug #8888857" 2013-05-09 18:28:10 +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
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
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
Scott Main
2a31741eec am 3032ae9b: am 214cb0d4: am a086a70e: am 3f4d1bbd: am 52a37bf8: am 1d21aeca: am 148ce232: Merge "delete obsolete tips/references to cupcake" into jb-mr1.1-docs 
* commit '3032ae9b4062080bafa854a121e7534069466b7c':
  delete obsolete tips/references to cupcake
 2013-05-08 15:04:51 -07:00
Fabrice Di Meglio
8be78240f3 am 6eb036e7: am 366b97ba: Merge "Fix bug #8839681 Reversed Textbox focus order on RTL and android:imeOptions="flagNoExtractUi"" into jb-mr2-dev 
* commit '6eb036e7894758bcc357fc282070aa8677227ce1':
  Fix bug #8839681 Reversed Textbox focus order on RTL and android:imeOptions="flagNoExtractUi"
 2013-05-08 15:04:33 -07:00
Fabrice Di Meglio
0ce3c46034 am 13f693d5: am d7bf6d46: Merge "Fix bug #8846648 Reduce unnecessary drawing & GC in NetworkController/SignalClusterView" into jb-mr2-dev 
* commit '13f693d5b2f75c76a2fe4351860310b1ded6ea12':
  Fix bug #8846648 Reduce unnecessary drawing & GC in NetworkController/SignalClusterView
 2013-05-08 15:04:31 -07:00
Fergus Henderson
e4085c9967 am 6c641d3c: am 3cf3a0b3: Merge "Fix for TTS.setLanguage throwing MissingResourceException" into jb-mr2-dev 
* commit '6c641d3c67bbd91033254debedff56893d6c53a1':
  Fix for TTS.setLanguage throwing MissingResourceException
 2013-05-08 15:04:22 -07:00
Baligh Uddin
4652a746a0 am 1b81da5f: (-s ours) am a698a290: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev 
* commit '1b81da5f955e60e028a8ce7e61eddc3d9ddff030':
  Import translations. DO NOT MERGE
 2013-05-08 15:04:20 -07:00
Victoria Lease
e6bca43e93 am b7373537: am acd341d8: Merge "OO NOT MERGE allow connected location providers location access" into jb-mr2-dev 
* commit 'b7373537ecc745306771bae61c03215e56723146':
  OO NOT MERGE allow connected location providers location access
 2013-05-08 15:04:10 -07:00
Jamie Gennis
8afcf4411e am 211eae98: am d28653df: Merge "Add the trace tag for Dalvik." into jb-mr2-dev 
* commit '211eae98fce88c7c502eb8f59d956c1a249d77bc':
  Add the trace tag for Dalvik.
 2013-05-08 15:03:58 -07:00
Alan Viverette
5e6fbf2694 am fa4c935e: am 239a0c0e: Ensure ViewRootImpl.setAccessibilityFocus() doesn\'t crash when reentrant. 
* commit 'fa4c935edcfa09bb53a3aac411a285842a00ddee':
  Ensure ViewRootImpl.setAccessibilityFocus() doesn't crash when reentrant.
 2013-05-08 15:03:49 -07:00
Xavier Ducrohet
f4b94a7cb7 am 72cc297c: (-s ours) am 81a8bb1c: am 0974061e: (-s ours) am 1181564f: am 42fb3abd: DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be 
* commit '72cc297cf26cb37847533b07e8914b97083478a7':
  DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be
 2013-05-08 15:03:29 -07:00
Jeff Tinker
c8b1f82791 am 5adeaeab: am 02f7f449: Merge "Correct java API docs for MediaDrm offline use case" into jb-mr2-dev 
* commit '5adeaeabd62481b529ec5999df481d74033d67f9':
  Correct java API docs for MediaDrm offline use case
 2013-05-08 15:03:23 -07:00
Robert Greenwalt
60307f1ac0 am 27c8b559: am e2322bdd: Merge "Don\'t back up the scan-always setting." into jb-mr2-dev 
* commit '27c8b559b6feaa6ea5c44acc476a714487f1eafa':
  Don't back up the scan-always setting.
 2013-05-08 15:03:10 -07:00
Craig Mautner
cef2d56fc9 Merge "resolved conflicts for merge of a14a14ab to master" 2013-05-08 22:01:33 +00:00
Craig Mautner
79a64b621e resolved conflicts for merge of a14a14ab to master 
Change-Id: I80259a2887f36fc3af409322dea36aa90a2ee847
 2013-05-08 15:00:09 -07:00
Craig Mautner
ecda882c13 Merge "Eliminate flash when going from home to recents" 2013-05-08 21:51:23 +00:00
Svetoslav
5055e35dfe am 0dd85e4e: Merge "Dynamically togglable accessibility features improperly handled." into jb-mr2-dev 
* commit '0dd85e4e99466709049ba913241612b6678732ca':
  Dynamically togglable accessibility features improperly handled.
 2013-05-08 14:37:03 -07:00
Svetoslav
0dd85e4e99 Merge "Dynamically togglable accessibility features improperly handled." into jb-mr2-dev 2013-05-08 21:33:43 +00:00
Yorke Lee
3672624cdc am 35b7b0b8: Merge "Add system setting key for dialpad autocomplete" into jb-mr2-dev 
* commit '35b7b0b80000774b503f7d06bf3685836f22608f':
  Add system setting key for dialpad autocomplete
 2013-05-08 14:33:31 -07:00