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

37418 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Lockwood
7a4d2a6be7 Merge "Resolve merge conflict for '75f1fdec':" 2011-08-04 09:46:09 -07:00
Russell Brenner
37100faf99 Merge "Adapt TextLayoutCache for new Harfbuzz scripts" 2011-08-04 09:41:53 -07:00
Debashish Chatterjee
d2498c1141 Merge "Removed permission READ_WRITE_OWN_VOICEMAIL from framework/base." 2011-08-04 09:34:25 -07:00
Daniel Sandler
4d0a91ae52 Merge "Fix NPE on first-ever boot if display has rotated." 2011-08-04 08:46:20 -07:00
Daniel Sandler
d88b6bae15 Merge "Restore DISABLE_NOTIFICATION_ICONS." 2011-08-04 08:44:51 -07:00
Mike Lockwood
d5f8e3b3d7 Resolve merge conflict for '75f1fdec': 
GPS Provider Service changes

    GPS engine needs to receive network state changes from Android fw.

    Added db query for the current APN, also added a new parameter
    between JNI / HAL to the new method in AGpsRilInterface struct
    for gps engine to receive APN from GPSLocationService

Conflicts:
	services/java/com/android/server/location/GpsLocationProvider.java

Change-Id: I33c45027f1571493d3525324f62d199517c4960c
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-08-04 11:40:25 -04:00
Mike Lockwood
f35da8f2e7 am 0b3af353: am a82ee49a: am 8f5dd9ad: Merge "GPS Provider Service changes" 
* commit '0b3af353dcf61177158934a11404cf2914038696':
  GPS Provider Service changes
 2011-08-04 07:53:53 -07:00
Mike Lockwood
1631bf5358 am a82ee49a: am 8f5dd9ad: Merge "GPS Provider Service changes" 
* commit 'a82ee49a7b130ffe3199a488c7bb0ca4464af64c':
  GPS Provider Service changes
 2011-08-04 07:51:38 -07:00
Mike Lockwood
c2c411d9cf am 8f5dd9ad: Merge "GPS Provider Service changes" 
* commit '8f5dd9ad3f98d97d2862b57ba8cd961d2201e40c':
  GPS Provider Service changes
 2011-08-04 07:48:57 -07:00
Mike Lockwood
fca789ba5f Merge "GPS Provider Service changes" 2011-08-04 07:39:03 -07:00
Svetoslav Ganov
3db689807a Merge "Removing firing of spurious scroll accesibility events." 2011-08-04 05:55:46 -07:00
Svetoslav Ganov
da402c99d4 Merge "No selection or click accessibility events are fired when a list item is tapped." 2011-08-04 05:55:26 -07:00
Wu-cheng Li
4c1b60afcf Merge "Add camera bayer image format." 2011-08-04 01:46:56 -07:00
Jim Miller
74386faca7 Merge "Fix 5044158: layout and asset work on lockscreen PIN mode" 2011-08-03 19:41:45 -07:00
Dianne Hackborn
dc40767874 Merge "Whoops also need to move notification shade above lock screen." 2011-08-03 18:58:04 -07:00
Mike Lockwood
07840d31c3 Merge "UsbDeviceManager: Fix typo that broke adb on/off setting persistence" 2011-08-03 18:35:33 -07:00
Mike Lockwood
ac24c3322f Merge "Add support for localizing order of day of week and date in status bar date view" 2011-08-03 18:35:23 -07:00
Jaikumar Ganesh
d04f92994c Merge "Fix PAN bug for reverse tethering." 2011-08-03 18:15:11 -07:00
Mathias Agopian
942f55b63e Merge changes I689cb0c0,I09603218 
* changes:
  Add a 'release' method to the SurfaceTexture public Java API
  Mark Window-Manager-specific APIs on android.view.Surface as @hide
 2011-08-03 18:12:36 -07:00
Jean-Baptiste Queru
e02532bb6e am a598d144: am 3a5e36f9: (-s ours) am 98c531dc: am 9b0c6bee: Merge "Fix a compiling error when trying to use setBufferCount" 
* commit 'a598d144e8c9722ff83e38cd8a70bc15a00bcdf3':
  Fix a compiling error when trying to use setBufferCount
 2011-08-03 17:42:20 -07:00
Christopher Tate
1bccb33902 Merge "Make backup/restore confirmation UI landscape-friendly" 2011-08-03 17:37:56 -07:00
Matthew Xie
7f25277761 Merge "Add a timeout for disconnecting devices to recover from error situation" 2011-08-03 17:31:11 -07:00
Chris Craik
0181f4639f Merge "TileBenchmark label addition" 2011-08-03 17:29:03 -07:00
Mathias Agopian
97a9884edc Add a 'release' method to the SurfaceTexture public Java API 
Bug: 5063618
Change-Id: I689cb0c01c14e597ccfb4eb0972e64fa570bd4e8
 2011-08-03 17:23:44 -07:00
Jaikumar Ganesh
e037f1d268 Merge "Enforce permission for changeApplicationState function." 2011-08-03 17:20:52 -07:00
Romain Guy
2a44444c61 Merge "Added Device Default Themes." 2011-08-03 17:16:02 -07:00
Kenny Root
eda7ef913c Merge "Better error codes for missing files" 2011-08-03 17:09:38 -07:00
Jeff Sharkey
6da6ceab18 Merge "Expose quota status for active network." 2011-08-03 17:05:21 -07:00
Adam Powell
ada048e411 Merge "Fix bug 5044737 - Compatibility menus should be as wide as the screen width" 2011-08-03 16:57:07 -07:00
Romain Guy
3d96e2b459 Merge "Destroy the EGL surface when the ViewRootImpl surface is invalid Bug #5109839" 2011-08-03 16:23:35 -07:00
Philip Milne
1c613f3a4a Merge "Tidy." 2011-08-03 16:01:59 -07:00
Chia-chi Yeh
deaa0767bf Merge "NativeDaemonConnector: offload callbacks to another thread." 2011-08-03 15:53:43 -07:00
Gloria Wang
b62f631b0e Merge "Check the syncword for each frame. Fix for bug 5117233." 2011-08-03 15:37:24 -07:00
Gilles Debunne
cc59cf01f8 Merge "A tap on the insertion handle is only handled if it has not been moved" 2011-08-03 15:01:50 -07:00
Dianne Hackborn
adefc31fde Merge "Put back the status bar animations." 2011-08-03 14:01:55 -07:00
Gilles Debunne
a99b1ff4d4 Merge "Bug 5050963: Suggestion popup moves with its associated TextView" 2011-08-03 13:58:49 -07:00
Adam Powell
03a8c42ad9 Merge "Fix bug 5093394 - Double SearchView!! What does it mean!?" 2011-08-03 12:16:58 -07:00
Eric Laurent
05f267e7f8 Merge "AudioService: ignore NOTIFICATIONS_USE_RING_VOLUME." 2011-08-03 11:51:55 -07:00
Eric Laurent
0d67913fae Merge "AudioFlinger: disable AEC and NS with BT headsets" 2011-08-03 11:51:35 -07:00
Jaikumar Ganesh
d77b53819a Merge "Fix PAN bugs." 2011-08-03 11:16:18 -07:00
Romain Guy
5ddbaaa6af Merge "Don't recreate the EGL surface if the surface is not ready Bug #5114545" 2011-08-03 11:16:01 -07:00
Steve Block
0dd8610fe6 Merge "In DeviceMotionService, handle the fact that we may receive updates from SensorManager after unregistering." 2011-08-03 10:48:07 -07:00
Eric Laurent
83254305fa Merge "Audio Effect Framework: add effect suspend/restore" 2011-08-03 10:38:04 -07:00
Chris Craik
733b4ad816 Merge "Added automated performance test to TileBenchmark" 2011-08-03 09:46:15 -07:00
Jean-Michel Trivi
aefc8e890f Merge "Remote control display API and implementation" 2011-08-03 09:09:43 -07:00
Debashish Chatterjee
424873aa8a Merge "Step1 of renaming READ_WRITE_OWN_VOICEMAIL to ADD_VOICEMAILS." 2011-08-03 06:06:30 -07:00
Dianne Hackborn
1b123b8d19 Merge "Reduce memory usage of status bar expanded view." 2011-08-02 22:48:16 -07:00
Adam Powell
98b88724a9 Merge "Fix bug 5098288 - Rethink the suite of new themes" 2011-08-02 18:44:50 -07:00
Mathias Agopian
b7f8310d9a Merge "fix a crasher in surfaceflinger" 2011-08-02 18:31:08 -07:00
Mathias Agopian
e8067a7d99 fix a crasher in surfaceflinger 
this would happen if being told to draw before a buffer
was available.

Change-Id: I46d121c73e883078cdbf952063e38b0076f79038
 2011-08-02 18:29:57 -07:00