ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
31,991 Commits 2 Branches 0 Tags 54 MiB
a72cc20564
Commit Graph

31991 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
a72cc20564 am 5e1383f2: am ad663d80: Merge from gingerbread 
* commit '5e1383f25782e553294bca387f3c072073416416':
  egl: fixes for object refcounts
 2011-03-30 08:21:29 -07:00
Brad Fitzpatrick
2f28c6d362 am f7a9b869: am 1e7fb7ae: Merge "Error in compound cache-control header." 
* commit 'f7a9b8691918642db74a667a71028c0a77b527ff':
  Error in compound cache-control header.
 2011-03-30 08:21:23 -07:00
Brad Fitzpatrick
495ff4a370 am b618b2ef: am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils" 
* commit 'b618b2ef8722964730d09a86a06a85ca34df6de4':
  Handle OutOfMemoryError when decoding images in ThumbnailUtils
 2011-03-30 08:20:58 -07:00
Brad Fitzpatrick
cd2b0eefcf am 7a84a60d: am 1a5a2379: Merge "Unregister callback from binder when vibration is removed" 
* commit '7a84a60d569ef7373fbb6418026b935d48fcd7e7':
  Unregister callback from binder when vibration is removed
 2011-03-30 08:20:51 -07:00
Mike Lockwood
78dc1a184e am cd90d1f1: am 44e4b99f: Merge "UsbService: Make USB disconnect handling for accessory mode more robust" into honeycomb-mr1 
* commit 'cd90d1f1173c344738362d24bdc637c355b75645':
  UsbService: Make USB disconnect handling for accessory mode more robust
 2011-03-29 22:17:36 -07:00
Mike Lockwood
80c12241b1 am 44e4b99f: Merge "UsbService: Make USB disconnect handling for accessory mode more robust" into honeycomb-mr1 
* commit '44e4b99f823a6d6131f94e67389b705d3b124c0a':
  UsbService: Make USB disconnect handling for accessory mode more robust
 2011-03-29 22:16:17 -07:00
Mike Lockwood
9870439c00 Merge "UsbService: Make USB disconnect handling for accessory mode more robust" into honeycomb-mr1 2011-03-29 22:14:27 -07:00
Jeff Hamilton
1ad210d328 am ad91eee2: am 9c1ef098: Update the value for the NFC shared UID. 
* commit 'ad91eee2774e18204a14d473242efe5640b91152':
  Update the value for the NFC shared UID.
 2011-03-29 16:28:49 -07:00
The Android Open Source Project
db14ee1cc2 am ad663d80: Merge from gingerbread 
* commit 'ad663d8040ddd4f3e537117847f20d42797b429e':
  egl: fixes for object refcounts
 2011-03-29 15:23:08 -07:00
Wink Saville
91b0466585 am fc151b6e: Merge "Cleanup DataConnectionTracker" into honeycomb-LTE 
* commit 'fc151b6eb4a682510f3591879037b524bc8d59d0':
  Cleanup DataConnectionTracker
 2011-03-29 15:12:22 -07:00
Wink Saville
2e7c89b84a Merge "Cleanup DataConnectionTracker" into honeycomb-LTE 2011-03-29 14:44:56 -07:00
Eric Fischer
00743cc67f am b8c7c66d: am 0664a4b1: am b42e83b1: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit 'b8c7c66de23b9b20f3992722bb5e346d8e12dd0e':
  Import revised translations.  DO NOT MERGE
 2011-03-29 14:19:51 -07:00
Eric Fischer
2ffee604fa am 0664a4b1: am b42e83b1: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit '0664a4b18c3dcea82891a7389976a9d62ac7bc61':
  Import revised translations.  DO NOT MERGE
 2011-03-29 14:15:22 -07:00
Amith Yamasani
2bd70ca87e am c1192096: am 7171f5b7: Merge "Fix the javadoc for LocationManager.requestSingleUpdate()" into honeycomb-mr1 
* commit 'c1192096627f2f9da534cb8ab7b449d6ea82123f':
  Fix the javadoc for LocationManager.requestSingleUpdate()
 2011-03-29 14:10:32 -07:00
Eric Fischer
270c1a567d am b42e83b1: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit 'b42e83b1eccfd1fa1e02cd0c30edfc06e05de995':
  Import revised translations.  DO NOT MERGE
 2011-03-29 14:07:14 -07:00
Amith Yamasani
533b7eb13c am 7171f5b7: Merge "Fix the javadoc for LocationManager.requestSingleUpdate()" into honeycomb-mr1 
* commit '7171f5b7d16e9a0c861cc249188864385877077f':
  Fix the javadoc for LocationManager.requestSingleUpdate()
 2011-03-29 14:06:29 -07:00
Amith Yamasani
e509e5e805 Merge "Fix the javadoc for LocationManager.requestSingleUpdate()" into honeycomb-mr1 2011-03-29 13:55:19 -07:00
The Android Open Source Project
1a1b70fbfa Merge from gingerbread 
Change-Id: I31e3da083b642d5c7cf6332095fa228b840ee7bb
 2011-03-29 13:54:43 -07:00
Eric Fischer
e138d6753f Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-03-29 13:45:03 -07:00
Michael I. Gold
894c1459c1 egl: fixes for object refcounts 
eglMakeCurrent() would only deref the previous surfaces if the old and
new contexts were the same.  eglTerminate() should not touch TLS.
eglReleaseThread() needs to unbind the current context.

Change-Id: I7f4c090a287ee1e29e4708ae10679fb9d7d8c8c5
Related-Bug: 2964479
 2011-03-29 13:43:54 -07:00
Bart Sears
5116244797 am 35137d66: (-s ours) am 6a19759c: Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread 
* commit '35137d669681a0d6a22316c035ea7c8edc8fdc33':
  Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread
 2011-03-29 13:19:07 -07:00
Huahui Wu
ec3a0e5ef6 am 772f5bb1: (-s ours) am f440831d: DO NOT MERGE 
* commit '772f5bb1894710b0f0068d4f34e85ce38becc4b6':
  DO NOT MERGE
 2011-03-29 13:19:01 -07:00
Eric Fischer
711b114c19 am bc2489e4: am f5cedbe5: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'bc2489e4c55ca7ae06afe1f3449135aa48359165':
  Import revised translations.  DO NOT MERGE
 2011-03-29 12:27:29 -07:00
Eric Fischer
b358e1c9e4 am f5cedbe5: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'f5cedbe508c46c27a6ce1554aed919bfbfc6fc4e':
  Import revised translations.  DO NOT MERGE
 2011-03-29 12:20:42 -07:00
Eric Fischer
09f54780c0 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-29 12:16:53 -07:00
Brad Fitzpatrick
eb797b1fd5 am 1e7fb7ae: Merge "Error in compound cache-control header." 
* commit '1e7fb7aed7b00cebc8f0e501c911727af6527523':
  Error in compound cache-control header.
 2011-03-29 09:27:16 -07:00
Brad Fitzpatrick
13e41db3a1 Merge "Error in compound cache-control header." 2011-03-29 08:55:02 -07:00
Brad Fitzpatrick
6462cb9ca7 am 6f67e7bf: am 2e383bc6: Merge "Making it possible to call SIP calls with special allowed chars." 
* commit '6f67e7bf831147257e078dd72a22f2e43e009122':
  Making it possible to call SIP calls with special allowed chars.
 2011-03-29 08:45:30 -07:00
Brad Fitzpatrick
daf1df6b4e am a4206029: am 5d5a0ca5: Merge "Fixing the wrong link in YuvImage JavaDoc." 
* commit 'a4206029cbb8f6c02c47db52f84b7d52e154e35a':
  Fixing the wrong link in YuvImage JavaDoc.
 2011-03-29 08:45:20 -07:00
Bill Gruber
c7578958fd am 0b0dbea0: am e4f33617: am faede250: IAB doc update for final launch 
* commit '0b0dbea0bc38087dfa3e82b91c0381154bb8bdfd':
  IAB doc update for final launch
 2011-03-29 00:06:18 -07:00
Bill Gruber
e170d21bce am e4f33617: am faede250: IAB doc update for final launch 
* commit 'e4f33617c3654bdcb246ee8f74e67d1828cd42c9':
  IAB doc update for final launch
 2011-03-29 00:00:37 -07:00
Bill Gruber
aea82d0332 am faede250: IAB doc update for final launch 
* commit 'faede250301e291a060d094c73a25a351f96cbb5':
  IAB doc update for final launch
 2011-03-28 23:48:34 -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
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
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
Brad Fitzpatrick
7dba70e98f am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils" 
* commit 'f0dbf00d37c349e8c615045876d6bc89b6bb8c54':
  Handle OutOfMemoryError when decoding images in ThumbnailUtils
 2011-03-28 08:26:02 -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
Brad Fitzpatrick
587b9dc7b6 am 1a5a2379: Merge "Unregister callback from binder when vibration is removed" 
* commit '1a5a2379eb3a6cf16fb153aecbc4ac9e85d3ed42':
  Unregister callback from binder when vibration is removed
 2011-03-28 08:15:35 -07:00
Brad Fitzpatrick
199f567fc7 Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils" 2011-03-28 08:13:08 -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
Brad Fitzpatrick
a57bf3d09b Merge "Unregister callback from binder when vibration is removed" 2011-03-28 07:59:08 -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
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
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