drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,690 Commits 1 Branch 0 Tags
Commit Graph

52690 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Lockwood
fa77931784 Merge "Settings: Remove unused USE_PTP_INTERFACE setting" 2011-06-13 19:50:37 -07:00
Dima Zavin
922261deab Merge "audio: update for audio/audio_policy header names/locations" 2011-06-13 19:43:59 -07:00
Mike Lockwood
82f0a85c3b Merge "Move adb related functionality from SystemServer and NotificationManagerService to UsbDeviceManager" 2011-06-13 19:22:29 -07:00
Mike Lockwood
1324f22d8d Settings: Remove unused USE_PTP_INTERFACE setting 
Change-Id: I743b81379053caece38c19c59bc76d6cda763d45
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-06-13 22:21:01 -04:00
Mike Lockwood
541c9949ae Move adb related functionality from SystemServer and NotificationManagerService to UsbDeviceManager 
Change-Id: I9e64b54bc2d027d88ae2d2cd893068e29b6fe237
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-06-13 22:20:06 -04:00
Romain Guy
ad4e03d697 Merge "Batch glCopyTexImage() calls to get about 15 fps back on SGX." 2011-06-13 19:07:22 -07:00
Romain Guy
54be1cdf3d Batch glCopyTexImage() calls to get about 15 fps back on SGX. 
Change-Id: I04079e070739c1e46df3e90fc388c335e2a7d2b9
 2011-06-13 19:04:27 -07:00
James Dong
6e4ba2bf35 Merge "Add an option to force to use HW codec in stagefright cmd tool" 2011-06-13 18:47:20 -07:00
James Dong
decbe327d1 Merge "Add B frame support for MPEG4Writer" 2011-06-13 18:47:03 -07:00
Adam Powell
2714abff5c Merge "Expose api on View to determine if the view can be scrolled." 2011-06-13 18:45:40 -07:00
Mathias Agopian
14f58ffceb Merge "fix RefBase so it retains binary-compatibility with gingerbread" 2011-06-13 18:44:20 -07:00
Jeff Brown
b375d3c7e1 Merge "Mimic Zygote preload steps when using wrappers." 2011-06-13 18:41:20 -07:00
Jeff Brown
f2751aaede Merge "Take advantage of updated linux/input.h kernel headers." 2011-06-13 18:40:50 -07:00
Mathias Agopian
eb99f0d9f0 fix RefBase so it retains binary-compatibility with gingerbread 
Bug: 4595257
Change-Id: I0d5e10f497e3f39868bff58f6ded510c38b44b12
 2011-06-13 18:39:45 -07:00
Dima Zavin
290029d19a audio: update for audio/audio_policy header names/locations 
Change-Id: I36c49352eee57559403cd1597f56a8485a360289
Signed-off-by: Dima Zavin <dima@android.com>
 2011-06-13 18:16:26 -07:00
David Brown
a934219ca8 Merge "Add "geoDescription" to CallerInfo" 2011-06-13 18:11:16 -07:00
Jeff Brown
b3a2d13307 Take advantage of updated linux/input.h kernel headers. 
Change-Id: I72d2ef82de5c504d46b0cdb57aa43bbd0d769174
 2011-06-13 18:05:15 -07:00
Adam Powell
6915944fc7 Expose api on View to determine if the view can be scrolled. 
Change-Id: I41783237a975151392faec04c6a85803ebbccfb4
 2011-06-13 17:54:55 -07:00
David Brown
94202fe121 Add "geoDescription" to CallerInfo 
As of change https://android-git.corp.google.com/g/111296 the
libphonenumber library now provides an API ("PhoneNumberOfflineGeocoder")
to look up a geographical description string for a given number.

This change adds a new CallerInfo field called "geoDescription", and
uses the PhoneNumberOfflineGeocoder to look it up (if the contact lookup
fails) during the CallerInfoAsyncQuery sequence.

See https://android-git.corp.google.com/g/114715 for the corresponding
change under apps/Phone, to display this string (along with the raw
number) in the incoming-call UI.

Also some other minor cleanup:
  - fixed spelling of the "normalizedNumber" field
  - tiny javadoc and code style cleanup
  - slight CallManager and CallerInfo debug output cleanup

Bug: 4595580
Change-Id: I900d8f48e953d1b24983602cb5467a5c6a6c518a
 2011-06-13 17:39:49 -07:00
James Dong
78b9c381aa Add an option to force to use HW codec in stagefright cmd tool 
Change-Id: If6c277dd5a3f7a0b62acd6721343618b0be085fc
 2011-06-13 17:23:01 -07:00
Mathias Agopian
0991a7fb12 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
3f71cfc149 Merge "Fix thread violation in WebView.getViewHeight()" 2011-06-13 17:17:11 -07:00
Gilles Debunne
8fa10d44e1 Merge "Switch is not affected by touch when disabled" 2011-06-13 17:09:12 -07:00
James Dong
4108b1edc6 Add B frame support for MPEG4Writer 
o requires the support of negative ctts duration values (ctts version 1)

Change-Id: Ib14130c9359c3bff3c76f20a7380d468a065dcaf
 2011-06-13 17:06:29 -07:00
Chia-chi Yeh
71afd5e53c Merge "VPN: tolerate duplicated routes." 2011-06-13 16:17:03 -07:00
Gilles Debunne
c2ab0d665c Switch is not affected by touch when disabled 
Also unchanged at the end of a drag/fling if the switch has been
disabled in the mean time.

Change-Id: Ie471a7fcf57fa633ee8eeefdfaa2939883ccfef0
 2011-06-13 16:16:28 -07:00
Chia-chi Yeh
23a5e4bcdc VPN: tolerate duplicated routes. 
Change-Id: I0f9efa8c3af3d4859358438745a5cd2c4ad376ca
 2011-06-13 16:14:49 -07:00
Chia-chi Yeh
328958c1b0 Merge "VPN: fix a bad optimization of zeroing ifr_flags lately." 2011-06-13 16:11:58 -07:00
Chia-chi Yeh
6ddd57491a VPN: fix a bad optimization of zeroing ifr_flags lately. 
Change-Id: Ib7d89422ef0a9159ba912cf32b678821cb72a25a
 2011-06-13 16:08:01 -07:00
Mathias Agopian
9b8e1962d6 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
7bb843ca07 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
10e78c9df0 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
72171ad337 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
c9a7f1d0c5 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
fa56409156 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
0b6cca4d6f Merge "VPN: set IFF_NO_PI on TUN interface." 2011-06-13 15:38:20 -07:00
Chia-chi Yeh
6224b5ec38 VPN: set IFF_NO_PI on TUN interface. 
Packet info header (struct tun_pi) was required to support IPv6
in kernel prior to 2.6.26. Setting IFF_NO_PI will remove the header
from the packets sent/recieved via TUN file descriptor, so now they
are just raw IP packets.

Change-Id: I0b4ae9db23d3bc10995a00eb053527b499ad6eb6
 2011-06-13 15:26:51 -07:00
Chia-chi Yeh
26cfe80fe1 Merge "VPN: add MTU support." 2011-06-13 15:08:43 -07:00
Derek Sollenberger
f11c52d246 Updates resulting from the Skia merge (revision 1327) 
Change-Id: I1d2cecbad6c30e6ebc9579093404742f17e14e84
 2011-06-13 15:07:30 -07:00
Chia-chi Yeh
3663227a8b VPN: add MTU support. 
Change-Id: Ia2f06ae1fcf065bde7dafd212b84b37a34f1a47e
 2011-06-13 15:05:37 -07:00
Jamie Gennis
716a38adcb 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
49edc107b5 Merge "VPN: use ParcelFileDescriptor.adoptFd() instead of doing it in JNI." 2011-06-13 14:35:12 -07:00
Chia-chi Yeh
3667369807 VPN: use ParcelFileDescriptor.adoptFd() instead of doing it in JNI. 
This removes the dependency of android_util_Binder.h.
This change also removes some redundant zeroing.

Change-Id: Ie9fedd471dfa198f9a3261e03651f945cefbbf61
 2011-06-13 14:32:18 -07:00
Svetoslav Ganov
c282401b57 Merge "Final polish of the interrogation feature." 2011-06-13 14:30:30 -07:00
Mathias Agopian
c031afc8e9 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
77079399fc 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
2f911b7461 Merge "Remove @hide on SyncColumns, make them protected" 2011-06-13 13:59:38 -07:00
RoboErik
0025860b61 Remove @hide on SyncColumns, make them protected 
Change-Id: I375f6ca9a0ebe03b256bdb089c943571d06c9e6d
 2011-06-13 13:47:59 -07:00
Mathias Agopian
a9c9a4baf2 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
323badd7dd 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