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

8353 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tor Norbye
c85a73bf28 am 01076305: Fix version metadata for java.lang.reflect.Field. do not merge. 
* commit '010763059f205a0060455acc158c95c7183f5c91':
  Fix version metadata for java.lang.reflect.Field. do not merge.
 2012-02-23 18:10:15 -08:00
Tor Norbye
010763059f Fix version metadata for java.lang.reflect.Field. do not merge. 
(cherry picked from commit 9ada0ac8f4)

Change-Id: Ic51aaa81e5a569a6384ac4e9f26b715801e13f1d
 2012-02-23 18:07:42 -08:00
Jesse Hall
ac8acce59e am 00e61338: EmuGL: refinements to GLESv1 image_external 
* commit '00e61338b8374de090e81537047846ca06f88280':
  EmuGL: refinements to GLESv1 image_external
 2012-02-22 13:47:22 -08:00
Jesse Hall
71f28afa4c am ac018fe3: EmuGL: refcount ColorBuffers on the host 
* commit 'ac018fe3f65e18083a2dd317f73e4139bfa5fee6':
  EmuGL: refcount ColorBuffers on the host
 2012-02-22 13:45:34 -08:00
Jesse Hall
1a5e235074 am 91d4e8e1: GLESv2 translator: don\'t delete EGLImage textures 
* commit '91d4e8e195592dbc812441597118452f887ea07d':
  GLESv2 translator: don't delete EGLImage textures
 2012-02-22 10:10:54 -08:00
Jesse Hall
00e61338b8 EmuGL: refinements to GLESv1 image_external 
* EGLImageTargetRenderbufferStorageOES was incorrectly accepting
  TEXTURE_EXTERNAL_OES as a target. Revert that; the host GL will
  correctly reject it with INVALID_ENUM.

* Handle the REQUIRED_TEXTURE_IMAGE_UNITS_OES texparameter query.

* Validate texture parameters set on TEXTURE_EXTERNAL textures;
  otherwise invalid parameters would work on the emulator but not on a
  real device.

Change-Id: I49a088608d58a9822f33e5916bd354eee3709127
 2012-02-21 11:13:20 -08:00
Jesse Hall
ac018fe3f6 EmuGL: refcount ColorBuffers on the host 
The gralloc API assumes system-wide reference counting of gralloc
buffers. The host-GL accelerated gralloc maps buffers to host-side
ColorBuffer objects, but was destroying them unconditionally in
gralloc_free(), ignoring any additional references from
gralloc_register_buffer().

This affected the SurfaceTexture gralloc buffers used by the
Browser/WebView. For some reason these buffers are actually allocated
by SurfaceFlinger and passed back to the WebView through Binder. But
since SurfaceFlinger doesn't actually need the buffer for anything,
sometime after the WebView has called gralloc_register_buffer()
SurfaceFlinger calls gralloc_free() on it. This caused the host
ColorBuffer to be destroyed long before the WebView is done using it.

Change-Id: I33dbee887a48a6907041cf19e9f38a1f6c983eff
 2012-02-21 11:13:20 -08:00
Jesse Hall
91d4e8e195 GLESv2 translator: don't delete EGLImage textures 
Copy changes faaf1553cf and
f37a7ed6c5 from the GLESv1 translator to
the GLESv2 translator. After this, both translators use the same logic
for glEGLImageTargetTexture2DOES().

Change-Id: I0a95bf2301df7b7428abc593f38170edf4cbda30
 2012-02-21 11:13:19 -08:00
The Android Open Source Project
f57689a287 Reconcile with ics-mr1-release 
Change-Id: I6c51c02fe1de073b1bb5d3cd73e9a072286b4cb8
 2012-02-17 09:02:42 -08:00
The Android Automerger
cecde327e3 merge in ics-mr1-release history after reset to ics-mr1 2012-02-16 16:24:50 -08:00
Xavier Ducrohet
95605614af am fd9cdb46: Increase platform sdk package revision. do not merge. 
* commit 'fd9cdb46a064d3ecc46aa05fa9c023ae648f07f1':
  Increase platform sdk package revision. do not merge.
 2012-02-16 15:34:11 -08:00
Xavier Ducrohet
fd9cdb46a0 Increase platform sdk package revision. do not merge. 
Change-Id: I51125369a0b2ba1376a66924b04b0cd825d82f5d
 2012-02-16 15:31:20 -08:00
The Android Open Source Project
c263b3450f Reconcile with ics-mr1-release 
Change-Id: Ibf45e3ef58ab7a50e362da85993c4332636f32f7
 2012-02-16 10:10:08 -08:00
Xavier Ducrohet
ae0c9dfd62 am 52feec59: Update rev numbers of SDK packages. DO NOT MERGE. 
* commit '52feec594a769653625f6089cfcd5398332922ea':
  Update rev numbers of SDK packages. DO NOT MERGE.
 2012-02-16 09:56:04 -08:00
Xavier Ducrohet
52feec594a Update rev numbers of SDK packages. DO NOT MERGE. 
Change-Id: Idc750d5bd63186157cd2cb08c28e73e9894c34bd
 2012-02-15 18:32:11 -08:00
The Android Automerger
d16ed56822 merge in ics-mr1-release history after reset to ics-mr1 2012-02-14 14:14:35 -08:00
Adam Powell
1b919a3fb8 am 15a14930: Merge "Add AppNavigation demo" into ics-mr1 
* commit '15a14930d761d85466faf4e5f62209e8ab078b1d':
  Add AppNavigation demo
 2012-02-13 14:29:49 -08:00
Adam Powell
15a14930d7 Merge "Add AppNavigation demo" into ics-mr1 2012-02-13 14:27:58 -08:00
Scott Main
12104d3734 am de797a2f: Merge "docs: fix minsdkversion for native activity sample" into ics-mr1 
* commit 'de797a2fb233ce1aed1eedb9cfc629ba63bd9bd7':
  docs: fix minsdkversion for native activity sample
 2012-02-09 12:16:41 -08:00
Scott Main
de797a2fb2 Merge "docs: fix minsdkversion for native activity sample" into ics-mr1 2012-02-09 12:15:07 -08:00
Scott Main
41b5bb95c3 docs: fix minsdkversion for native activity sample 
Change-Id: I2d45207182f6a5b1743b574f7ab10251efd3a17a
 2012-02-09 12:10:27 -08:00
Adam Powell
247df4fe79 Add AppNavigation demo 
This demo illustrates the use of the new support library functionality
for navigating within and across tasks using "up" navigation. This
matches the recommendations in the Android design guide.

Change-Id: I2b36c962dd24f0e0f3b3ee3f86319dafc2fc66e2
 2012-02-07 15:02:57 -08:00
Jesse Hall
bc96fa33dc am 0e981c83: EmuGL: Fix heap corruption 
* commit '0e981c83041878e6a05b0a996879160fd0f320cf':
  EmuGL: Fix heap corruption
 2012-02-06 13:36:49 -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
Trevor Johns
b8504b0a0e am 47365074: Merge "Adding Android Developers Google+ redirect" into ics-mr1 
* commit '47365074a01acc1826e10cf530f613e4cd58d62a':
  Adding Android Developers Google+ redirect
 2012-02-03 13:11:31 -08:00
Trevor Johns
23195b75a4 am 7a94a9dc: Merge "Adding manual redirect support to developer.android.com." into ics-mr1 
* commit '7a94a9dc49fc9b512e30fc5737baed8d1ddc7d13':
  Adding manual redirect support to developer.android.com.
 2012-02-03 13:09:43 -08:00
Trevor Johns
47365074a0 Merge "Adding Android Developers Google+ redirect" into ics-mr1 2012-02-03 13:08:46 -08:00
Trevor Johns
7a94a9dc49 Merge "Adding manual redirect support to developer.android.com." into ics-mr1 2012-02-03 13:08:23 -08:00
Trevor Johns
22f4efaa12 Adding Android Developers Google+ redirect 
Redirect developer.android.com/+ to Google+ page for Android Developers.

Issue: 5933956

Change-Id: I0ed2b076386058f1ac81ea4376aea15fee6b24aa
 2012-02-03 12:32:10 -08:00
Xavier Ducrohet
eea4e8e803 am df458cb8: Fix api version file with proper data enum. 
* commit 'df458cb83274782a7908333ae2f21a1860a12400':
  Fix api version file with proper data enum.
 2012-02-01 13:52:22 -08:00
The Android Open Source Project
dff907ecf5 Reconcile with ics-mr1-release 
Change-Id: I74de9b8f1c59bb309cecda20c9181c69958c296c
 2012-02-01 08:49:29 -08:00
Xavier Ducrohet
df458cb832 Fix api version file with proper data enum. 
The generator tool was broken during the generics fix.

Change-Id: I7e375000ac52fba27af7992ffebb5858baf20b3a
 2012-01-31 19:18:06 -08:00
Xavier Ducrohet
e11b2d6c9f Update api version file with stripped generics info. 
Change-Id: Iac38c14115757cbfa75808ce5e476912da80543d
 2012-01-31 15:44:27 -08:00
The Android Automerger
1c33479a7c merge in ics-mr1-release history after reset to ics-mr1 2012-01-31 15:41:33 -08:00
The Android Automerger
672a32cc9c merge in ics-mr1-release history after reset to ics-mr1 2012-01-30 23:33:27 -08:00
The Android Automerger
9771093ab8 merge in ics-mr1-release history after reset to ics-mr1 2012-01-30 13:22:25 -08:00
Dianne Hackborn
97d0a1db24 Merge "Fix bug in the new notification sample." into ics-mr1 2012-01-30 12:52:26 -08:00
Dianne Hackborn
376e000436 Fix bug in the new notification sample. 
Change-Id: I021c5f374857d1affdddd8be37c0f441aaf14c95
 2012-01-30 11:44:05 -08:00
Yu Shan Emily Lau
979806b0a8 Regular monkey should not write script log. 
Change-Id: I225cb01d3fb81478ea0e13cc4a6546d71d16d251
 2012-01-30 11:08:53 -08:00
Trevor Johns
e12dad21f0 Merge "Generate a valid main.py for use with developer.android.com." into ics-mr1 2012-01-30 10:27:05 -08:00
Trevor Johns
662b8f1c9a Adding manual redirect support to developer.android.com. 
Internal bug: 2347145

Change-Id: I0cdcec8a23704ab80878e8cc781b735fd2173011
 2012-01-27 20:16:15 -08:00
Trevor Johns
e52271aff9 Generate a valid main.py for use with developer.android.com. 
This fixes bugs in divide_and_compress_constants.py that caused a corrupt
main.py file to be generated for developer.android.com. Specifically,
extra quotes are no longer added, __main__ is now in quotes, and
webapp.WSGIApplication() parameters are now correct.

Also moved the call to memcache_zipserve.create_handler() to a seperate
line for readability.

Change-Id: I8906c54e70b2889389a95b92d4fbcf05a6c3e22d
 2012-01-27 20:08:25 -08:00
Xavier Ducrohet
d4f9372a4d Merge "Move api.xml from tools/ to platform-tools/" into ics-mr1 2012-01-27 12:00:38 -08:00
Tor Norbye
82374f6d8d Move api.xml from tools/ to platform-tools/ 
The API database was generated with code in sdk/apicheck/.

Change-Id: I42559fb47716f8ea2ee2d836375b523644dfe41c
 2012-01-27 11:59:10 -08:00
Robert Ly
5d1dd1c68f Merge "updating the SampleSyncAdapter sample to add stream item and photo code" into ics-mr1 2012-01-27 09:04:48 -08:00
The Android Automerger
9c3b45bd1c merge in ics-mr1-release history after reset to ics-mr1 2012-01-25 12:08:07 -08:00
Dianne Hackborn
85241cc795 Add button to clear back stack. 
Change-Id: I4f02714ec349055a486608ff0eab75a46d6ba7cd
 2012-01-24 13:39:02 -08:00
Robert Ly
74c1836184 updating the SampleSyncAdapter sample to add stream item and photo code 
Change-Id: Ic5f16194fc0d0314d9170a8598eccc17b6a4e26c
 2012-01-23 17:58:16 -08:00
Robert Ly
3d398d7243 Revert "updating the SampleSyncAdapter sample to add stream item and photo code" 
This reverts commit 7a98345fc5
 2012-01-20 11:07:10 -08:00
The Android Automerger
deda7c815c merge in ics-mr1-release history after reset to ics-mr1 2012-01-19 16:28:01 -08:00