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

96738 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Cohen
70a649ca51 am 20b9edd8: am 224daede: am 035352b4: Merge "Making sure keyguard and homescreen only display eligible widgets (issue 7550090)" into jb-mr1.1-dev 
* commit '20b9edd805777bf9e603d8008650c23b031dac79':
  Making sure keyguard and homescreen only display eligible widgets (issue 7550090)
 2012-11-29 14:32:41 -08:00
Robert Greenwalt
6bc32a73b9 am 81cf3abd: am 10659cb1: am 5a36e06a: Merge "Secure a handful of framework broadcasts" into jb-mr1.1-dev 
* commit '81cf3abdd52bdf212e742c88c53b00969f7cc34f':
  Secure a handful of framework broadcasts
 2012-11-29 14:32:37 -08:00
Irfan Sheriff
4d14f6bb81 am 61b00239: am 0cec3de3: am b4d5a9e7: Merge "WFD: Fallback to PIN mode if PBC is not supported" into jb-mr1.1-dev 
* commit '61b00239dda1d0c5e7c34e88ad9f56817543d0b8':
  WFD: Fallback to PIN mode if PBC is not supported
 2012-11-29 14:32:33 -08:00
Fabrice Di Meglio
b75fb5daf6 am 52c3833e: am 07581745: am 71175f72: Merge "Fix bug #7621927 Radio button/TextView drawable regression in 4.2" into jb-mr1.1-dev 
* commit '52c3833e20d0e78fcb367c1e81cd2c83f9165a0a':
  Fix bug #7621927 Radio button/TextView drawable regression in 4.2
 2012-11-29 14:32:30 -08:00
Dianne Hackborn
36893b16ce am 221d59f7: am afdd978c: am 68e0da7e: Merge "Quiet down a lot of logging." into jb-mr1.1-dev 
* commit '221d59f723584d316ea225bdaf1bc75cbfd7a794':
  Quiet down a lot of logging.
 2012-11-29 14:32:25 -08:00
Adam Cohen
20b9edd805 am 224daede: am 035352b4: Merge "Making sure keyguard and homescreen only display eligible widgets (issue 7550090)" into jb-mr1.1-dev 
* commit '224daede9e49f53ca5246aed66d152bfcc6d64e1':
  Making sure keyguard and homescreen only display eligible widgets (issue 7550090)
 2012-11-29 14:26:29 -08:00
Robert Greenwalt
81cf3abdd5 am 10659cb1: am 5a36e06a: Merge "Secure a handful of framework broadcasts" into jb-mr1.1-dev 
* commit '10659cb1be0059353f9e2ae64c7cfcc9ec312ba3':
  Secure a handful of framework broadcasts
 2012-11-29 14:26:20 -08:00
Irfan Sheriff
61b00239dd am 0cec3de3: am b4d5a9e7: Merge "WFD: Fallback to PIN mode if PBC is not supported" into jb-mr1.1-dev 
* commit '0cec3de3374a861497ff7eeada94865e85896971':
  WFD: Fallback to PIN mode if PBC is not supported
 2012-11-29 14:26:04 -08:00
Fabrice Di Meglio
52c3833e20 am 07581745: am 71175f72: Merge "Fix bug #7621927 Radio button/TextView drawable regression in 4.2" into jb-mr1.1-dev 
* commit '075817450c61902ecaaf4af2d96e8542123a86bd':
  Fix bug #7621927 Radio button/TextView drawable regression in 4.2
 2012-11-29 14:25:43 -08:00
Dianne Hackborn
221d59f723 am afdd978c: am 68e0da7e: Merge "Quiet down a lot of logging." into jb-mr1.1-dev 
* commit 'afdd978ccd8d45ac789873dd4cf0ab0dd3f46d20':
  Quiet down a lot of logging.
 2012-11-29 14:25:40 -08:00
Romain Guy
b8dca777ca Merge "Use LruCache instead of GenerationCache in libhwui" 2012-11-29 13:58:57 -08:00
Romain Guy
a4caee0115 Merge "Cleanup: remove unused property" 2012-11-29 13:15:22 -08:00
Romain Guy
215dcb1caa Merge "Fire view removed event *after* a View is removed" 2012-11-29 13:05:21 -08:00
Romain Guy
1741d73441 Cleanup: remove unused property 
Change-Id: I09b418ef8888c42a876cb9014b22231ec31ca7eb
 2012-11-29 13:05:16 -08:00
Romain Guy
8e0d7bcef1 Merge "Improve profiling by using Choreographer" 2012-11-29 13:04:18 -08:00
Scott Main
3882ce0c3b am 18eeb457: am d294d429: am ceafd15d: am 23cc5d99: Merge "docs: revisions to gps landing pages" into jb-mr1-dev 
* commit '18eeb4574e5a445405e476a4f89a44af02e24cc5':
  docs: revisions to gps landing pages
 2012-11-29 12:48:49 -08:00
Dirk Dougherty
68ce16af25 am bea4bb71: am a539807a: am 37f00afa: am f4d44618: Merge " Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc." into jb-mr1-dev 
* commit 'bea4bb716e71a63d78bf757fe88c46e2d2da7a56':
  Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc.
 2012-11-29 12:48:45 -08:00
Brian Colonna
d219cebfcb am eceef837: am ceb87a66: am 6f6facc1: Merge "Ignoring FUL unlock signal if user changed fixes b/7572354" into jb-mr1.1-dev 
* commit 'eceef837e34e6860ad532d15402435606550f3fa':
  Ignoring FUL unlock signal if user changed fixes b/7572354
 2012-11-29 12:48:41 -08:00
Zhihai Xu
55b82a8688 am aaa453db: am 2c7dac19: am e3f7c452: Merge "Settings shows it is connected to A2DP, though the device is not actually connected" into jb-mr1.1-dev 
* commit 'aaa453dbbdd9307ddc8fbd32e7f3c1e673e02b83':
  Settings shows it is connected to A2DP, though the device is not actually connected
 2012-11-29 12:48:36 -08:00
Scott Main
18eeb4574e am d294d429: am ceafd15d: am 23cc5d99: Merge "docs: revisions to gps landing pages" into jb-mr1-dev 
* commit 'd294d429f90ea7d442fa9cd0f0c71e9292a36016':
  docs: revisions to gps landing pages
 2012-11-29 12:45:30 -08:00
Dirk Dougherty
bea4bb716e am a539807a: am 37f00afa: am f4d44618: Merge " Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc." into jb-mr1-dev 
* commit 'a539807a7c50948eec99b27e2d4d05da208ae3f1':
  Doc change - cherry pick from dac-dev: Clean up stray image source files and adjust links etc.
 2012-11-29 12:45:26 -08:00
Brian Colonna
eceef837e3 am ceb87a66: am 6f6facc1: Merge "Ignoring FUL unlock signal if user changed fixes b/7572354" into jb-mr1.1-dev 
* commit 'ceb87a664fdcfa08f98238bfe41fc3a03603cbf8':
  Ignoring FUL unlock signal if user changed fixes b/7572354
 2012-11-29 12:45:18 -08:00
Zhihai Xu
aaa453dbbd am 2c7dac19: am e3f7c452: Merge "Settings shows it is connected to A2DP, though the device is not actually connected" into jb-mr1.1-dev 
* commit '2c7dac19dd2cab68587cd129b45ad593f7bfdc44':
  Settings shows it is connected to A2DP, though the device is not actually connected
 2012-11-29 12:45:09 -08:00
Romain Guy
059e12ccd2 Use LruCache instead of GenerationCache in libhwui 
Change-Id: Ic26ddc7151eb5462bcd243b21daf7187ed6d3bec
 2012-11-29 11:44:02 -08:00
Craig Mautner
8f0bdb5bb6 Merge "Extract AppTransition from WindowManager" 2012-11-29 11:43:49 -08:00
Romain Guy
d075031944 Improve profiling by using Choreographer 
This will avoid jank and lead to better measurements.

Change-Id: Id18587a0a0b7d45adb3a65dfc427800565cc5d0b
 2012-11-29 11:34:43 -08:00
Romain Guy
6fb05630cf Fire view removed event *after* a View is removed 
Change-Id: Ia4066002b19c438c90a57ef9c513d82564425640
 2012-11-29 10:50:33 -08:00
Elliott Hughes
7905db94ad am 878da653: am 9ed4abd8: Merge "Fix AndroidHttpClient documentation error." 
* commit '878da6532836ec09f6d27e8f5af79444c79e78b6':
  Fix AndroidHttpClient documentation error.
 2012-11-29 10:24:14 -08:00
Elliott Hughes
878da65328 am 9ed4abd8: Merge "Fix AndroidHttpClient documentation error." 
* commit '9ed4abd875852524c5dd366f30b5b7bda93f0da3':
  Fix AndroidHttpClient documentation error.
 2012-11-29 10:21:23 -08:00
Elliott Hughes
a0e1f91b98 am 565de5f6: am 820b3e29: Merge "Make transactGetSockaddr locale safe" 
* commit '565de5f6cb75631f6b23011fcac4fcf8be8d5c5e':
  Make transactGetSockaddr locale safe
 2012-11-29 09:49:40 -08:00
Elliott Hughes
9ed4abd875 Merge "Fix AndroidHttpClient documentation error." 2012-11-29 09:23:54 -08:00
Elliott Hughes
565de5f6cb am 820b3e29: Merge "Make transactGetSockaddr locale safe" 
* commit '820b3e29caab93de9535f18d98c6fd264c7fa983':
  Make transactGetSockaddr locale safe
 2012-11-29 09:14:35 -08:00
Elliott Hughes
820b3e29ca Merge "Make transactGetSockaddr locale safe" 2012-11-29 08:50:23 -08:00
Elliott Hughes
d2dcd7ada3 Fix AndroidHttpClient documentation error. 
AndroidHttpClient doesn't let the user add HttpRequestInterceptor classes.

Bug: http://code.google.com/p/android/issues/detail?id=37294
Change-Id: I66f6581fa321dc16ddfe35c8f4242bc31f79bdfa
 2012-11-29 08:32:13 -08:00
Adam Cohen
224daede9e am 035352b4: Merge "Making sure keyguard and homescreen only display eligible widgets (issue 7550090)" into jb-mr1.1-dev 
* commit '035352b4d62e259c86576dd3d1495b21bed172ff':
  Making sure keyguard and homescreen only display eligible widgets (issue 7550090)
 2012-11-28 18:18:32 -08:00
Adam Cohen
035352b4d6 Merge "Making sure keyguard and homescreen only display eligible widgets (issue 7550090)" into jb-mr1.1-dev 2012-11-28 17:47:22 -08:00
Robert Greenwalt
10659cb1be am 5a36e06a: Merge "Secure a handful of framework broadcasts" into jb-mr1.1-dev 
* commit '5a36e06ab2289073980b6147e13c8c03b94e5a80':
  Secure a handful of framework broadcasts
 2012-11-28 17:42:50 -08:00
Robert Greenwalt
5a36e06ab2 Merge "Secure a handful of framework broadcasts" into jb-mr1.1-dev 2012-11-28 17:40:02 -08:00
Alex Ray
3251d36313 Merge "core: Update Java wrappers for atrace." 2012-11-28 17:11:00 -08:00
Robert Greenwalt
47918ae3b4 Secure a handful of framework broadcasts 
At least one of these was getting spoofed in the wild.
We don't want to go too far this late in the game, but this is a good start.

bug:7622253
Change-Id: Id8ec2778b15fe001e6fd0d5a010181bb21c52ad8
 2012-11-28 16:42:32 -08:00
Adam Cohen
d9e5af3851 Making sure keyguard and homescreen only display eligible widgets (issue 7550090) 
Change-Id: I25acb7bde2e8e5ac3185a009f5c7151b81f0ae19
 2012-11-28 16:36:56 -08:00
Irfan Sheriff
0cec3de337 am b4d5a9e7: Merge "WFD: Fallback to PIN mode if PBC is not supported" into jb-mr1.1-dev 
* commit 'b4d5a9e73b51671e25b176310bd69f2d43a1167f':
  WFD: Fallback to PIN mode if PBC is not supported
 2012-11-28 16:30:53 -08:00
Irfan Sheriff
b4d5a9e73b Merge "WFD: Fallback to PIN mode if PBC is not supported" into jb-mr1.1-dev 2012-11-28 16:28:41 -08:00
Irfan Sheriff
6681be2787 WFD: Fallback to PIN mode if PBC is not supported 
Bug: 7627641
Change-Id: Ibba6114f907c67f1cb60c460d5b65479f2d1b148
 2012-11-28 15:54:06 -08:00
Fabrice Di Meglio
075817450c am 71175f72: Merge "Fix bug #7621927 Radio button/TextView drawable regression in 4.2" into jb-mr1.1-dev 
* commit '71175f727bc1e094e72a410aca62392badffbf11':
  Fix bug #7621927 Radio button/TextView drawable regression in 4.2
 2012-11-28 15:08:12 -08:00
Dianne Hackborn
afdd978ccd am 68e0da7e: Merge "Quiet down a lot of logging." into jb-mr1.1-dev 
* commit '68e0da7e397f6808a90509615c08c62bb00af6ba':
  Quiet down a lot of logging.
 2012-11-28 15:06:36 -08:00
Fabrice Di Meglio
71175f727b Merge "Fix bug #7621927 Radio button/TextView drawable regression in 4.2" into jb-mr1.1-dev 2012-11-28 15:05:55 -08:00
Chet Haase
288f20c603 am 51812754: am 25082e33: Merge "Another optimization of glyph cache uploads" 
* commit '518127549997fbf01fd3af59c4312e43f137e194':
  Another optimization of glyph cache uploads
 2012-11-28 15:05:03 -08:00
Dianne Hackborn
68e0da7e39 Merge "Quiet down a lot of logging." into jb-mr1.1-dev 2012-11-28 15:03:39 -08:00
Chet Haase
5181275499 am 25082e33: Merge "Another optimization of glyph cache uploads" 
* commit '25082e3326a3133607129b3e4cea983b113e9764':
  Another optimization of glyph cache uploads
 2012-11-28 15:02:09 -08:00