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

37438 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gloria Wang
676f7e146c resolved conflicts for merge of 845fdba7 to master 
Change-Id: I716b6ceb03bd733f9e7f49008112c8f2c53ad9ce
 2011-08-04 15:13:14 -07:00
Gloria Wang
70652d0c7f am 8a6fb50d: am 4e197ea8: am e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward Lock Agent" 
* commit '8a6fb50d69ec40a413b117bc9145a97ec427852f':
  Bug fixes in OMA DRM v1 Forward Lock Agent
 2011-08-04 14:47:43 -07:00
Gloria Wang
7d4af3fefc am 4e197ea8: am e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward Lock Agent" 
* commit '4e197ea8a6c5d5f4393a474591cccdd3fa27ecde':
  Bug fixes in OMA DRM v1 Forward Lock Agent
 2011-08-04 14:36:45 -07:00
Gloria Wang
fe70827b1b am e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward Lock Agent" 
* commit 'e15a73ee4c9a28d89888095c7649a70c116ee160':
  Bug fixes in OMA DRM v1 Forward Lock Agent
 2011-08-04 14:33:06 -07:00
Gloria Wang
0e3e14faf6 Merge "Bug fixes in OMA DRM v1 Forward Lock Agent" 2011-08-04 14:20:53 -07:00
Jean-Michel Trivi
50036a5a9e Merge "Remove empty remote control client listener methods" 2011-08-04 14:10:57 -07:00
Adam Powell
95a7ac1eba Merge "Fix bug 5121406 - ActionBar.setLogo" 2011-08-04 13:21:07 -07:00
Chia-chi Yeh
30dea96605 Merge "VPN: move away from the VPN permission." 2011-08-04 13:04:51 -07:00
Andreas Huber
5446426a6c Merge "Restart HLS streaming from the bottom of the playlist if we miss the boat on the" 2011-08-04 12:57:45 -07:00
Xavier Ducrohet
1095798aa4 am 23ce76ce: am 320834c9: am b9e8b25e: am 6b3a0123: Merge "Insert a break wraparound." 
* commit '23ce76ce1666e5e8b0b17825c271b133ba2626d6':
  Insert a break wraparound.
 2011-08-04 12:56:46 -07:00
Xavier Ducrohet
3db323b39a am 320834c9: am b9e8b25e: am 6b3a0123: Merge "Insert a break wraparound." 
* commit '320834c9e02364b39b98b610f1d2244cbb9a4f26':
  Insert a break wraparound.
 2011-08-04 12:54:49 -07:00
Xavier Ducrohet
480f4bbb2b am b9e8b25e: am 6b3a0123: Merge "Insert a break wraparound." 
* commit 'b9e8b25e9066d6f2da0635eaac524246b729fbfa':
  Insert a break wraparound.
 2011-08-04 12:52:34 -07:00
Xavier Ducrohet
1966e6faeb am 6b3a0123: Merge "Insert a break wraparound." 
* commit '6b3a0123486e729aca7e7de0c3a78c4c3300d0c9':
  Insert a break wraparound.
 2011-08-04 12:50:11 -07:00
Xavier Ducrohet
a62b24752b Merge "Insert a break wraparound." 2011-08-04 12:36:11 -07:00
Xavier Ducrohet
9cd98f0baf Merge "Layoutlib: implement Resources.getBoolean(int)." 2011-08-04 12:18:17 -07:00
Adam Powell
8fcc0ac4d4 Merge "Fix bug 5073637 - Market apps crashing FastScroller" 2011-08-04 10:51:57 -07:00
Irfan Sheriff
5df6d321ab Merge "Fix p2p package paths" 2011-08-04 10:29:23 -07:00
Fabrice Di Meglio
589de759b6 Merge "Fix bug #5114358 If writing Numbers with Hebrew & Arabic keyboard, they appear as LTR" 2011-08-04 10:09:24 -07:00
Daniel Sandler
58f5f47c99 Merge "Log some signal condition diagnostics for now." 2011-08-04 09:56:53 -07:00
Daniel Sandler
cf02dbf32b Merge "Crushing Dreams." 2011-08-04 09:46:45 -07:00
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