ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
41,488 Commits 2 Branches 0 Tags 54 MiB
185a0a0420
Commit Graph

41488 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
0e52d229c2 Merge "Clean up NMS AIDL and permissions checking." 2011-11-18 13:57:59 -08:00
Jim Miller
19a87be79e resolved conflicts for merge of 1a783be3 to master 
Change-Id: Ibaff3547ac51250fe40adf3aa06d6a30ecfcef54
 2011-11-18 13:56:20 -08:00
Marco Nelissen
2bf09c353a Merge "status_t != bool" 2011-11-18 13:52:35 -08:00
The Android Open Source Project
17ddb89806 am d5280e51: Reconcile with ics-mr0-release 
* commit 'd5280e51aa4578ff47bffc166f74d79c17358589':
 2011-11-18 13:35:32 -08:00
Mathias Agopian
c4dd3a44c6 am 4d71053b: Merge "attempt to fix bug 5313580" into ics-mr1 
* commit '4d71053b0728b248d80d7d5a098df459722e2be0':
  attempt to fix bug 5313580
 2011-11-18 13:35:23 -08:00
Bart Sears
708e9b4be5 am e6a96560: Merge "Content and viewport rects set in one step." into ics-mr1 
* commit 'e6a96560ed96e5121db2e22168698f14338c8f1d':
  Content and viewport rects set in one step.
 2011-11-18 13:35:14 -08:00
The Android Open Source Project
3540b77da3 Reconcile with ics-mr0-release 
Change-Id: I805d2b484b72fb640a889ff2a4b67944cbbe012a
 2011-11-18 13:12:33 -08:00
Mathias Agopian
6285c6cf10 Merge "attempt to fix bug 5313580" into ics-mr1 2011-11-18 12:11:15 -08:00
Jesse Wilson
c05413fd47 Merge "Remove untrue tip about zero-length arrays." 2011-11-18 12:06:42 -08:00
Bart Sears
3b244a74e1 Merge "Content and viewport rects set in one step." into ics-mr1 2011-11-18 11:46:26 -08:00
Svetoslav Ganov
3758a56f37 am 0358787f: Merge "Add the support libraries to the platform documentation (build)." into ics-mr1 
* commit '0358787f68c48fb10f2d8067fd53f0471481320a':
  Add the support libraries to the platform documentation (build).
 2011-11-18 10:14:04 -08:00
Svetoslav Ganov
fc48e6b29e Merge "Add the support libraries to the platform documentation (build)." into ics-mr1 2011-11-18 10:11:35 -08:00
Guang Zhu
eefa17eef7 am 1753fd00: am 3af8b699: Merge "add a self instrumentation into framework perf app" into ics-mr1 
* commit '1753fd00764614213cfb9f88b00ee16fe3c1da3e':
  add a self instrumentation into framework perf app
 2011-11-18 09:15:56 -08:00
satok
3efe34d52b am 852b589a: am 1a3c051b: Merge "Hide/show ime switch icon properly" into ics-mr1 
* commit '852b589a51531f8f7a166f36f7596c255896f35c':
  Hide/show ime switch icon properly
 2011-11-18 09:15:54 -08:00
Joe Fernandez
7ca2a20463 am dea90a0e: am 366113fa: Merge "docs: Camera Features for developers" into ics-mr0 
* commit 'dea90a0e1c9c1d15657024893b6793dc21bc27ef':
  docs: Camera Features for developers
 2011-11-18 06:17:59 -08:00
Joe Fernandez
eb79157376 am 366113fa: Merge "docs: Camera Features for developers" into ics-mr0 
* commit '366113fa1bea5ef39cf6557f18ff00310eb6e458':
  docs: Camera Features for developers
 2011-11-18 06:14:01 -08:00
Scott Main
df349c6d69 am d353df8d: am 48eaa6c9: docs: update caption for action bar figure to match new screenshot 
* commit 'd353df8db4f51868e1e09463b2c25e3637ad8e95':
  docs: update caption for action bar figure to match new screenshot
 2011-11-18 02:53:00 -08:00
Scott Main
da405c11f2 am 48eaa6c9: docs: update caption for action bar figure to match new screenshot 
* commit '48eaa6c9e5ab224201b17d2ea3e7e43e04c40f3b':
  docs: update caption for action bar figure to match new screenshot
 2011-11-18 02:49:49 -08:00
Jim Miller
8880df5b88 am a8606cf6: am 398f80ea: Merge "Fix 5620754: don\'t show pattern screen after SIM PUK unlock" into ics-mr1 
* commit 'a8606cf661fde3300165f181c5825cf0535adc66':
  Fix 5620754: don't show pattern screen after SIM PUK unlock
 2011-11-18 02:37:49 -08:00
Jamie Gennis
b963e22ca2 am 9da22d2c: am 2ba13186: Merge "SurfaceTexture: fix a bug with buffer reallocation" into ics-mr1 
* commit '9da22d2cc31069d86a92021d8540bb5a77c9591b':
  SurfaceTexture: fix a bug with buffer reallocation
 2011-11-18 02:37:41 -08:00
Jamie Gennis
5ed751f882 am e2fca63a: am c8fd6e30: Merge "EGL: fix blob cache extension detection" into ics-mr1 
* commit 'e2fca63a18c7bd3fb0c14e1c5dc391cd699cea9f':
  EGL: fix blob cache extension detection
 2011-11-18 02:37:39 -08:00
David Brown
0fca47d15f am 7d22534b: am 3f51f954: Merge "Fix a crash caused by SIP addresses containing "%40" instead of "@"" into ics-mr1 
* commit '7d22534b4cba49b1bd9d88969c3189a2c6fecf55':
  Fix a crash caused by SIP addresses containing "%40" instead of "@"
 2011-11-18 02:37:28 -08:00
Jamie Gennis
7bf5a43921 am 0272e600: am a37a78e2: Merge "GLES: add image external enums" into ics-mr1 
* commit '0272e60060162d2c32aec02d9cd1414dbbe14782':
  GLES: add image external enums
 2011-11-18 02:37:22 -08:00
The Android Open Source Project
2286e13978 am 17c01198: am 31b0c687: Reconcile with ics-mr0-release 
* commit '17c011985e53e7513c13bc1ed40aa65222dc660a':
 2011-11-18 02:37:17 -08:00
Daniel Sandler
019837205e am da0e7b0c: Merge "Tie screen saver to the screen off timeout." into ics-mr1 
* commit 'da0e7b0c7a0bb1f9f972c3ed042b8cd752031046':
  Tie screen saver to the screen off timeout.
 2011-11-17 21:04:37 -08:00
Daniel Sandler
ba7232c6b3 Merge "Tie screen saver to the screen off timeout." into ics-mr1 2011-11-17 21:02:40 -08:00
Adam Powell
32f4fe5626 am 8c54182f: Merge "Fix bug 5614962 - Constant spinning wheel in USB Mass Storage screen (UX)" into ics-mr1 
* commit '8c54182f0b6c706adc6247d6f1da7147b357920d':
  Fix bug 5614962 - Constant spinning wheel in USB Mass Storage screen (UX)
 2011-11-17 19:46:19 -08:00
Adam Powell
7be909033d Merge "Fix bug 5614962 - Constant spinning wheel in USB Mass Storage screen (UX)" into ics-mr1 2011-11-17 19:44:14 -08:00
Jim Miller
76e8b77c42 am 70bded0a: Merge "Fix 5636798: clear PIN/PUK fields when device sleeps or user cancels" into ics-mr1 
* commit '70bded0ab8390cb53342f1fb1f1ff9ee56f60e5f':
  Fix 5636798: clear PIN/PUK fields when device sleeps or user cancels
 2011-11-17 18:59:59 -08:00
Jim Miller
8d7d5097bd Merge "Fix 5636798: clear PIN/PUK fields when device sleeps or user cancels" into ics-mr1 2011-11-17 18:58:20 -08:00
Mathias Agopian
a36bcd53ac attempt to fix bug 5313580 
the working theory here is that a Surface object has become non-promotable
because it lost its last reference; later Surface::readFromParcel is called
the previous surface is found in the cache, but can't be promoted. this causes
a new Surface object to be created which will promptly try to connect to the
CPU_API -- this in turn will fail because the previous (now dead) surface is
still connected.

To fix this, we make sure to disconnect from the SurfaceTexture when
Surface[TextureClient] is destroyed.

Change-Id: I422234868a05d7b7d283e9d5a85f7ab79e65d8a9
 2011-11-17 18:46:09 -08:00
Guang Zhu
fcdec25c95 am 3af8b699: Merge "add a self instrumentation into framework perf app" into ics-mr1 
* commit '3af8b699830bb5804f3c1b6420d9210b2fd8adb9':
  add a self instrumentation into framework perf app
 2011-11-17 18:06:18 -08:00
Guang Zhu
61075b4564 Merge "add a self instrumentation into framework perf app" into ics-mr1 2011-11-17 18:04:23 -08:00
satok
1d7cf1896c am 1a3c051b: Merge "Hide/show ime switch icon properly" into ics-mr1 
* commit '1a3c051bcc787363d9154da4a8e8e562dda32926':
  Hide/show ime switch icon properly
 2011-11-17 18:03:46 -08:00
satok
65cf532660 Merge "Hide/show ime switch icon properly" into ics-mr1 2011-11-17 18:02:09 -08:00
The Android Automerger
16c5623075 merge in ics-mr0-release history after reset to ics-mr0 2011-11-17 17:49:17 -08:00
Jim Miller
ae42882ea0 am 398f80ea: Merge "Fix 5620754: don\'t show pattern screen after SIM PUK unlock" into ics-mr1 
* commit '398f80eacb8e59d868f287bf273a1253fe219ce4':
  Fix 5620754: don't show pattern screen after SIM PUK unlock
 2011-11-17 17:44:37 -08:00
Jim Miller
6448220d01 Merge "Fix 5620754: don't show pattern screen after SIM PUK unlock" into ics-mr1 2011-11-17 17:41:50 -08:00
Joe Fernandez
7fd720cd0b Merge "docs: Camera Features for developers" into ics-mr0 2011-11-17 17:34:33 -08:00
Jamie Gennis
a1d589eafc am 2ba13186: Merge "SurfaceTexture: fix a bug with buffer reallocation" into ics-mr1 
* commit '2ba13186b268de3527af6da1933a4b65877548d9':
  SurfaceTexture: fix a bug with buffer reallocation
 2011-11-17 17:11:59 -08:00
Jamie Gennis
5ef898dd37 am c8fd6e30: Merge "EGL: fix blob cache extension detection" into ics-mr1 
* commit 'c8fd6e3057a98a992b96c2bce3fa2a981c6e45c0':
  EGL: fix blob cache extension detection
 2011-11-17 17:11:57 -08:00
Jamie Gennis
e984dd11c1 Merge "SurfaceTexture: fix a bug with buffer reallocation" into ics-mr1 2011-11-17 17:10:47 -08:00
Jamie Gennis
0f83b2f976 Merge "EGL: fix blob cache extension detection" into ics-mr1 2011-11-17 17:10:32 -08:00
David Brown
99d14fc65c am 3f51f954: Merge "Fix a crash caused by SIP addresses containing "%40" instead of "@"" into ics-mr1 
* commit '3f51f954948caf1fe5b3f175f7e8523f2ba58f58':
  Fix a crash caused by SIP addresses containing "%40" instead of "@"
 2011-11-17 16:32:52 -08:00
David Brown
6ebf5e1f4a Merge "Fix a crash caused by SIP addresses containing "%40" instead of "@"" into ics-mr1 2011-11-17 16:31:10 -08:00
Jamie Gennis
aaa3ecff4b SurfaceTexture: fix a bug with buffer reallocation 
This change fixes an issue involving buffer reallocation and the
ALLOW_DEQUEUE_CURRENT_BUFFER mode in SurfaceTexture.  The bug happened
when the buffer slot currently attached to the GL texture was selected
for dequeuing, but the dequeue operation caused the buffer to be
reallocated.  Because the buffer is new, the image producer could fill
the buffer and queue it before an updateTexImage call, which would
result in the "slot %d is current" error in queueBuffer.

Bug: 5631630
Change-Id: Icdd8bc5cad3c7db43953446d9be2603aaea11a8d
 2011-11-17 16:00:44 -08:00
Scott Main
f330e6eb66 am ff31a5b1: am 85c73948: am 08d40d71: Merge "docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised 
* commit 'ff31a5b1566a7a3eaaf75fa67db11b8cadacf453':
  docs: Big update to action bar guide for ICS. Added section for action provider, new APIs for handsets such as split action bar, more information and diagrams for up navigation, guidelines for picking action items, revised sample code and discussion for tabs, add expandible action view info, and expanded discussion for customizing action bar styles bug:4726917
 2011-11-17 15:56:43 -08:00
Bill Gruber
80f1f52968 am dbda791f: am be0dab48: am 69e24843: Merge "Licensing docs: clarifies server response for draft apps Bug 2900690" into ics-mr0 
* commit 'dbda791f3a77449b023fe0062895510e95da73dd':
  Licensing docs: clarifies server response for draft apps Bug 2900690
 2011-11-17 15:56:41 -08:00
Bill Gruber
cbe4f9ea59 am 50c6dd0f: am 9d3dffc7: am ef20eb25: Merge "Filters docs: removes references to forward-locking Bug 3055286" into ics-mr0 
* commit '50c6dd0fd5f7842bfbdc54ddbb134be883b52c41':
  Filters docs: removes references to forward-locking Bug 3055286
 2011-11-17 15:56:39 -08:00
Scott Main
f721cb2e6b am 309643d9: am fa847110: am 7d4c4721: docs: add sums/sizes for adt 15.0.1 
* commit '309643d93afd877b279acbe298b2258b62f67f53':
  docs: add sums/sizes for adt 15.0.1
 2011-11-17 15:56:37 -08:00