ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
35,563 Commits 2 Branches 0 Tags 54 MiB
f852a4522f
Commit Graph

35563 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
f852a4522f Merge "may fix build on some version of gcc" 2011-06-14 11:51:24 -07:00
Mathias Agopian
7a87ec7115 may fix build on some version of gcc 
Change-Id: Ia88787c0432ec84d51fe505fd6a2b6f98ebe8f33
 2011-06-14 11:50:22 -07:00
Daisuke Miyakawa
06e114816b Merge "Fix commment" 2011-06-14 11:30:47 -07:00
tedbo
98bd5fcc9a Merge "Support for setting a ParcelSurfaceTexture as the MediaPlayer sink." 2011-06-14 11:18:30 -07:00
Chia-chi Yeh
efa75af058 Merge "VPN: do not allow zero prefix length in routing rules." 2011-06-14 10:58:20 -07:00
Chia-chi Yeh
a2b97a9d38 Merge "VPN: do not use gateway in routing rules." 2011-06-14 10:58:10 -07:00
RoboErik
5bc1aa5643 Merge "Update Calendar main comment" 2011-06-14 10:27:12 -07:00
John Wang
9c723adf2b am aabe5f46: am 49572479: Update sim missing message in lock screen. 
* commit 'aabe5f46846a45163be874dca2d19910ce38c232':
  Update sim missing message in lock screen.
 2011-06-14 10:17:51 -07:00
Gloria Wang
33219723e3 Merge "Duplicated fileDesc is not closed when input file is not forward-lock content. Fix for bug 4606053." 2011-06-14 10:05:55 -07:00
John Wang
a44cec8b7c am 49572479: Update sim missing message in lock screen. 
* commit '49572479a9cb479f2b323f011c1a9f8142ec1a46':
  Update sim missing message in lock screen.
 2011-06-14 10:05:40 -07:00
Mike J. Chen
db804f34fd Merge "Handle always present wired ethernet interfaces at boot." 2011-06-14 09:53:23 -07:00
Narayan Kamath
ed2ab6c61b Merge "A few TTS bug fixes" 2011-06-14 07:05:42 -07:00
Mathias Agopian
2584e49d56 Merge "cleanup Kalman filter parameters, add/fix comments/units" 2011-06-13 21:14:17 -07:00
Jeff Brown
a34ad61854 Merge "Allow touches to slide out of the navigation bar." 2011-06-13 20:30:09 -07:00
Mike Lockwood
2b4ae0f4b5 Merge "Settings: Remove unused USE_PTP_INTERFACE setting" 2011-06-13 19:50:37 -07:00
Dima Zavin
cd27ed7b79 Merge "audio: update for audio/audio_policy header names/locations" 2011-06-13 19:43:59 -07:00
Mike Lockwood
678d87c2d8 Merge "Move adb related functionality from SystemServer and NotificationManagerService to UsbDeviceManager" 2011-06-13 19:22:29 -07:00
Romain Guy
4c913a80c7 Merge "Batch glCopyTexImage() calls to get about 15 fps back on SGX." 2011-06-13 19:07:22 -07:00
James Dong
3790b9552e Merge "Add an option to force to use HW codec in stagefright cmd tool" 2011-06-13 18:47:20 -07:00
James Dong
5c54407319 Merge "Add B frame support for MPEG4Writer" 2011-06-13 18:47:03 -07:00
Adam Powell
67446ccaec Merge "Expose api on View to determine if the view can be scrolled." 2011-06-13 18:45:40 -07:00
Mathias Agopian
a08b0de436 Merge "fix RefBase so it retains binary-compatibility with gingerbread" 2011-06-13 18:44:20 -07:00
Jeff Brown
04c02ceb87 Merge "Mimic Zygote preload steps when using wrappers." 2011-06-13 18:41:20 -07:00
Jeff Brown
46d723ed58 Merge "Take advantage of updated linux/input.h kernel headers." 2011-06-13 18:40:50 -07:00
Mathias Agopian
ddc31c3e2b fix RefBase so it retains binary-compatibility with gingerbread 
Bug: 4595257
Change-Id: I0d5e10f497e3f39868bff58f6ded510c38b44b12
 2011-06-13 18:39:45 -07:00
David Brown
5eabb2c13c Merge "Add "geoDescription" to CallerInfo" 2011-06-13 18:11:16 -07:00
Mathias Agopian
80728d87c9 Merge changes I9b8e1962,I7bb843ca 
* changes:
  Temporarily don't return the current buffer in synchronous mode
  unify SurfaceTexture and Surface
 2011-06-13 17:20:53 -07:00
Steve Block
c4b23c6c1d Merge "Fix thread violation in WebView.getViewHeight()" 2011-06-13 17:17:11 -07:00
Gilles Debunne
569b68441c Merge "Switch is not affected by touch when disabled" 2011-06-13 17:09:12 -07:00
Chia-chi Yeh
864bf3be69 Merge "VPN: tolerate duplicated routes." 2011-06-13 16:17:03 -07:00
Chia-chi Yeh
f733f326e8 Merge "VPN: fix a bad optimization of zeroing ifr_flags lately." 2011-06-13 16:11:58 -07:00
Mathias Agopian
e122079be6 Temporarily don't return the current buffer in synchronous mode 
activate synchronous mode by default.
 2011-06-13 15:51:35 -07:00
Mathias Agopian
a67932fe68 unify SurfaceTexture and Surface 
Add the concept of synchronous dequeueBuffer in SurfaceTexture
Implement {Surface|SurfaceTextureClient}::setSwapInterval()
Add SurfaceTexture logging
fix onFrameAvailable
 2011-06-13 15:51:35 -07:00
Derek Sollenberger
e692f69ad3 am f11c52d2: Updates resulting from the Skia merge (revision 1327) 
* commit 'f11c52d246d9e43c8533dff82979e7eeb72c1d50':
  Updates resulting from the Skia merge (revision 1327)
 2011-06-13 15:42:47 -07:00
Mathias Agopian
c65f218ed5 am c031afc8: (-s ours) am 77079399: am a9c9a4ba: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE) 
* commit 'c031afc8e9ad6c940c7d67a15b9c53092987377e':
  fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
 2011-06-13 15:42:26 -07:00
Jean-Baptiste Queru
d72a51df2b am c793f521: Merge/Ignore 653fd9cf 
* commit 'c793f521e5ace1dca39d65de3ed60d7c8242f661':
  Moving flag to a member field instead of a stack variable.
 2011-06-13 15:42:10 -07:00
Dan Morrill
1575b4353d am 74e646ca: (-s ours) Fix merge conflict for \'c2e1e329\'. 
* commit '74e646cab9a28aa3716a05fc474853c2c557f942':
  Adding a new config value used to tell StatusBarPolicy to always use CDMA signal strength value even when on EVDO. Default is off, but devices that need to can override it.
 2011-06-13 15:41:56 -07:00
Chia-chi Yeh
20173b499c Merge "VPN: set IFF_NO_PI on TUN interface." 2011-06-13 15:38:20 -07:00
Chia-chi Yeh
49936c590a Merge "VPN: add MTU support." 2011-06-13 15:08:43 -07:00
Jamie Gennis
9fbf761e44 Merge changes Ic9186db2,Id5a7cdff 
* changes:
  SurfaceTexture: disable a deadlocking test.
  SurfaceTexture: add a pixel tolerance to the tests.
 2011-06-13 14:48:11 -07:00
Chia-chi Yeh
10799eead5 Merge "VPN: use ParcelFileDescriptor.adoptFd() instead of doing it in JNI." 2011-06-13 14:35:12 -07:00
Svetoslav Ganov
af927f8700 Merge "Final polish of the interrogation feature." 2011-06-13 14:30:30 -07:00
Mathias Agopian
7794b30589 am 77079399: am a9c9a4ba: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE) 
* commit '77079399fca3e9c71e2ac06f3da26934e1c278b9':
  fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
 2011-06-13 14:15:00 -07:00
Mathias Agopian
4c83aefe59 am a9c9a4ba: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE) 
* commit 'a9c9a4baf24700e8817d47d8ea8da1742caea0b5':
  fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
 2011-06-13 14:13:21 -07:00
RoboErik
6ac2ba7aae Merge "Remove @hide on SyncColumns, make them protected" 2011-06-13 13:59:38 -07:00
Mathias Agopian
867740df05 fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE) 
Bug: 4595257
Change-Id: I1db83149107d7dab1f0b7e73c684e0ff82e17e62
 2011-06-13 13:44:28 -07:00
Jamie Gennis
2510d9576f SurfaceTexture: disable a deadlocking test. 
This change disables the UpdateTexImageAfterFrameFinishedWorks test
because it's currently causing deadlocks on some devices.

Change-Id: Ic9186db207e8d656f3af5d86fa138c7d96393c55
 2011-06-13 13:43:51 -07:00
Jamie Gennis
824efa74e7 SurfaceTexture: add a pixel tolerance to the tests. 
This change adds a default tolerance of 2 to all the pixel value checks
in the SurfaceTexture tests.

Change-Id: Id5a7cdffdfae16076e2daf4964a3326105b5ae2c
 2011-06-13 13:41:01 -07:00
RoboErik
ecbb9dbce4 Merge "Make interfaces protected so they get included in api" 2011-06-13 13:32:17 -07:00
Jamie Gennis
ac642349ba Merge "libutils: add a binary blob cache implementation." 2011-06-13 12:32:46 -07:00