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

32860 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
9742d26c3f am 5b68c655: Merge "docs: update makefile to show javadocs diffs for api level 12" into honeycomb-mr1 
* commit '5b68c655a1f56dce1ffd6f175e991dd542d415cf':
  docs: update makefile to show javadocs diffs for api level 12
 2011-03-30 12:12:15 -07:00
Scott Main
d3f76e9527 Merge "docs: update makefile to show javadocs diffs for api level 12" into honeycomb-mr1 2011-03-30 12:10:13 -07:00
Fabrice Di Meglio
eecf977237 Merge "Fix text redering issue where the text was sometimes truncated" 2011-03-30 12:01:52 -07:00
Adam Powell
17d0c3d0b5 Merge "Fix public issue 15862: Theme Theme.Holo.Light.NoActionBar not available for use" 2011-03-30 11:48:58 -07:00
Winson Chung
94bcdfe130 Merge "Deprecating old RemoteViews API which takes appWidgetId when setting the RemoteViewsAdapter intent." 2011-03-30 11:44:08 -07:00
Andreas Huber
6ff4ea30b9 Merge "Stagefright DataSources now expose the underlying content mime type." 2011-03-30 11:26:04 -07:00
Eric Fischer
8ee2f9df92 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-03-30 10:41:05 -07:00
Andreas Huber
6f25ac9922 am 8de5df43: am ebf6a72b: Merge "Surfaceflinger expects rectangles to be specified right/bottom edge exclusive." into honeycomb-mr1 
* commit '8de5df439244e77d7892deceb86520551ff0499c':
  Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.
 2011-03-30 09:34:15 -07:00
Jeff Hamilton
105d6527dd am 96cf34d3: Merge "Make STOP_APP_SWITCHES signatureOrSystem." into gingerbread 
* commit '96cf34d362a1666683e813af915e4f6e0d1b38a0':
  Make STOP_APP_SWITCHES signatureOrSystem.
 2011-03-30 09:30:40 -07:00
Irfan Sheriff
51af9642fd am 05f14e2b: Merge "DO NOT MERGE Pick upstream intf with valid IP conf" into gingerbread 
* commit '05f14e2bcf78be62b35e85902408ea66103a3881':
  DO NOT MERGE Pick upstream intf with valid IP conf
 2011-03-30 09:30:32 -07:00
Robert Greenwalt
4f90fda71f am 568845a7: Merge "Fix some alt-network issues." into gingerbread 
* commit '568845a766cddc4e4c222b4d9de064f8a48da990':
  Fix some alt-network issues.
 2011-03-30 09:30:15 -07:00
Andreas Huber
c56993bd05 am ebf6a72b: Merge "Surfaceflinger expects rectangles to be specified right/bottom edge exclusive." into honeycomb-mr1 
* commit 'ebf6a72b3536646ade389c7afa828e316eb93c21':
  Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.
 2011-03-30 09:27:14 -07:00
Mike Lockwood
7333ff528a Merge "Remove logging from HardwareService flashlight calls" 2011-03-30 09:24:09 -07:00
Andreas Huber
afb643d62c Merge "Surfaceflinger expects rectangles to be specified right/bottom edge exclusive." into honeycomb-mr1 2011-03-30 09:12:04 -07:00
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
Jason parks
00607ddaee Merge "Send out a broadcast that the system is being factory reset." into gingerbread 2011-03-30 08:17:53 -07:00
Jeff Brown
1ca13de1af Merge "Support primitive ALT-TAB style navigation using Recent Apps." 2011-03-30 02:33:44 -07:00
Brian Carlstrom
873c8dafbe Merge "SamplingProfilerIntegration and SamplingProfiler improvements (3/3)" 2011-03-29 22:35:40 -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
Romain Guy
1aed2e3e0b Merge "Move the drawable state to the correct class. Bug #4170455" 2011-03-29 18:33:12 -07:00
Wink Saville
d1790f627a am 8a395624: am fc151b6e: Merge "Cleanup DataConnectionTracker" into honeycomb-LTE 
* commit '8a395624042ed06732703c4e272ad416a45ecf10':
  Cleanup DataConnectionTracker
 2011-03-29 17:00:11 -07:00
Eric Fischer
b6d2b82685 am c9e5464b: (-s ours) am b8c7c66d: am 0664a4b1: am b42e83b1: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit 'c9e5464b06aa6abb8db60094483a0d353515fb67':
  Import revised translations.  DO NOT MERGE
 2011-03-29 16:59:35 -07:00
Eric Fischer
848b96b841 Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2011-03-29 16:59:31 -07:00
Teng-Hui Zhu
c8e2f02ef7 Merge "Add the loading progress UI when buffering" 2011-03-29 16:58:19 -07:00
Amith Yamasani
f04c7cb8cd am 342f38f9: am c1192096: am 7171f5b7: Merge "Fix the javadoc for LocationManager.requestSingleUpdate()" into honeycomb-mr1 
* commit '342f38f9a95e26b20ebaaac6402409beb9ba96f8':
  Fix the javadoc for LocationManager.requestSingleUpdate()
 2011-03-29 16:58:16 -07:00
Christopher Tate
cf88963bb2 Merge "Add view/drawable states for drag-accepting / drag-hovered" 2011-03-29 16:49:46 -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
Dmitry Shmidt
b484ff5edd Merge "bugreport: Add ping wlan gateway, dns1 and dns2 servers" 2011-03-29 16:28:00 -07:00
Jeff Brown
0ff61b259d Merge "Support chorded fallback keys." 2011-03-29 16:19:46 -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
James Dong
46cd8cac6c Merge "Fix missing cross-ref links in the MediaPlayer.java javadoc" 2011-03-29 15:17:47 -07:00
Marco Nelissen
b454f1a52a Merge "Fix media scanner uri handling." 2011-03-29 15:16:55 -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
Jean-Baptiste Queru
825370ebef No-op - reconcile with open-source gingerbread 
Change-Id: I64beb8dfb6f175eb9a160f1145dad3dc323fc98e
 2011-03-29 14:05:53 -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
Andreas Huber
0621746347 Merge "Add a user-agent header to our RTSP requests." 2011-03-29 13:52:15 -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