ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
33,788 Commits 2 Branches 0 Tags 54 MiB
167b832f62
Commit Graph

33788 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaikumar Ganesh
167b832f62 am 3e941347: am 6f6b21b4: am 4733d3a6: Merge "Bluetooth event loop dispatches dbus data on wakeup" 
* commit '3e9413473f87ad17f3767ffbb0c57046c2db29be':
  Bluetooth event loop dispatches dbus data on wakeup
 2011-08-18 12:10:02 -07:00
Jaikumar Ganesh
7d4e0c49f6 am 6f6b21b4: am 4733d3a6: Merge "Bluetooth event loop dispatches dbus data on wakeup" 
* commit '6f6b21b407a8883b92b3de9e028e4dc1550b9648':
  Bluetooth event loop dispatches dbus data on wakeup
 2011-08-18 12:08:05 -07:00
Jaikumar Ganesh
56b33ee2ed am 4733d3a6: Merge "Bluetooth event loop dispatches dbus data on wakeup" 
* commit '4733d3a6bf10334c93ffbf42e6e850cacbaadd55':
  Bluetooth event loop dispatches dbus data on wakeup
 2011-08-18 12:06:25 -07:00
Jaikumar Ganesh
7be5106263 Merge "Bluetooth event loop dispatches dbus data on wakeup" 2011-08-18 12:02:35 -07:00
Xavier Ducrohet
754b249bcd am 5dcda1fd: am 88512f59: am a8313e71: Merge "Fix String16 operator+ to actually work" 
* commit '5dcda1fda53bdc6dfe80cf37e62cacdc216224b1':
  Fix String16 operator+ to actually work
 2011-08-17 14:38:15 -07:00
Xavier Ducrohet
242915f3d0 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
35302266fa 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
9f4d9d148f Merge "Fix String16 operator+ to actually work" 2011-08-17 14:18:04 -07:00
Dianne Hackborn
c9514d2dad am ee93fd5c: am 7a0d746b: am baaf3ce6: Merge "Handle stopping of services with still bound applications." 
* commit 'ee93fd5c0d7b0296fca17363ec00dc2ee63a0841':
  Handle stopping of services with still bound applications.
 2011-08-16 20:45:19 -07:00
Dianne Hackborn
bf046a8e05 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
e0233e99cd 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
96fe23ed7b Merge "Handle stopping of services with still bound applications." 2011-08-16 19:29:25 -07:00
Josiah Gaskin
37bf88e547 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
Conley Owens
6d9a6567f5 Merge "Add missing include" include exists 2011-08-12 13:40:56 -07:00
Amith Yamasani
501f6256bb am 4dbd1bc6: am 5f074067: am 712a8cca: Merge "VolumePreference.onActivityStop only stops playback" 
* commit '4dbd1bc6ae84cb4d0cd28922e917473ec6e53517':
  VolumePreference.onActivityStop only stops playback
 2011-08-12 13:16:21 -07:00
Conley Owens
3e80266158 Merge "Added stub for getting buffer" stub exists 2011-08-12 13:11:51 -07:00
Jeff Brown
0b7ad37bf7 am 8f226dcb: (-s ours) am ca97671e: am 6f5a837c: Merge "Fix getSwitchState according to device capabilities." 
* commit '8f226dcb21c84f5479a0a1b2d6486293dcd2e937':
  Fix getSwitchState according to device capabilities.
 2011-08-11 16:15:31 -07:00
Jeff Brown
98827f95c6 am b4459d8d: (-s ours) am 7e79b9aa: am dbff9107: Merge "Support wrapping app processes to inject debug instrumentation. Bug: 4437846" 
* commit 'b4459d8d6d5377db2494f5a11124d49194f1044c':
  Support wrapping app processes to inject debug instrumentation. Bug: 4437846
 2011-08-11 16:13:11 -07:00
Jean-Baptiste Queru
37717b58dc am b654e6e5: am d144748d: Merge "Add missing include" 
* commit 'b654e6e55a3e8d7e8c2e0b8b1ff4bb4f76c10e05':
  Add missing include
 2011-08-11 15:22:42 -07:00
Jean-Baptiste Queru
e636a8ad44 am d144748d: Merge "Add missing include" 
* commit 'd144748d4767b2ccfb13857e23f78bc944e9531d':
  Add missing include
 2011-08-11 15:18:22 -07:00
Jean-Baptiste Queru
dbd5be5408 Merge "Add missing include" 2011-08-11 13:46:09 -07:00
Jean-Baptiste Queru
2327ffac7d Add missing include 
Change-Id: I00181029e80a2ba75320550c14e950fadbab8a64
 2011-08-11 13:36:04 -07:00
Amith Yamasani
23f1724cf7 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
49934b48b3 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
431d7beafe Merge "VolumePreference.onActivityStop only stops playback" 2011-08-11 12:29:34 -07:00
Jean-Baptiste Queru
65adf39c38 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
9f3a33a671 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
cff1acf568 Merge "added stub for getting buffer from surface texture" 2011-08-11 12:08:04 -07:00
Chris Craik
f81c168a7a added stub for getting buffer from surface texture 
Change-Id: If61153cacdd8027848f40f8d9035f7c4aead0a98
 2011-08-11 11:56:59 -07:00
Jeff Brown
9f213739b9 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
04eb1755a2 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
38b77d4373 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
4af616cb5a 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
c6d6863c9b Merge "Fix getSwitchState according to device capabilities." 2011-08-10 13:42:03 -07:00
Jeff Brown
091c0f7ece Merge "Support wrapping app processes to inject debug instrumentation. Bug: 4437846" 2011-08-10 13:41:36 -07:00
Wink Saville
54032eb738 am 090df1dc: Merge "Delay connectivity change notifications." into honeycomb-LTE 
* commit '090df1dc4188e5b9ef10a0aca5081a196085ff56':
  Delay connectivity change notifications.
 2011-08-04 16:11:41 -07:00
Wink Saville
ae1d1c0630 Merge "Delay connectivity change notifications." into honeycomb-LTE 2011-08-04 16:10:11 -07:00
Steve Block
766b840c9b am c4d93ba5: Cherry-pick DeviceMotionService CL from master [do not merge] 
* commit 'c4d93ba55fbe905fa72ee7a068efd7c5fb4e8257':
  Cherry-pick DeviceMotionService CL from master [do not merge]
 2011-08-04 14:49:44 -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
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
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