LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,858 Commits 2 Branches 0 Tags
8b51a39fda458039e68b650eb46f90b95f4bddca
Commit Graph

2587 Commits

Author SHA1 Message Date
Tor Norbye
80437f41e5 Merge "Update default project icons, and add an xhdpi version" 2012-02-06 12:48:20 -08:00
Jesse Hall
0e981c8304 EmuGL: Fix heap corruption 
Off-by-two bug when removing textures from the tracking array could
overwrite malloc's mem chunk data structure, usually resulting in a
heap corruption abort on a later malloc/realloc/free.

Bug: 5951738
Change-Id: I11056bb62883373c2a3403f53899347ff8cdabf2
 2012-02-03 22:54:24 -08:00
Marco Nelissen
3bd580e1dd am 936e648c: Fix findunusedresources to handle package name different from path 
* commit '936e648ce98cb468ac02dc7e6ef9f7df897f03ff':
  Fix findunusedresources to handle package name different from path
 2012-01-27 16:18:56 -08:00
Marco Nelissen
936e648ce9 Fix findunusedresources to handle package name different from path 
Change-Id: Ia010d0f71e3e7141f762fc83ff34d3426bac85a0
 2012-01-27 16:07:59 -08:00
Jesse Hall
97c1620440 am 900f5e87: am 9b19d582: am 4f66a14d: Merge "EmuGL: handle NULL data in glBufferData" into ics-mr1 
* commit '900f5e879360898afc5599fc887b98aa012c8ce2':
  EmuGL: handle NULL data in glBufferData
 2012-01-11 17:15:50 -08:00
Jesse Hall
900f5e8793 am 9b19d582: am 4f66a14d: Merge "EmuGL: handle NULL data in glBufferData" into ics-mr1 
* commit '9b19d582d94a343437aacf962b8b95b83361bc10':
  EmuGL: handle NULL data in glBufferData
 2012-01-11 17:13:42 -08:00
Jesse Hall
9b19d582d9 am 4f66a14d: Merge "EmuGL: handle NULL data in glBufferData" into ics-mr1 
* commit '4f66a14d5311ee94d5a498c8e0049f6b95d4d0d6':
  EmuGL: handle NULL data in glBufferData
 2012-01-11 17:12:09 -08:00
Jesse Hall
5bad48a65e EmuGL: handle NULL data in glBufferData 
The data pointer argument to glBufferData can be NULL; this
[re]allocates the buffer while leaving the contents undefined.

Bug: 5833436

Change-Id: Ia1ddf62e2cd2c59d3d631e01d23d7c557ca5a52e
 2012-01-11 15:40:29 -08:00
Steve Block
3ba6e9ff86 am 7d47e557: Merge "Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE" 
* commit '7d47e557172d15fb698604a48f1a0100dfd84330':
  Rename LOG_ASSERT to ALOG_ASSERT  DO NOT MERGE
 2012-01-10 14:46:33 -08:00
Steve Block
7d47e55717 Merge "Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE" 2012-01-10 14:08:30 -08:00
Jesse Hall
1f30075c7f am 56335392: am d23522e6: am f0baef2f: Merge "EmuGL: misc small cleanups" into ics-mr1 
* commit '5633539268af0c8686ce97c174122e053ecbb774':
  EmuGL: misc small cleanups
 2012-01-10 09:02:49 -08:00
Jesse Hall
90f9afea71 am 8a5b5242: am 19b03e4e: am 409c49c5: Merge "EmuGL: fix GL view position in window on OS X" into ics-mr1 
* commit '8a5b5242a4cf4e5be85f9e5fed1787027d92704b':
  EmuGL: fix GL view position in window on OS X
 2012-01-10 09:02:48 -08:00
Jesse Hall
5633539268 am d23522e6: am f0baef2f: Merge "EmuGL: misc small cleanups" into ics-mr1 
* commit 'd23522e614c517a50222796286a7fffb6c11bd14':
  EmuGL: misc small cleanups
 2012-01-09 16:37:28 -08:00
Jesse Hall
8a5b5242a4 am 19b03e4e: am 409c49c5: Merge "EmuGL: fix GL view position in window on OS X" into ics-mr1 
* commit '19b03e4ef1e7861b938dd7c52356af5396f456b3':
  EmuGL: fix GL view position in window on OS X
 2012-01-09 16:37:27 -08:00
Jesse Hall
d23522e614 am f0baef2f: Merge "EmuGL: misc small cleanups" into ics-mr1 
* commit 'f0baef2fed555e87a0910e5aab6b8b763487b350':
  EmuGL: misc small cleanups
 2012-01-09 15:53:49 -08:00
Jesse Hall
19b03e4ef1 am 409c49c5: Merge "EmuGL: fix GL view position in window on OS X" into ics-mr1 
* commit '409c49c526508b5fa36f8bc6edc1fc70cba5a3e1':
  EmuGL: fix GL view position in window on OS X
 2012-01-09 15:53:48 -08:00
Jesse Hall
f0baef2fed Merge "EmuGL: misc small cleanups" into ics-mr1 2012-01-09 15:52:15 -08:00
Steve Block
8ad367c36d Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE 
See https://android-git.corp.google.com/g/157519

Bug: 5449033
Change-Id: I2eb298dae73ccfd8e9ee8350344d9f5c96f5c422
 2012-01-09 21:35:44 +00:00
Steve Block
9033d6efcf am 5a622cba: Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE 
* commit '5a622cba8c5287d5e6577f940a22343a7cae977f':
  Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)  DO NOT MERGE
 2012-01-09 11:22:47 -08:00
Steve Block
5a622cba8c Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/#/c/157220

Bug: 5449033
Change-Id: Ic6cac56d137f705dfa7266f21e9b0269219bd5d1
 2012-01-09 10:39:43 +00:00
Steve Block
8460b530e8 am 8e822bd4: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE" 
* commit '8e822bd462aff69821442a02b85ed9c5dcbed341':
  Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)  DO NOT MERGE
 2012-01-06 10:33:19 -08:00
Steve Block
6aff44c27e Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/157065

Bug: 5449033
Change-Id: I03c41e20d8f5d7f3c7ef1f01506885e3e250e921
 2012-01-06 10:06:41 +00:00
Steve Block
cb46eed1eb am 91cb6de5: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE" 
* commit '91cb6de5e5c862ad25c4b494a27716e2bf9e697f':
  Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)  DO NOT MERGE
 2012-01-05 14:09:15 -08:00
Jesse Hall
a592d9c043 EmuGL: misc small cleanups 
* Disable verbose debug spam.
* Add missing GL enum to utility function. The default case was
  returning the correct size, so this doesn't fix any bugs, just
  removes some logcat spam.
* Comment and whitespace corrections.

Change-Id: I83fb8644331ae1072d6a8dae9c041da92073089f
 2012-01-05 10:50:01 -08:00
Alex Sakhartchouk
185bb9b5cc Merge "Stripping out geometry data, but keeping names and references instead of removing all geometric data." into graphics-dev 2012-01-04 17:18:44 -08:00
Jesse Hall
a4fb8a60b1 EmuGL: fix GL view position in window on OS X 
The code that creates the GL-accelerated screen view wasn't converting
the upper-left-relative coordinates used within the emulator to the
lower-left coordinates used by the Cocoa APIs on OS X. Since most
skins have the screen view centered vertically this often just
happened to work.

Bug: 5782118
Change-Id: I2f96ee181e850df5676d10a82d86c94421149b40
 2012-01-04 15:03:39 -08:00
Steve Block
cad4194fad Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/156801

Bug: 5449033
Change-Id: Ia7ba0ca669b2c4168d90837f9b409b21503f95f0
 2012-01-04 21:08:55 +00:00
Steve Block
7ee245378c am 112bc5e5: Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE 
* commit '112bc5e57e206ec3e0bc5a335b62eae2eb8892e8':
  Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)  DO NOT MERGE
 2012-01-04 10:16:05 -08:00
Alex Sakhartchouk
40b0530285 Stripping out geometry data, but keeping names and references instead 
of removing all geometric data.

Change-Id: I602d548f6ef41b9feba3b50b819501c3d59bf8c6
 2012-01-03 17:39:38 -08:00
Steve Block
112bc5e57e Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/156016

Bug: 5449033
Change-Id: Ia14c98936bb1dc74e681bf2de342ad6861646778
 2012-01-03 22:29:55 +00:00
Al Sutton
3d9ff5598c am c9cfb303: am 34e3d029: am 87879839: Fix build on MacOS 10.7 / XCode 4 
* commit 'c9cfb3032d5d4a502011fb30c344c73a35003b93':
  Fix build on MacOS 10.7 / XCode 4
 2011-12-21 16:51:09 -08:00
Al Sutton
c9cfb3032d am 34e3d029: am 87879839: Fix build on MacOS 10.7 / XCode 4 
* commit '34e3d0291b767807e55022688463bdef96569462':
  Fix build on MacOS 10.7 / XCode 4
 2011-12-21 16:48:26 -08:00
Al Sutton
87879839f1 Fix build on MacOS 10.7 / XCode 4 
Ensure the dynamic library library gets linked in with SDL
to fix compilation errors

Change-Id: I32e6929088eaf73d707e89d10392c658b58ec465
 2011-12-21 13:21:32 -08:00
Tor Norbye
714e5160b7 Update default project icons, and add an xhdpi version 
Change-Id: I7546fb49bc2190c2776290320c87e2cb3843be48
 2011-12-16 15:21:12 -08:00
Xavier Ducrohet
8ad1ba9b32 am 1ee0d798: am 47dea794: am 31ecada2: Merge "Fix WXGA720 skin to be portrait by default." into ics-mr1 
* commit '1ee0d798d6b044c5e882593591a89ae0b84f30b3':
  Fix WXGA720 skin to be portrait by default.
 2011-12-15 14:38:10 -08:00
Xavier Ducrohet
1ee0d798d6 am 47dea794: am 31ecada2: Merge "Fix WXGA720 skin to be portrait by default." into ics-mr1 
* commit '47dea79401dffbb0f030df6e9d94e428348b700a':
  Fix WXGA720 skin to be portrait by default.
 2011-12-15 14:35:27 -08:00
Xavier Ducrohet
144589bfd0 Fix WXGA720 skin to be portrait by default. 
Having it landscape by default is not representative of a phone
and triggers an issue where the system ui bar is not displayed.

Change-Id: Ic28e3739c30825fe55f8cc6cede5c9a5462f6931
 2011-12-15 14:28:46 -08:00
Vladimir Chtchetkine
30df0a81d1 am 1855f8eb: Merge "Pass white balance and exposure compensation to webcam emulator" 
* commit '1855f8eba85d40bd8655969dfde9410cfb78a7ba':
  Pass white balance and exposure compensation to webcam emulator
 2011-12-13 07:36:17 -08:00
Vladimir Chtchetkine
1855f8eba8 Merge "Pass white balance and exposure compensation to webcam emulator" 2011-12-13 07:34:38 -08:00
Jesse Hall
2982b9415d am fcc135f5: am 705c46ec: am 5d721ef6: am b0a30e43: EmuGL: remove broken EGL buffer refcounting 
* commit 'fcc135f554068d2101cc7d924268872c25c68bf8':
  EmuGL: remove broken EGL buffer refcounting
 2011-12-13 05:47:36 -08:00
Jesse Hall
fcc135f554 am 705c46ec: am 5d721ef6: am b0a30e43: EmuGL: remove broken EGL buffer refcounting 
* commit '705c46ec3f5588e16511ae0e4239d310c85fecf8':
  EmuGL: remove broken EGL buffer refcounting
 2011-12-12 17:49:18 -08:00
Xavier Ducrohet
13425b5748 am 3161c0b5: am 60fe4a56: am 646e7964: Merge "Increase skin ram and vmheap." into ics-mr1 
* commit '3161c0b517998cdd829d80dee4db1b8d69ef3593':
  Increase skin ram and vmheap.
 2011-12-12 15:34:36 -08:00
Xavier Ducrohet
3161c0b517 am 60fe4a56: am 646e7964: Merge "Increase skin ram and vmheap." into ics-mr1 
* commit '60fe4a56ddbb4b8bb8c5b058cdf854729a895cef':
  Increase skin ram and vmheap.
 2011-12-12 15:30:34 -08:00
Jesse Hall
5d721ef6a1 am b0a30e43: EmuGL: remove broken EGL buffer refcounting 
* commit 'b0a30e43889415a9a40b9519392ad3be295b9465':
  EmuGL: remove broken EGL buffer refcounting
 2011-12-12 15:23:59 -08:00
Jesse Hall
b0a30e4388 EmuGL: remove broken EGL buffer refcounting 
The emulator EGL implementation tried to hold its own reference to
buffers acquired/released with dequeueBuffer/queueBuffer, but was
missing an incRef after dequeueBuffer during swapBuffers.

Since the native window holds a reference to the buffer between
dequeueBuffer and queueBuffer, the EGL reference isn't needed anyway.

Change-Id: I95e4f9f4faf59198f99939cdca6603fe176c56bc
 2011-12-12 14:05:16 -08:00
Xavier Ducrohet
646e7964f9 Merge "Increase skin ram and vmheap." into ics-mr1 2011-12-09 15:42:26 -08:00
Xavier Ducrohet
7400b43b8c Increase skin ram and vmheap. 
Change-Id: I96d8f6249ab7110717f21cd339acd8a803a579d3
 2011-12-09 15:41:45 -08:00
James Dong
4fed461d11 Revert "Revert "Update the media_profiles.xml file to include..." 
This reverts commit 2400b2c340.

Change-Id: I7f6823385448db5f94cdfc4df8cdf32ab9d156c2
 2011-12-09 12:40:30 -08:00
David Hu
61cffb0633 Merge "Change the test to user the listener mechanism" into ics-mr1 2011-12-08 16:38:19 -08:00
Tor Norbye
5da74d00ab am 7fb8be5c: Update mkstubs from ASM 3.1 to ASM 4.0 
* commit '7fb8be5c6ab69d547a49da88093c57acc3694309':
  Update mkstubs from ASM 3.1 to ASM 4.0
 2011-12-06 13:33:47 -08:00