ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity
20,965 Commits 2 Branches 0 Tags 54 MiB
7d4af3fefc
Commit Graph

20965 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Jean-Baptiste Queru
6b115451bf 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
8fdbdf461a 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
8fdba3dd72 Merge "Fix a compiling error when trying to use setBufferCount" 2011-08-02 17:02:48 -07:00
Teng-Hui Zhu
697bce061c Fix a compiling error when trying to use setBufferCount 
Change-Id: I1aefaf7ec111340a584e0beeeea60b845e16bb1f
 2011-08-02 16:57:20 -07:00
Conley Owens
526587bb72 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
6662266a42 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
b1d918badd Merge "Prevent NullPointerException cases while using SipService." 2011-08-02 13:08:14 -07:00
Jean-Baptiste Queru
0581cb2681 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
46b0fc9b2d 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
ae182598a2 Merge "Stagefright: Return error if codec takes too long to return a buffer." 2011-08-01 13:43:07 -07:00
Eric Fischer
c1cf37d145 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
061ad637f7 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-08-01 11:15:58 -07:00
Derek Sollenberger
bbfbd30383 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
adbba1fda0 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
Derek Sollenberger
0ed90b7894 Merge "Adding an optional param to the SurfaceTexture constructor." 2011-07-29 09:43:13 -07:00
Derek Sollenberger
77c988cf4e Adding an optional param to the SurfaceTexture constructor. 
Change-Id: I0fdbccf483a16af8039b85c0562f19a34ebce536
 2011-07-29 11:06:24 -04:00
Mike Lockwood
15c8cd406b am 5a27a754: am bd1dee94: Merge "gps: Adding ip address for AGps" 
* commit '5a27a7543edbd09a56e36d04adb4cfab922e6346':
  gps: Adding ip address for AGps
 2011-07-28 14:02:14 -07:00
Mike Lockwood
7779a44043 am bd1dee94: Merge "gps: Adding ip address for AGps" 
* commit 'bd1dee94dfe2e1d7564cae3c8c6be53cc4e66998':
  gps: Adding ip address for AGps
 2011-07-28 14:00:27 -07:00
Mike Lockwood
7c95ffbbcc Merge "gps: Adding ip address for AGps" 2011-07-28 13:52:55 -07:00
Mike Lockwood
b0e2827bce am 7083ed44: am 0ff79e88: Merge "GPS: Changes to enable on-demand data call flow for CDMA connections" 
* commit '7083ed44ee72d4885d01c683eb745dc4bdfb74d8':
  GPS: Changes to enable on-demand data call flow for CDMA connections
 2011-07-28 13:25:34 -07:00
Mike Lockwood
956ddf5604 am 0ff79e88: Merge "GPS: Changes to enable on-demand data call flow for CDMA connections" 
* commit '0ff79e88e2d90f80d0346e0485abe773ca85c44d':
  GPS: Changes to enable on-demand data call flow for CDMA connections
 2011-07-28 13:23:01 -07:00
Mike Lockwood
a9b8a0640e Merge "GPS: Changes to enable on-demand data call flow for CDMA connections" 2011-07-28 13:13:35 -07:00
Xavier Ducrohet
126c631581 am cd01ad7c: am 20339b24: Merge "Remove Debug Code" 
* commit 'cd01ad7cc7813e3067826945c2a472602f1d3509':
  Remove Debug Code
 2011-07-27 18:38:50 -07:00
Xavier Ducrohet
7fa726e769 am 20339b24: Merge "Remove Debug Code" 
* commit '20339b24394be06c5bfe5157a4b35adc48f665eb':
  Remove Debug Code
 2011-07-27 18:36:17 -07:00
Xavier Ducrohet
eff4cc7766 Merge "Remove Debug Code" 2011-07-27 18:26:01 -07:00
Xavier Ducrohet
e32af36b39 am 4d21c773: am 4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc" 
* commit '4d21c7732c978a593dfa78f8da1fed7511b38e95':
  DO NOT MERGE. may fix build on some version of gcc
 2011-07-27 14:01:23 -07:00
Xavier Ducrohet
44f57c061a am 4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc" 
* commit '4d1fa60bfe660fd0fc6671116da597c0027cbb16':
  DO NOT MERGE. may fix build on some version of gcc
 2011-07-27 13:59:57 -07:00
Xavier Ducrohet
060c1a8f1a Merge "DO NOT MERGE. may fix build on some version of gcc" 2011-07-27 13:45:05 -07:00
Mathias Agopian
aa599086f8 DO NOT MERGE. may fix build on some version of gcc 
Change-Id: Id99d390862731fd3fbc009dbffdf1d2a59dbe348
 2011-07-27 11:31:57 -07:00
Dianne Hackborn
015be548a9 am b0878223: am 6800a801: Merge "frameworks/base: Cap the number of toasts that a package can post." 
* commit 'b0878223db87700cdc988a6d9197ca4e3c4772db':
  frameworks/base: Cap the number of toasts that a package can post.
 2011-07-21 22:37:13 -07:00
Dianne Hackborn
461653aa73 am 6800a801: Merge "frameworks/base: Cap the number of toasts that a package can post." 
* commit '6800a80199477c90fc64af7211a177de06478a02':
  frameworks/base: Cap the number of toasts that a package can post.
 2011-07-21 22:35:32 -07:00
Dianne Hackborn
f0a8de95e6 am 1a2fcea1: am 2f4698fd: Merge "frameworks/base: unlink death notifications of Vibrate requests" 
* commit '1a2fcea1a28074f15126471daa5a8650cb5e2ecc':
  frameworks/base: unlink death notifications of Vibrate requests
 2011-07-21 22:26:20 -07:00
Dianne Hackborn
6f4d39f2fe am 2f4698fd: Merge "frameworks/base: unlink death notifications of Vibrate requests" 
* commit '2f4698fda46a3d2a6e78019588d77bae1cfa7193':
  frameworks/base: unlink death notifications of Vibrate requests
 2011-07-21 22:23:46 -07:00
Dianne Hackborn
cf9580023e Merge "frameworks/base: Cap the number of toasts that a package can post." 2011-07-21 22:21:19 -07:00
Dianne Hackborn
ac95550024 Merge "frameworks/base: unlink death notifications of Vibrate requests" 2011-07-21 22:18:47 -07:00
Xavier Ducrohet
852f77c888 am e70b2b8f: am 9bcf26ea: Merge "Layoutlib_create flag -p: don\'t change all accesses to public." 
* commit 'e70b2b8fe0c265171f3a367a66c99b36c62567c7':
  Layoutlib_create flag -p: don't change all accesses to public.
 2011-07-21 16:25:50 -07:00
Xavier Ducrohet
e4209768bd am 9bcf26ea: Merge "Layoutlib_create flag -p: don\'t change all accesses to public." 
* commit '9bcf26ea7aa108ce4bf4e973b4774d3e60eebafe':
  Layoutlib_create flag -p: don't change all accesses to public.
 2011-07-21 16:23:18 -07:00
Xavier Ducrohet
fe7fbed179 Merge "Layoutlib_create flag -p: don't change all accesses to public." 2011-07-21 16:17:03 -07:00
Kenny Root
fed1e9021e am 4f3a8db6: am 3cf03987: Merge "Continue idmap generation even if name lookup fails." 
* commit '4f3a8db64d75cd3e88213d3b105dc50fc5bd6262':
  Continue idmap generation even if name lookup fails.
 2011-07-21 13:11:01 -07:00
Kenny Root
2cc4e531f0 am 3cf03987: Merge "Continue idmap generation even if name lookup fails." 
* commit '3cf039876177b5b314b635bb12a1dae1b42f4605':
  Continue idmap generation even if name lookup fails.
 2011-07-21 13:09:05 -07:00
Kenny Root
c0e7a06170 Merge "Continue idmap generation even if name lookup fails." 2011-07-21 13:05:03 -07:00