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

119548 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
bab95c0172 am 37050124: am a413a4ae: Fix the build. DO NOT MERGE 
* commit '370501243685a39a52b6e389b97711b906d2d4f8':
  Fix the build.  DO NOT MERGE
 2014-03-20 16:37:44 +00:00
Chris Craik
d23d5b192a am 7c9bd98a: am 89513ee5: Merge "Fix projection offset caching - DO NOT MERGE" into klp-dev 
* commit '7c9bd98a4bb0aa6954d5f612c197d03f309980f0':
  Fix projection offset caching - DO NOT MERGE
 2014-03-20 15:42:24 +00:00
Jim Miller
dca18258e8 am 375ff2c4: am 2598fbd7: Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev 
* commit '375ff2c4a7b42d6dfd333e0ffa351be88fdab034':
  Attempt to fix a bug where SIM progress dialog gets stuck.
 2014-03-20 15:42:20 +00:00
Victoria Lease
3486659584 am cfd46dc4: am 610d401c: am e9c7fd2f: am 55371beb: am 754bf6ab: am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit 'cfd46dc4847d5ef1ed14484717cf857ae5f67cae':
  malloc some advances
 2014-03-20 15:41:49 +00:00
Narayan Kamath
a2275b9869 am c850102d: am 0da4ad42: Merge "Don\'t register methods when there\'s nothing to register." 
* commit 'c850102d5c4b1fad47c221911c7be5567cebe8b1':
  Don't register methods when there's nothing to register.
 2014-03-20 10:18:46 +00:00
Narayan Kamath
c850102d5c am 0da4ad42: Merge "Don\'t register methods when there\'s nothing to register." 
* commit '0da4ad425d52d1aeec16b31b784c456753532dc2':
  Don't register methods when there's nothing to register.
 2014-03-20 03:13:27 -07:00
Narayan Kamath
0da4ad425d Merge "Don't register methods when there's nothing to register." 2014-03-20 10:08:38 +00:00
Chris Craik
726104a62a 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:29:46 +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
37c591036a am dd6b7495: am 83725810: Merge "Get rid of noise during boot." 
* commit 'dd6b7495577eca7a00aa37bfdca3449cf1443681':
  Get rid of noise during boot.
 2014-03-20 01:53:08 +00:00
Jim Miller
3705012436 am a413a4ae: Fix the build. DO NOT MERGE 
* commit 'a413a4ae3280be6c45e84e85d7be3379a5cb51e4':
  Fix the build.  DO NOT MERGE
 2014-03-20 01:49:31 +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
Jim Miller
a413a4ae32 Fix the build. DO NOT MERGE 
Change-Id: Ic34e351f86cfb8299b666e860c067d905cce6747
 2014-03-19 18:38:09 -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
af9205626f 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:22:59 +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
Colin Cross
19fc55e1e3 Merge "build app_process64 on 64-bit targets" 2014-03-20 01:14:43 +00:00
Chris Craik
7c9bd98a4b am 89513ee5: Merge "Fix projection offset caching - DO NOT MERGE" into klp-dev 
* commit '89513ee544cd6373496179758e09954af0ba217d':
  Fix projection offset caching - DO NOT MERGE
 2014-03-20 01:08:45 +00:00
Jim Miller
375ff2c4a7 am 2598fbd7: Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev 
* commit '2598fbd71a2109ab307d32935a13fa1eab150e8d':
  Attempt to fix a bug where SIM progress dialog gets stuck.
 2014-03-20 01:08:43 +00:00
Chris Craik
89513ee544 Merge "Fix projection offset caching - DO NOT MERGE" into klp-dev 2014-03-20 01:04:57 +00:00
Jim Miller
2598fbd71a Merge "Attempt to fix a bug where SIM progress dialog gets stuck." into klp-dev 2014-03-20 01:04:13 +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
Victoria Lease
cfd46dc484 am 610d401c: am e9c7fd2f: am 55371beb: am 754bf6ab: am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '610d401cb580ee233c008acf8fc076047a0ffdb4':
  malloc some advances
 2014-03-19 22:32:12 +00:00
Victoria Lease
610d401cb5 am e9c7fd2f: am 55371beb: am 754bf6ab: am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit 'e9c7fd2f2ee7840c61dc66ead3737e437f4e8c10':
  malloc some advances
 2014-03-19 22:27:06 +00:00
Victoria Lease
e9c7fd2f2e am 55371beb: am 754bf6ab: am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '55371beb024ae402831898f8788e4293f52dd832':
  malloc some advances
 2014-03-19 15:21:09 -07:00
Victoria Lease
55371beb02 am 754bf6ab: am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '754bf6abc0f5a5a26eda4081ce01b1f013a0e1e2':
  malloc some advances
 2014-03-19 15:14:07 -07:00
Victoria Lease
754bf6abc0 am c8868db2: am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit 'c8868db2a025a97e439f8a9adde565c9c83f2204':
  malloc some advances
 2014-03-19 15:08:32 -07:00
Victoria Lease
c8868db2a0 am 737d3e5d: am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '737d3e5da366124d164555009fa5ee4552143cc8':
  malloc some advances
 2014-03-19 15:03:28 -07:00
Victoria Lease
737d3e5da3 am 6b96ecca: am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '6b96ecca90555e04da8a4477d6dc6de83e7b9ee1':
  malloc some advances
 2014-03-19 14:57:36 -07:00
Victoria Lease
6b96ecca90 am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '32753f4f1c0dfd810d68759cce3e51cf788084f8':
  malloc some advances
 2014-03-19 14:51:58 -07:00
Victoria Lease
32753f4f1c am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '3191212259b1629cf8174416adf01522b88501ad':
  malloc some advances
 2014-03-19 14:47:23 -07:00
Craig Mautner
674dd27ca1 am 1888333d: am d4375b47: Merge "Fix loop limits." into klp-dev 
* commit '1888333d7e814d6681a327cf1f3eda10098e3620':
  Fix loop limits.
 2014-03-19 21:46:18 +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
Victoria Lease
3191212259 am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '6eb2810318262ff36014c52384ed3cdea19bd34e':
  malloc some advances
 2014-03-19 14:40:17 -07:00
Craig Mautner
d4375b4713 Merge "Fix loop limits." into klp-dev 2014-03-19 21:37:07 +00:00
Victoria Lease
6eb2810318 am 183f97b7: am 1c12f9e7: malloc some advances 
* commit '183f97b72faf7a0f45ad66e1b3fd9a4343cc7482':
  malloc some advances
 2014-03-19 14:32:15 -07:00
Victoria Lease
183f97b72f am 1c12f9e7: malloc some advances 
* commit '1c12f9e76298c757423155ad812890d27effafe8':
  malloc some advances
 2014-03-19 14:27:19 -07:00
Glenn Kasten
da47d79d34 am a3dc076d: am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger." 
* commit 'a3dc076d2dda77d8891fcd83f6f4056d15bbf2fc':
  mediaeditor shouldn't depend on audioflinger.
 2014-03-19 21:10:15 +00:00
Glenn Kasten
cd9934cf03 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:12 +00:00
Craig Mautner
b4998eec3c Fix loop limits. 
Fixes bug 12207606.

Change-Id: I9b450d2bc2a72a1f6581147f8930188f34c85299
 2014-03-19 14:09:59 -07:00
Glenn Kasten
a3dc076d2d am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger." 
* commit 'bfc440923ecb8f32448c675095a2096049fe7ebe':
  mediaeditor shouldn't depend on audioflinger.
 2014-03-19 14:05:23 -07:00
Glenn Kasten
240d563863 am c1f3d4c1: Merge "Fix 64 bit compile failures in renderscript" 
* commit 'c1f3d4c1ba7903d1b72c2341b5284da12b79ee46':
  Fix 64 bit compile failures in renderscript
 2014-03-19 14:05:20 -07:00
Glenn Kasten
bfc440923e Merge "mediaeditor shouldn't depend on audioflinger." 2014-03-19 21:02:39 +00:00
Glenn Kasten
c1f3d4c1ba Merge "Fix 64 bit compile failures in renderscript" 2014-03-19 21:01:57 +00:00
Lajos Molnar
1c9b528dc0 am 0dc08486: am f7b33e86: Merge "MediaPlayer: fix int overflow issue in MediaTimeProvider" into klp-dev 
* commit '0dc084865313a416246915c72b29c13cc3f404d4':
  MediaPlayer: fix int overflow issue in MediaTimeProvider
 2014-03-19 20:52:46 +00:00
Lajos Molnar
0dc0848653 am f7b33e86: Merge "MediaPlayer: fix int overflow issue in MediaTimeProvider" into klp-dev 
* commit 'f7b33e8656599ed3e0edd834a03a0366b0f655bb':
  MediaPlayer: fix int overflow issue in MediaTimeProvider
 2014-03-19 20:46:48 +00:00
Lajos Molnar
f7b33e8656 Merge "MediaPlayer: fix int overflow issue in MediaTimeProvider" into klp-dev 2014-03-19 20:43:23 +00:00
Adam Cohen
e5d754f941 am 0dca4fc9: am 55b523cc: Merge "[DO NOT MERGE] Fix wallpaper cropping bugs" into klp-dev 
* commit '0dca4fc929638755454cc46a4eb21e86b3fcb0c8':
  [DO NOT MERGE] Fix wallpaper cropping bugs
 2014-03-19 20:27:47 +00:00