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

31039 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ducrohet
5dcda1fda5 am 88512f59: am a8313e71: Merge "Fix String16 operator+ to actually work" 
* commit '88512f59bc051a42f4dd70acc8af5622f7e99db6':
  Fix String16 operator+ to actually work
 2011-08-17 14:35:20 -07:00
Xavier Ducrohet
88512f59bc am a8313e71: Merge "Fix String16 operator+ to actually work" 
* commit 'a8313e71fe8b483448d14e22610101c5f3672744':
  Fix String16 operator+ to actually work
 2011-08-17 14:31:08 -07:00
Xavier Ducrohet
a8313e71fe Merge "Fix String16 operator+ to actually work" 2011-08-17 14:18:04 -07:00
Dianne Hackborn
ee93fd5c0d am 7a0d746b: am baaf3ce6: Merge "Handle stopping of services with still bound applications." 
* commit '7a0d746bf2eaca4ff9d150e2cd2604b72ec5a2cb':
  Handle stopping of services with still bound applications.
 2011-08-16 20:42:17 -07:00
Dianne Hackborn
7a0d746bf2 am baaf3ce6: Merge "Handle stopping of services with still bound applications." 
* commit 'baaf3ce6385da0f9f5ff6e2195e26c339ee9949e':
  Handle stopping of services with still bound applications.
 2011-08-16 20:39:50 -07:00
Dianne Hackborn
baaf3ce638 Merge "Handle stopping of services with still bound applications." 2011-08-16 19:29:25 -07:00
Josiah Gaskin
4d07453ded Fix String16 operator+ to actually work 
This change fixes the String16 utility's operator+ function.

Change-Id: Ibed7b07277b50bf178febc72b6ce497893e66f17
 2011-08-16 15:16:04 -07:00
Jean-Baptiste Queru
ed3418076d am b654e6e5: am d144748d: Merge "Add missing include" 
* commit 'b654e6e55a3e8d7e8c2e0b8b1ff4bb4f76c10e05':
  Add missing include
 2011-08-11 15:22:42 -07:00
Jean-Baptiste Queru
b654e6e55a am d144748d: Merge "Add missing include" 
* commit 'd144748d4767b2ccfb13857e23f78bc944e9531d':
  Add missing include
 2011-08-11 15:18:22 -07:00
Jean-Baptiste Queru
d144748d47 Merge "Add missing include" 2011-08-11 13:46:09 -07:00
Jean-Baptiste Queru
d1c5b0233c Add missing include 
Change-Id: I00181029e80a2ba75320550c14e950fadbab8a64
 2011-08-11 13:36:04 -07:00
Amith Yamasani
4dbd1bc6ae am 5f074067: am 712a8cca: Merge "VolumePreference.onActivityStop only stops playback" 
* commit '5f07406717db34927f5095de3829b1e74ebd7c16':
  VolumePreference.onActivityStop only stops playback
 2011-08-11 12:46:25 -07:00
Amith Yamasani
5f07406717 am 712a8cca: Merge "VolumePreference.onActivityStop only stops playback" 
* commit '712a8cca1f9e438af224f93c3a4644853331af2e':
  VolumePreference.onActivityStop only stops playback
 2011-08-11 12:43:44 -07:00
Amith Yamasani
712a8cca1f Merge "VolumePreference.onActivityStop only stops playback" 2011-08-11 12:29:34 -07:00
Jean-Baptiste Queru
e30af493a6 am 44874c23: am c962512c: Merge "added stub for getting buffer from surface texture" 
* commit '44874c236de282b0d898f179fc9fdafa84aae40d':
  added stub for getting buffer from surface texture
 2011-08-11 12:24:51 -07:00
Jean-Baptiste Queru
44874c236d am c962512c: Merge "added stub for getting buffer from surface texture" 
* commit 'c962512cac19e2bb1103c0c1a5f739d40d4d7740':
  added stub for getting buffer from surface texture
 2011-08-11 12:19:44 -07:00
Jean-Baptiste Queru
c962512cac Merge "added stub for getting buffer from surface texture" 2011-08-11 12:08:04 -07:00
Chris Craik
311ffe37a5 added stub for getting buffer from surface texture 
Change-Id: If61153cacdd8027848f40f8d9035f7c4aead0a98
 2011-08-11 11:56:59 -07:00
Jeff Brown
8f226dcb21 am ca97671e: am 6f5a837c: Merge "Fix getSwitchState according to device capabilities." 
* commit 'ca97671e2b74ed31b5bef6fd0b39e489f1ec5f51':
  Fix getSwitchState according to device capabilities.
 2011-08-10 13:59:44 -07:00
Jeff Brown
b4459d8d6d am 7e79b9aa: am dbff9107: Merge "Support wrapping app processes to inject debug instrumentation. Bug: 4437846" 
* commit '7e79b9aad85db332d334f8bc1625bf46f030830f':
  Support wrapping app processes to inject debug instrumentation. Bug: 4437846
 2011-08-10 13:59:41 -07:00
Jeff Brown
ca97671e2b am 6f5a837c: Merge "Fix getSwitchState according to device capabilities." 
* commit '6f5a837c9c4a55c82111c6cd5af6055b63fcb5a9':
  Fix getSwitchState according to device capabilities.
 2011-08-10 13:56:33 -07:00
Jeff Brown
7e79b9aad8 am dbff9107: Merge "Support wrapping app processes to inject debug instrumentation. Bug: 4437846" 
* commit 'dbff91077ddf437b62794e077d2ce9e10fff8170':
  Support wrapping app processes to inject debug instrumentation. Bug: 4437846
 2011-08-10 13:56:31 -07:00
Jeff Brown
6f5a837c9c Merge "Fix getSwitchState according to device capabilities." 2011-08-10 13:42:03 -07:00
Jeff Brown
dbff91077d Merge "Support wrapping app processes to inject debug instrumentation. Bug: 4437846" 2011-08-10 13:41:36 -07:00
Gloria Wang
8a6fb50d69 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
4e197ea8a6 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
e15a73ee4c Merge "Bug fixes in OMA DRM v1 Forward Lock Agent" 2011-08-04 14:20:53 -07:00
Xavier Ducrohet
320834c9e0 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
b9e8b25e90 am 6b3a0123: Merge "Insert a break wraparound." 
* commit '6b3a0123486e729aca7e7de0c3a78c4c3300d0c9':
  Insert a break wraparound.
 2011-08-04 12:50:11 -07:00
Xavier Ducrohet
6b3a012348 Merge "Insert a break wraparound." 2011-08-04 12:36:11 -07:00
Mike Lockwood
0b3af353dc 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
a82ee49a7b am 8f5dd9ad: Merge "GPS Provider Service changes" 
* commit '8f5dd9ad3f98d97d2862b57ba8cd961d2201e40c':
  GPS Provider Service changes
 2011-08-04 07:48:57 -07:00
Mike Lockwood
8f5dd9ad3f Merge "GPS Provider Service changes" 2011-08-04 07:39:03 -07:00
Kevin Tang
a5fe6b2efe 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

Change-Id: I62e35c948d2ac1961771d1a10581a3b8e695c05a
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-08-04 10:33:35 -04:00
Henrik B Andersson
93827fb09e Bug fixes in OMA DRM v1 Forward Lock Agent 
A couple of fixes in the Forward Lock Agent.
The DRM Framework isn't thread safe so the Forward Lock Agent needs
to protect the private structures.
Base64-encoded content with LF-only instead of CRLF line breaks is now
accepted.
A fix for non-standard boundary characters.
The debug prints are also turned off as default.

Change-Id: I8ab417231380fbe1c371d18a147773ceabc6f69f
 2011-08-04 13:43:02 +02:00
Jean-Baptiste Queru
3a5e36f96b am 98c531dc: am 9b0c6bee: Merge "Fix a compiling error when trying to use setBufferCount" 
* commit '98c531dca9e52af280ca002658bbe38775b3f6ae':
  Fix a compiling error when trying to use setBufferCount
 2011-08-02 17:19:05 -07:00
Jean-Baptiste Queru
98c531dca9 am 9b0c6bee: Merge "Fix a compiling error when trying to use setBufferCount" 
* commit '9b0c6beed2cd5463655712ad80ed160c08611ff8':
  Fix a compiling error when trying to use setBufferCount
 2011-08-02 17:15:24 -07:00
Jean-Baptiste Queru
9b0c6beed2 Merge "Fix a compiling error when trying to use setBufferCount" 2011-08-02 17:02:48 -07:00
Teng-Hui Zhu
c6ca43176d Fix a compiling error when trying to use setBufferCount 
Change-Id: I1aefaf7ec111340a584e0beeeea60b845e16bb1f
 2011-08-02 16:57:20 -07:00
Conley Owens
f8c1f1298a am e1d27154: am f87743e7: Merge "Prevent NullPointerException cases while using SipService." 
* commit 'e1d271546767a8e2213aabba92506af9e97020b4':
  Prevent NullPointerException cases while using SipService.
 2011-08-02 13:24:00 -07:00
Conley Owens
e1d2715467 am f87743e7: Merge "Prevent NullPointerException cases while using SipService." 
* commit 'f87743e7bdfd10b9a1719036a6320a32df078879':
  Prevent NullPointerException cases while using SipService.
 2011-08-02 13:21:12 -07:00
Conley Owens
f87743e7bd Merge "Prevent NullPointerException cases while using SipService." 2011-08-02 13:08:14 -07:00
Jean-Baptiste Queru
5bb3129c7e am a2616220: am 5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer." 
* commit 'a2616220d24b994e79fcbf33f7ce8a311fa9e8ac':
  Stagefright: Return error if codec takes too long to return a buffer.
 2011-08-01 13:59:02 -07:00
Jean-Baptiste Queru
a2616220d2 am 5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer." 
* commit '5e57c2cf83ef62e9887592b46a4c3352662fb988':
  Stagefright: Return error if codec takes too long to return a buffer.
 2011-08-01 13:55:45 -07:00
Jean-Baptiste Queru
5e57c2cf83 Merge "Stagefright: Return error if codec takes too long to return a buffer." 2011-08-01 13:43:07 -07:00
Eric Fischer
f01b3cfa9a am c0e5967f: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit 'c0e5967fb9cb5328623a3be8f0c270cbbfe76ed7':
  Import revised translations.  DO NOT MERGE
 2011-08-01 11:17:17 -07:00
Eric Fischer
c0e5967fb9 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-08-01 11:15:58 -07:00
Masahiko Endo
25ccbb97ff Prevent NullPointerException cases while using SipService. 
Some SipService methods may return null, in such cases like no Wi-Fi
connection. Added minimum check to prevent NullPointerExceptions.

Change-Id: Ia7fae57ee893f2564cbfdedb6dc614938ab60ff7
Signed-off-by: Masahiko Endo <masahiko.endo@gmail.com>
 2011-08-01 16:24:59 +09:00
Derek Sollenberger
b7f09f28b9 am b7ed8471: am 01caec8c: Merge "Adding an optional param to the SurfaceTexture constructor." 
* commit 'b7ed8471f1b96aff901149cf9ac29e4b32672f93':
  Adding an optional param to the SurfaceTexture constructor.
 2011-07-29 09:53:09 -07:00
Derek Sollenberger
b7ed8471f1 am 01caec8c: Merge "Adding an optional param to the SurfaceTexture constructor." 
* commit '01caec8c4165a6cce2f276f8016b9eadab966944':
  Adding an optional param to the SurfaceTexture constructor.
 2011-07-29 09:50:11 -07:00