ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
33,804 Commits 2 Branches 0 Tags 54 MiB
50cf2e76ae
Commit Graph

33804 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jean-Baptiste Queru
c23c64c8f0 am 3a5e36f9: (-s ours) am 98c531dc: am 9b0c6bee: Merge "Fix a compiling error when trying to use setBufferCount" 
* commit '3a5e36f96bf61a8fb71c49cf93bd97c5e1d6abb4':
  Fix a compiling error when trying to use setBufferCount
 2011-08-02 17:22:43 -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
4f0dfe9a89 am f8c1f129: am e1d27154: am f87743e7: Merge "Prevent NullPointerException cases while using SipService." 
* commit 'f8c1f1298ac3ede518c8d29eeb6719746c6afaf0':
  Prevent NullPointerException cases while using SipService.
 2011-08-02 13:30:51 -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
2f7b9bf2d1 am 5bb3129c: (-s ours) am a2616220: am 5e57c2cf: Merge "Stagefright: Return error if codec takes too long to return a buffer." 
* commit '5bb3129c7eabce34d7c1469826e1795d4b225bb3':
  Stagefright: Return error if codec takes too long to return a buffer.
 2011-08-01 14:10:39 -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
45923cdc11 am f01b3cfa: (-s ours) am c0e5967f: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit 'f01b3cfa9ac2869e3762a90917569186039a9665':
  Import revised translations.  DO NOT MERGE
 2011-08-01 11:19:59 -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
9dd6682a5a Merge "resolved conflicts for merge of b7f09f28 to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-07-29 11:24:37 -07:00
Derek Sollenberger
33e86c7a91 resolved conflicts for merge of b7f09f28 to honeycomb-plus-aosp 
Change-Id: Iebde13c41a2adf4e693d87e808cb0659f913e4e6
 2011-07-29 14:16:18 -04:00
Robert Greenwalt
f9c0f5aa4f am 1a230885: Merge "Fix NPE when going from proxy to no proxy." into honeycomb-LTE 
* commit '1a230885b356256e91b3bf006ec72213ba6f8f76':
  Fix NPE when going from proxy to no proxy.
 2011-07-29 10:53:16 -07:00
Robert Greenwalt
4535086245 Merge "Fix NPE when going from proxy to no proxy." into honeycomb-LTE 2011-07-29 10:51:32 -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
Robert Greenwalt
67020c06fc am 0d8acea9: Make copy-constructor make deep copy. 
* commit '0d8acea9bb452d1fdbb3d811041f7bdb1b0ef8a3':
  Make copy-constructor make deep copy.
 2011-07-29 09:20:51 -07:00
Derek Sollenberger
77c988cf4e Adding an optional param to the SurfaceTexture constructor. 
Change-Id: I0fdbccf483a16af8039b85c0562f19a34ebce536
 2011-07-29 11:06:24 -04:00
Michaël Burtin
5aa3d79025 Fix getSwitchState according to device capabilities. 
When querying switch state for a given device id, ensure that the device
exposes the given switch in its capabilities, report AKEY_STATE_UNKNOWN
otherwise.
This fix a bug in InputManager that reports an incorrect switch state
(down) when a device exposes at least one switch in its capabilites and
another switch is queried. For example, this can leads in always
reporting LID state open (SW_LID down) if only SW_HEADPHONE_INSERT is
exposed in capabilities.

Change-Id: I4e5265ec02af918c317673789e7948529842aa2d
Signed-off-by: Michaël Burtin <mburtin@gmail.com>
 2011-07-29 15:28:02 +02:00
Mike Lockwood
1dc4736a33 am 5f7203eb: am 5a27a754: am bd1dee94: Merge "gps: Adding ip address for AGps" 
* commit '5f7203eb258503bc5d2ba29176bdf483a68a93b8':
  gps: Adding ip address for AGps
 2011-07-28 14:04:13 -07: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
Jeff Brown
70aee95a17 Support wrapping app processes to inject debug instrumentation. 
Bug: 4437846

Change-Id: Ib0559e5224b0fa0df074e485787307b6634e8654
 2011-07-28 14:00:27 -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
94a10fa407 am bf676d46: am 7083ed44: am 0ff79e88: Merge "GPS: Changes to enable on-demand data call flow for CDMA connections" 
* commit 'bf676d460d1d1fc8923982006c38d0f6785daea8':
  GPS: Changes to enable on-demand data call flow for CDMA connections
 2011-07-28 13:27:27 -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