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

125905 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
dbd60a71b5 am 99689a68: am 9208bb4a: am 00efaea9: am dac29800: Merge "Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON" 
* commit '99689a6874c7c465ed97dba625d38e3f1599963f':
  Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON
 2014-03-20 02:40:14 +00:00
Chris Craik
99689a6874 am 9208bb4a: am 00efaea9: am dac29800: Merge "Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON" 
* commit '9208bb4a2b40e8269f601fa096ae9c88d6d1ce7a':
  Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON
 2014-03-20 02:35:47 +00:00
Chris Craik
9208bb4a2b am 00efaea9: am dac29800: Merge "Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON" 
* commit '00efaea980c7a9f84f326b22aef740cb5438d282':
  Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON
 2014-03-20 02:30:15 +00:00
Chris Craik
00efaea980 am dac29800: Merge "Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON" 
* commit 'dac298005ce3c1361e27bb740e4b518765d43d77':
  Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON
 2014-03-19 19:24:53 -07:00
Chris Craik
dac298005c Merge "Prevent Lockscreen album art from activating FLAG_KEEP_SCREEN_ON" 2014-03-20 02:19:54 +00:00
Nick Kralevich
244d18bfb3 am 857fe511: am 0b4f63c3: am dd6b7495: am 83725810: Merge "Get rid of noise during boot." 
* commit '857fe511fe7139a41ad3d587a73758be53340e90':
  Get rid of noise during boot.
 2014-03-20 02:03:01 +00:00
Nick Kralevich
857fe511fe am 0b4f63c3: am dd6b7495: am 83725810: Merge "Get rid of noise during boot." 
* commit '0b4f63c319f211ddd0d572b6b1eb647d0a6dc8a7':
  Get rid of noise during boot.
 2014-03-20 01:58:42 +00:00
Colin Cross
6ac8a20b8f am a78b389e: am 49fca697: am 0dccb02b: am 19fc55e1: Merge "build app_process64 on 64-bit targets" 
* commit 'a78b389e544894ccb9673e2e416c3a1b51260513':
  build app_process64 on 64-bit targets
 2014-03-20 01:55:52 +00:00
Nick Kralevich
0b4f63c319 am dd6b7495: am 83725810: Merge "Get rid of noise during boot." 
* commit 'dd6b7495577eca7a00aa37bfdca3449cf1443681':
  Get rid of noise during boot.
 2014-03-20 01:52:42 +00:00
Colin Cross
a78b389e54 am 49fca697: am 0dccb02b: am 19fc55e1: Merge "build app_process64 on 64-bit targets" 
* commit '49fca697470b8321a02bdd2a828e9beec1ef1182':
  build app_process64 on 64-bit targets
 2014-03-20 01:49:57 +00:00
Nick Kralevich
dd6b749557 am 83725810: Merge "Get rid of noise during boot." 
* commit '8372581089422364f4f8bc948b9cbdcf5f8c2e91':
  Get rid of noise during boot.
 2014-03-19 18:47:45 -07:00
Nick Kralevich
8372581089 Merge "Get rid of noise during boot." 2014-03-20 01:37:39 +00:00
Dianne Hackborn
0aa5163c13 Get rid of noise during boot. 
This log is not an error, it is a warning, don't spam a stack
crawl when it happens.

Change-Id: I6038e3625cc0c16af9e54887b5e7ec451d9f864d
 2014-03-19 18:34:52 -07:00
Colin Cross
49fca69747 am 0dccb02b: am 19fc55e1: Merge "build app_process64 on 64-bit targets" 
* commit '0dccb02b9fd714af1db91e4ba3ca0b0da4e563c1':
  build app_process64 on 64-bit targets
 2014-03-20 01:23:28 +00:00
Colin Cross
0dccb02b9f am 19fc55e1: Merge "build app_process64 on 64-bit targets" 
* commit '19fc55e1e3a51aba4db985d186d1f4ec075d7ca1':
  build app_process64 on 64-bit targets
 2014-03-19 18:19:25 -07:00
Michael Wright
046e0a7ba6 Merge "Use DisplayPowerRequest#wantLightSensorEnabled in ABC." 2014-03-20 01:15:39 +00:00
Colin Cross
19fc55e1e3 Merge "build app_process64 on 64-bit targets" 2014-03-20 01:14:43 +00:00
Fabrice Di Meglio
d0abcedece Merge "Introduce the SearchIndexablesProvider and its friends" 2014-03-20 01:12:06 +00:00
Colin Cross
2764fce3a1 build app_process64 on 64-bit targets 
On 64-bit platforms builds two copies of app_process, the 32-bit
app_process and 64-bit app_process64.

Change-Id: I59d739b5df398ad0bd040c954c57640ff7ab3e72
 2014-03-19 17:49:47 -07:00
Dianne Hackborn
024a003d4c Merge "batstats: fix wake lock tracking, service bug" 2014-03-20 00:43:37 +00:00
Colin Cross
5c3f7236e6 Merge "MediaHTTPConnection: use jlong to store native pointer" 2014-03-20 00:35:32 +00:00
Colin Cross
5e8ff02ec9 MediaHTTPConnection: use jlong to store native pointer 
Change-Id: Ic4f391a8e658498e63c26ea2af4c7413ed387360
 2014-03-19 17:28:42 -07:00
Igor Murashkin
7d9a8ffd08 camera: Fix setParameters for Preview FPS single/range values 
Bug: 12609188
Change-Id: I82ea6f5de2183dd046d4bf5683600c97f37ab4db
 2014-03-20 00:21:44 +00:00
Dianne Hackborn
40c8725804 batstats: fix wake lock tracking, service bug 
- Fix bug I introduced in handling wake lock changes where
  we weren't iterating over the new work sources correctly.
- Fix bug in ActiveServices that would wtf too much.
- Prepare to start tracking uptime in the battery history.

Change-Id: Ia94316be51bc6eab7b02f214a5c40c08e99cc3b1
 2014-03-19 17:13:43 -07:00
Wei Wang
b4b66d2f3a Merge "Move advetise clean up to callback code. fixes b/13289050" 2014-03-20 00:12:23 +00:00
Wei Wang
809476525f Move advetise clean up to callback code. fixes b/13289050 
Change-Id: Ibf3c772561125821817c947730cf21defafd4cb2
 2014-03-20 00:04:27 +00:00
John Reck
c5dc251e22 Merge "Move RenderNode to own file" 2014-03-19 23:47:14 +00:00
John Reck
113e0824d6 Move RenderNode to own file 
Change-Id: I9380d161fd3ddd7b569c262dd8e7aa0c96151b1e
 2014-03-19 16:40:04 -07:00
John Spurlock
87c28e27c5 Merge "Fix javadoc @links in Vibrator." 2014-03-19 23:30:51 +00:00
John Spurlock
a1bfe65daa Fix javadoc @links in Vibrator. 
Change-Id: I5143334735a1bcdf8252687e703c74656ff9d126
 2014-03-19 19:29:34 -04:00
Fabrice Di Meglio
b49995d4d9 Introduce the SearchIndexablesProvider and its friends 
- enable retrieval of search data to be indexed

Change-Id: I4a16408dec3d3305bf20107fb11eb2d1aee7fad5
 2014-03-19 15:44:01 -07:00
John Spurlock
2fcce9612d Fix broken tests to fix build 
Change-Id: I6bb9d178a9f1b09c1b247ec9cbdd57507295c4bf
 2014-03-19 18:42:31 -04:00
Craig Mautner
5b39f63c24 am 9957c322: am c60ac2b8: am 924927d3: am 1888333d: am d4375b47: Merge "Fix loop limits." into klp-dev 
* commit '9957c322db8864117d375e157bccaf6033b45646':
  Fix loop limits.
 2014-03-19 22:01:32 +00:00
John Spurlock
07cf4da1d0 Merge "Add stream-level suppression to vibrate/audio services." 2014-03-19 21:58:19 +00:00
Craig Mautner
9957c322db am c60ac2b8: am 924927d3: am 1888333d: am d4375b47: Merge "Fix loop limits." into klp-dev 
* commit 'c60ac2b825459165b7e708fc2049d04d6f5c3fb2':
  Fix loop limits.
 2014-03-19 21:56:21 +00:00
Craig Mautner
c60ac2b825 am 924927d3: am 1888333d: am d4375b47: Merge "Fix loop limits." into klp-dev 
* commit '924927d322b2aeb13cbd654b10807b9151a0822c':
  Fix loop limits.
 2014-03-19 21:51:51 +00:00
Chris Craik
8ee13de681 Merge "Update unsupported op tables for API 19, and for extensibility" 2014-03-19 21:46:17 +00:00
Craig Mautner
924927d322 am 1888333d: am d4375b47: Merge "Fix loop limits." into klp-dev 
* commit '1888333d7e814d6681a327cf1f3eda10098e3620':
  Fix loop limits.
 2014-03-19 21:46:00 +00:00
Craig Mautner
1888333d7e am d4375b47: Merge "Fix loop limits." into klp-dev 
* commit 'd4375b4713658c06001e9dba7105804c872fc199':
  Fix loop limits.
 2014-03-19 21:41:43 +00:00
Craig Mautner
d4375b4713 Merge "Fix loop limits." into klp-dev 2014-03-19 21:37:07 +00:00
Etan Cohen
4a6f087950 Merge "Catch Netd exceptions to avoid runtime restart" 2014-03-19 21:30:15 +00:00
Wei Wang
ffbea5c7da Merge "Add status callback for start/stop advertising. Fixes b/13289050, b/13418851, also fixes 13418671." 2014-03-19 21:29:59 +00:00
Robert Greenwalt
d9cb2f3d06 Catch Netd exceptions to avoid runtime restart 
bug:13475636
Change-Id: If36a0051a957fc066711fe8225f8981bc07add04
 2014-03-19 14:26:28 -07:00
Glenn Kasten
29427a224e am a0e300ef: am 458edc8d: am a3dc076d: am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger." 
* commit 'a0e300efae92d8155151e345034620054cff8955':
  mediaeditor shouldn't depend on audioflinger.
 2014-03-19 21:22:09 +00:00
Glenn Kasten
5341f881e0 am 4f346bf0: am ff1e1d99: am 240d5638: am c1f3d4c1: Merge "Fix 64 bit compile failures in renderscript" 
* commit '4f346bf0ffe1c596ca261dfec23c50977de77d82':
  Fix 64 bit compile failures in renderscript
 2014-03-19 21:22:06 +00:00
Glenn Kasten
a0e300efae am 458edc8d: am a3dc076d: am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger." 
* commit '458edc8de368607a1cf831f7e8bb70047c8bf905':
  mediaeditor shouldn't depend on audioflinger.
 2014-03-19 21:15:41 +00:00
Glenn Kasten
4f346bf0ff am ff1e1d99: am 240d5638: am c1f3d4c1: Merge "Fix 64 bit compile failures in renderscript" 
* commit 'ff1e1d99ea029197051b3cdaa39effc6baa94b53':
  Fix 64 bit compile failures in renderscript
 2014-03-19 21:15:38 +00:00
Glenn Kasten
458edc8de3 am a3dc076d: am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger." 
* commit 'a3dc076d2dda77d8891fcd83f6f4056d15bbf2fc':
  mediaeditor shouldn't depend on audioflinger.
 2014-03-19 21:10:41 +00:00
Glenn Kasten
ff1e1d99ea am 240d5638: am c1f3d4c1: Merge "Fix 64 bit compile failures in renderscript" 
* commit '240d56386377f3bcd554a2cc07e0c3e336103c86':
  Fix 64 bit compile failures in renderscript
 2014-03-19 21:10:36 +00:00
Craig Mautner
b4998eec3c Fix loop limits. 
Fixes bug 12207606.

Change-Id: I9b450d2bc2a72a1f6581147f8930188f34c85299
 2014-03-19 14:09:59 -07:00