ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity
32,516 Commits 2 Branches 0 Tags 54 MiB
15adb601ed
Commit Graph

32516 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Iliyan Malchev
15adb601ed Merge "frameworks/base: some camera-interface cleanup" 2011-03-28 17:07:02 -07:00
Wink Saville
8858c325b5 am 94a19db5: am 59d1b26a: Merge "DataConnectionTracker cleanup when disposed." into honeycomb-LTE 
* commit '94a19db5a78d3f43b01fa10bd09788f68debbcab':
  DataConnectionTracker cleanup when disposed.
 2011-03-28 12:15:28 -07:00
Wink Saville
c35acb7faf am 59d1b26a: Merge "DataConnectionTracker cleanup when disposed." into honeycomb-LTE 
* commit '59d1b26a6a4b9b2de829d62af2179f57deb79391':
  DataConnectionTracker cleanup when disposed.
 2011-03-28 12:13:22 -07:00
Wink Saville
7e0531e7ab Merge "DataConnectionTracker cleanup when disposed." into honeycomb-LTE 2011-03-28 12:11:42 -07:00
Mike Lockwood
71ab200776 am 038c7297: am b115807a: am 7661dd8d: Merge "UsbService: Fix JNI local reference leaks in the USB host support code" into honeycomb-mr1 
* commit '038c7297c9e2e4b6cdb490ac9fe7102da434278a':
  UsbService: Fix JNI local reference leaks in the USB host support code
 2011-03-28 11:04:29 -07:00
Mike Lockwood
600bbc5667 am b115807a: am 7661dd8d: Merge "UsbService: Fix JNI local reference leaks in the USB host support code" into honeycomb-mr1 
* commit 'b115807aaf0fc6326903302be9bd9ff3877fa968':
  UsbService: Fix JNI local reference leaks in the USB host support code
 2011-03-28 11:02:58 -07:00
Mike Lockwood
dcc1d18101 am 7661dd8d: Merge "UsbService: Fix JNI local reference leaks in the USB host support code" into honeycomb-mr1 
* commit '7661dd8de10d2400cedc421358c4261556b2b5c8':
  UsbService: Fix JNI local reference leaks in the USB host support code
 2011-03-28 11:00:33 -07:00
Mike Lockwood
00aace4934 Merge "UsbService: Fix JNI local reference leaks in the USB host support code" into honeycomb-mr1 2011-03-28 10:58:03 -07:00
Andreas Huber
c9832f271f am a4a81aef: am e7cedad2: am 2edbdcc6: Merge "After a seek there\'s a brief period where audio time isn\'t reestablished." into honeycomb-mr1 
* commit 'a4a81aef39b15649bda146476d98f23ac554887f':
  After a seek there's a brief period where audio time isn't reestablished.
 2011-03-28 08:34:06 -07:00
Andreas Huber
0e4a59ea2c am e7cedad2: am 2edbdcc6: Merge "After a seek there\'s a brief period where audio time isn\'t reestablished." into honeycomb-mr1 
* commit 'e7cedad2b8408a13c610f3a7fcf13597a432a37d':
  After a seek there's a brief period where audio time isn't reestablished.
 2011-03-28 08:26:21 -07:00
Andreas Huber
9de7d2bb83 am 2edbdcc6: Merge "After a seek there\'s a brief period where audio time isn\'t reestablished." into honeycomb-mr1 
* commit '2edbdcc6f2572e5f84253617b1850908344b3f8c':
  After a seek there's a brief period where audio time isn't reestablished.
 2011-03-28 08:16:52 -07:00
Andreas Huber
1689095fc5 Merge "After a seek there's a brief period where audio time isn't reestablished." into honeycomb-mr1 2011-03-28 08:11:26 -07:00
Wink Saville
c583ce5e90 am 238b5c4e: am 9eac2c07: Merge "Work around for operator not being correct." into honeycomb-LTE 
* commit '238b5c4e8470c51582ed53e3987626720ab4c013':
  Work around for operator not being correct.
 2011-03-26 16:55:23 -07:00
Wink Saville
00671ec75a am 9c2c7ace: am 3420f85c: Merge "Add some debug to apn list creation routines." into honeycomb-LTE 
* commit '9c2c7ace9e5658cb2c16b6e720ac39ea349d5921':
  Add some debug to apn list creation routines.
 2011-03-26 16:53:32 -07:00
Wink Saville
bf9c5db48a am 9eac2c07: Merge "Work around for operator not being correct." into honeycomb-LTE 
* commit '9eac2c077a92a95d0b7a9c766d4c6ee92f625d2e':
  Work around for operator not being correct.
 2011-03-26 16:52:53 -07:00
Wink Saville
b5bfa6fcbf am 3420f85c: Merge "Add some debug to apn list creation routines." into honeycomb-LTE 
* commit '3420f85cc65af8e3ec6c651667c8cffbac60ba4e':
  Add some debug to apn list creation routines.
 2011-03-26 16:51:13 -07:00
Wink Saville
dd767313f9 Merge "Work around for operator not being correct." into honeycomb-LTE 2011-03-26 16:50:17 -07:00
Wink Saville
bbeec2416e Merge "Add some debug to apn list creation routines." into honeycomb-LTE 2011-03-26 16:48:35 -07:00
Ramesh Sudini
8fd362867c am 2f4f92a9: am fbe284b6: Telephony: Fix eHRPD Service State Mapping. 
* commit '2f4f92a9974de34aa62974335e700a554426d0c2':
  Telephony: Fix eHRPD Service State Mapping.
 2011-03-26 09:30:25 -07:00
Ramesh Sudini
5d7baa8926 am fbe284b6: Telephony: Fix eHRPD Service State Mapping. 
* commit 'fbe284b6756b44819e9f4d13938bad06b238d112':
  Telephony: Fix eHRPD Service State Mapping.
 2011-03-26 09:23:23 -07:00
Dirk Dougherty
f203a98e1b am 538626ec: am 79da5c2d: am 0b9bacc6: am 085baa2c: Doc change: Fix scale on highlights screen shots. 
* commit '538626ec0f9e05a0a4720c930cb380babdfdd9f9':
  Doc change: Fix scale on highlights screen shots.
 2011-03-25 19:29:51 -07:00
Dirk Dougherty
5b22cde5cc am 79da5c2d: am 0b9bacc6: am 085baa2c: Doc change: Fix scale on highlights screen shots. 
* commit '79da5c2da018a2066b7e5d6e8de0c03d00c20492':
  Doc change: Fix scale on highlights screen shots.
 2011-03-25 19:27:18 -07:00
Dirk Dougherty
16b0d813eb am 0b9bacc6: am 085baa2c: Doc change: Fix scale on highlights screen shots. 
* commit '0b9bacc69314fc6480d1ebe67b7ee0d0aebca5c0':
  Doc change: Fix scale on highlights screen shots.
 2011-03-25 19:25:45 -07:00
Mathias Agopian
2c34b78b50 Merge "merge libsurfaceflinger_client into libgui" 2011-03-25 19:25:32 -07:00
Dirk Dougherty
f0da05a075 am 085baa2c: Doc change: Fix scale on highlights screen shots. 
* commit '085baa2cc3f2d23523377b1df390cec5d3bf1445':
  Doc change: Fix scale on highlights screen shots.
 2011-03-25 19:22:55 -07:00
Mathias Agopian
d87f162026 merge libsurfaceflinger_client into libgui 
this is the first step in unifying surfacetexture and surface.
for this reason the header files were not moved, as most of them
will eventually go away.

NOTE: currently we keep libsurfaceflinger_client.so as an empty
library to workaround prebuilt binaries wrongly linking against
it.

Change-Id: I130f0de2428e8579033dc41394d093f4e1431a00
 2011-03-25 18:42:40 -07:00
Nick Pelly
325a9552de am a585eb17: am 14923862: am e69f4267: Merge "NfcAdapterExtras: reset singleton state if initialization fails." into gingerbread 
* commit 'a585eb17aba237b6de393b9fb88e03b996cb63c1':
  NfcAdapterExtras: reset singleton state if initialization fails.
 2011-03-25 16:39:06 -07:00
Andreas Huber
75e4008033 am e2cb08bd: am 2fee96bc: am 1457ef74: Merge "Make sure we post a video event when seeking after seeing video EOS before." into honeycomb-mr1 
* commit 'e2cb08bd4c3bc7e7045e107af41f7228d780be04':
  Make sure we post a video event when seeking after seeing video EOS before.
 2011-03-25 16:38:57 -07:00
Nick Pelly
5c0652d4f3 am 14923862: am e69f4267: Merge "NfcAdapterExtras: reset singleton state if initialization fails." into gingerbread 
* commit '14923862577ef785d20fc5c627248897c9eaddb6':
  NfcAdapterExtras: reset singleton state if initialization fails.
 2011-03-25 15:51:42 -07:00
Andreas Huber
254b763c97 am 2fee96bc: am 1457ef74: Merge "Make sure we post a video event when seeking after seeing video EOS before." into honeycomb-mr1 
* commit '2fee96bcc057d9b5a9ac912af79fd838f5a42964':
  Make sure we post a video event when seeking after seeing video EOS before.
 2011-03-25 15:40:56 -07:00
Andreas Huber
636a44a11a am 1457ef74: Merge "Make sure we post a video event when seeking after seeing video EOS before." into honeycomb-mr1 
* commit '1457ef74d49ee56097ad97cc078e898326beb7db':
  Make sure we post a video event when seeking after seeing video EOS before.
 2011-03-25 15:38:34 -07:00
Andreas Huber
8c46bc35a6 Merge "Make sure we post a video event when seeking after seeing video EOS before." into honeycomb-mr1 2011-03-25 15:33:58 -07:00
satok
d3f9a53bff Merge "Removed APIs for setCorrectionSpan from InputConnection" 2011-03-25 15:22:15 -07:00
Jeff Brown
1ad21b6e4d Merge "Fix focused application handle." 2011-03-25 15:09:55 -07:00
Adam Powell
447b7a2407 am 7dfc6a9e: am c8c78eed: am baa3380d: Fix bug 4170809 - Pages with flash lose touch events 
* commit '7dfc6a9e322e9c0367a6372b25694d926d79a618':
  Fix bug 4170809 - Pages with flash lose touch events
 2011-03-25 14:54:10 -07:00
Stephen Hines
025b0f2530 Merge "Properly handle script teardown." 2011-03-25 14:52:22 -07:00
Adam Powell
1c83f574ce am c8c78eed: am baa3380d: Fix bug 4170809 - Pages with flash lose touch events 
* commit 'c8c78eed52148441a4a549a9a19914bbbde6ad17':
  Fix bug 4170809 - Pages with flash lose touch events
 2011-03-25 14:49:11 -07:00
Adam Powell
c99c6d3544 am baa3380d: Fix bug 4170809 - Pages with flash lose touch events 
* commit 'baa3380d74928baf6a5685c54c719af37171a625':
  Fix bug 4170809 - Pages with flash lose touch events
 2011-03-25 14:45:06 -07:00
Eric Hassold
f702db4bc3 Merge "Make objects collection a member of egl_display object" 2011-03-25 14:42:15 -07:00
Kenny Root
d6cb90fb8b Merge changes Ia7add63e,Ic7571dae 
* changes:
  Split dump and annotate users of mPackages lock
  Split PackageManagerService into subclasses
 2011-03-25 14:41:34 -07:00
Eric Hassold
11c01568c3 Make objects collection a member of egl_display object 
Move EGL objects (contexts, surfaces, ...) collection from global
static into EGL display object. Since EGL implementation currently
supports only one display, this doesn't change current logic. This
aims at preparing for next coming changes in eglTerminate() to
support per-display cleanup.

Bug: 4152714
Change-Id: I5e424781b89c3c275f9922f943463d5f6b1f6bc6
 2011-03-25 14:37:19 -07:00
Gilles Debunne
3182f884d1 Merge "Fix a leak in TextView around ViewTreeObserver" 2011-03-25 11:57:17 -07:00
Adam Cohen
88b9b5ed4a Merge "Modifying RemoteViewsFactory interface" 2011-03-25 11:19:34 -07:00
James Dong
74e888d579 am 70a5b031: am 9fb98238: am 837430dd: Merge "Switch to use SF cached source" into honeycomb-mr1 
* commit '70a5b0317d5029b34be26a423c0ebeaa74b728ed':
  Switch to use SF cached source
 2011-03-25 10:29:20 -07:00
James Dong
cdfb20ceb5 am 9fb98238: am 837430dd: Merge "Switch to use SF cached source" into honeycomb-mr1 
* commit '9fb98238e5837a68fb16bcb9a23469f27124c304':
  Switch to use SF cached source
 2011-03-25 10:27:05 -07:00
James Dong
f518993012 am 837430dd: Merge "Switch to use SF cached source" into honeycomb-mr1 
* commit '837430dd3440f6e71f68ef755399e22386dee084':
  Switch to use SF cached source
 2011-03-25 10:24:44 -07:00
James Dong
c613ed429e Merge "Switch to use SF cached source" into honeycomb-mr1 2011-03-25 10:22:57 -07:00
Gloria Wang
c751b639de am ed7b688c: am aac43ea1: am b8b85ea2: Merge "Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer." into honeycomb-mr1 
* commit 'ed7b688c015dbd064b81dfaed5dd6c7ed6728ac3':
  Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer.
 2011-03-25 10:11:49 -07:00
Gloria Wang
9deed0123f am aac43ea1: am b8b85ea2: Merge "Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer." into honeycomb-mr1 
* commit 'aac43ea193e0cbd440854f3425579f9ff04abac3':
  Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer.
 2011-03-25 10:09:09 -07:00
Gloria Wang
3c2c14bad9 am b8b85ea2: Merge "Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer." into honeycomb-mr1 
* commit 'b8b85ea296b09cfc5f986e8ee38b959776050d43':
  Fix for bug 4126624. Change the mDrmManagerClientImpl to sp to avoid double delete the pointer.
 2011-03-25 10:05:50 -07:00