ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
32,238 Commits 2 Branches 0 Tags 54 MiB
a9a448efc4
Commit Graph

32238 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simon Wilson
430e80091e am 0620ebd7: (-s ours) am 3fa3721e: (-s ours) am 3f5995da: Merge "DO NOT MERGE Add images to ERI icon list" into gingerbread 
* commit '0620ebd7c47d79e95ed1048abd4317aa136bc0dd':
  DO NOT MERGE Add images to ERI icon list
 2011-03-17 16:27:36 -07:00
Mike Lockwood
66d5425cd4 am f309453b: (-s ours) am af64e751: (-s ours) am 27d9fb57: DO NOT MERGE: Improve message for the "no app for USB accessory" dialog. 
* commit 'f309453bb85ec278f0206baef898461f5b0a8874':
  DO NOT MERGE:  Improve message for the "no app for USB accessory" dialog.
 2011-03-17 16:27:32 -07:00
Xia Wang
08b5f02649 am 01a11148: (-s ours) am e12a1a09: Merge "Port wi-fi stress test into GB DO NOT MERGE" into gingerbread 
* commit '01a111486d06c21ddb723195c177c8991d5db151':
  Port wi-fi stress test into GB DO NOT MERGE
 2011-03-17 16:25:09 -07:00
Xavier Ducrohet
72551f34af am 3a90ec4e: (-s ours) am c7c8c599: Merge 67450db0 from honeycomb. Do not merge. 
* commit '3a90ec4e6b4973f56dae825c967bbee69e6239cf':
  Merge 67450db0 from honeycomb. Do not merge.
 2011-03-17 16:25:07 -07:00
Mike Lockwood
5f9fd46d00 am a5b68f39: am 5982bf66: GPS: Restore XTRA downloading at boot. 
* commit 'a5b68f39e2936a83eac0b995992724cd5de6905d':
  GPS: Restore XTRA downloading at boot.
 2011-03-17 16:25:01 -07:00
Simon Wilson
f819b0bc4c am 3fa3721e: (-s ours) am 3f5995da: Merge "DO NOT MERGE Add images to ERI icon list" into gingerbread 
* commit '3fa3721e8f771a6edc8acdd21f567af93ddea7e1':
  DO NOT MERGE Add images to ERI icon list
 2011-03-17 16:24:58 -07:00
Mike Lockwood
9f22e65f80 am af64e751: (-s ours) am 27d9fb57: DO NOT MERGE: Improve message for the "no app for USB accessory" dialog. 
* commit 'af64e751e2373790dd661be80b11a03332712e90':
  DO NOT MERGE:  Improve message for the "no app for USB accessory" dialog.
 2011-03-17 16:24:53 -07:00
Xia Wang
601cf70eb9 am e12a1a09: Merge "Port wi-fi stress test into GB DO NOT MERGE" into gingerbread 
* commit 'e12a1a0949ceaff3e4d203ab6897501fb7bdfb98':
  Port wi-fi stress test into GB DO NOT MERGE
 2011-03-17 16:21:28 -07:00
Xavier Ducrohet
c8f07bae1f am c7c8c599: Merge 67450db0 from honeycomb. Do not merge. 
* commit 'c7c8c599a636a105db0d2eac3b8b332532a7a40f':
  Merge 67450db0 from honeycomb. Do not merge.
 2011-03-17 16:21:20 -07:00
Mike Lockwood
6dd337b9f1 am 5982bf66: GPS: Restore XTRA downloading at boot. 
* commit '5982bf66d4fdea38105d91ff0f9d38660ac87581':
  GPS: Restore XTRA downloading at boot.
 2011-03-17 16:20:56 -07:00
Simon Wilson
41c48eef34 am 3f5995da: Merge "DO NOT MERGE Add images to ERI icon list" into gingerbread 
* commit '3f5995da76541443b7c071bd3acad7590ba222ec':
  DO NOT MERGE Add images to ERI icon list
 2011-03-17 16:20:46 -07:00
Mike Lockwood
2ce416b5d2 am 27d9fb57: DO NOT MERGE: Improve message for the "no app for USB accessory" dialog. 
* commit '27d9fb57168da5b5c1385df5f0c493cf8339933f':
  DO NOT MERGE:  Improve message for the "no app for USB accessory" dialog.
 2011-03-17 16:20:32 -07:00
James Dong
29c6574d45 Merge "Fix missing AOSP copyright headers for more files" into honeycomb-mr1 2011-03-17 16:11:13 -07:00
Eino-Ville Talvala
edc5ac145b Merge "Add support for timestamps into SurfaceTexture." 2011-03-17 15:52:34 -07:00
Alex Sakhartchouk
17628cec4d Merge "Fixing a small bug in debug output Default font wasn't reset for debug output but used the last font instead." 2011-03-17 15:51:38 -07:00
Gloria Wang
c58f27ab1e Merge "Fix for bug 4126103. mMessage in DrmInfoEvent is a reference to the message string, so the temporary message created in the plugin was going out of scope and being destructed while the message was being sent. Changed DrmInfoEvent's mMessage to be const String8 instead of const String8&" 2011-03-17 15:23:06 -07:00
Xia Wang
0d2b3fe91d Merge "Port wi-fi stress test into GB DO NOT MERGE" into gingerbread 2011-03-17 15:06:40 -07:00
James Dong
5f7204cb66 Fix missing AOSP copyright headers for more files 
o Update the copyright date on InputDispatcher_test.cpp and InputReader_test.cpp
  because these two files were moved from other places to the current location,
  and were actually created in 2010.

bug - 4119349

Change-Id: Ic93b81ddafb58e9e72a2e9e02ca3d9f173d6dca7
 2011-03-17 14:43:12 -07:00
David Li
5a0d29009c Merge "GLES2Debugger: Make command exchange async to improve performance." 2011-03-17 14:38:37 -07:00
Teng-Hui Zhu
87d31b417b am 6b3c25c8: am 0318d6bf: am 73091273: Merge "Fix the aspect ratio for full screen playing" into honeycomb-mr1 
* commit '6b3c25c859ef72e7f65527c6aae68e77df580b94':
  Fix the aspect ratio for full screen playing
 2011-03-17 14:25:47 -07:00
Teng-Hui Zhu
3bc0feb989 am 0318d6bf: am 73091273: Merge "Fix the aspect ratio for full screen playing" into honeycomb-mr1 
* commit '0318d6bfd3882b3f6fb82b03aca496e68c36d1f9':
  Fix the aspect ratio for full screen playing
 2011-03-17 14:23:38 -07:00
Teng-Hui Zhu
3e8fac41f4 am 73091273: Merge "Fix the aspect ratio for full screen playing" into honeycomb-mr1 
* commit '73091273bb5160567f2230e1e7fcde5b0218ad9d':
  Fix the aspect ratio for full screen playing
 2011-03-17 14:22:26 -07:00
Teng-Hui Zhu
691935bfcd Merge "Fix the aspect ratio for full screen playing" into honeycomb-mr1 2011-03-17 14:20:39 -07:00
Xavier Ducrohet
c32e05dbb9 am 47b42991: am a0215953: am 026d6be2: Merge "LayoutLib: TypedArray.getDimensionPixelSize can actually return <0" into honeycomb-mr1 
* commit '47b42991203b7f8e337b1612d601ed120596ef71':
  LayoutLib: TypedArray.getDimensionPixelSize can actually return <0
 2011-03-17 14:20:38 -07:00
Xavier Ducrohet
a4710e7d8e am a0215953: am 026d6be2: Merge "LayoutLib: TypedArray.getDimensionPixelSize can actually return <0" into honeycomb-mr1 
* commit 'a0215953b0a6930b0ca3dcbdd598e1b9de2e9f02':
  LayoutLib: TypedArray.getDimensionPixelSize can actually return <0
 2011-03-17 14:18:48 -07:00
Xavier Ducrohet
0eb5f29a5d am 026d6be2: Merge "LayoutLib: TypedArray.getDimensionPixelSize can actually return <0" into honeycomb-mr1 
* commit '026d6be2dcc425f83d9d7ec8740068147497b305':
  LayoutLib: TypedArray.getDimensionPixelSize can actually return <0
 2011-03-17 14:15:38 -07:00
Xavier Ducrohet
fdebf54854 Merge "LayoutLib: TypedArray.getDimensionPixelSize can actually return <0" into honeycomb-mr1 2011-03-17 14:12:49 -07:00
Eric Fischer
bb09b35866 am c3a785cb: (-s ours) am b05fea7d: am e6ef8d0b: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'c3a785cbc63e9947f5aec868fafe708e7a8b6731':
  Import revised translations.  DO NOT MERGE
 2011-03-17 13:39:07 -07:00
Eric Fischer
06964efbd9 am b05fea7d: am e6ef8d0b: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'b05fea7dc586173d5dcf7980e51966ac4ae761a0':
  Import revised translations.  DO NOT MERGE
 2011-03-17 13:36:38 -07:00
Eric Fischer
9fe43705c7 am e6ef8d0b: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'e6ef8d0b75494e8d1e8f619b2a461c11fe8fb965':
  Import revised translations.  DO NOT MERGE
 2011-03-17 13:32:58 -07:00
Eric Fischer
d4c0f4ec71 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-17 13:29:47 -07:00
Eino-Ville Talvala
1d01a12e71 Add support for timestamps into SurfaceTexture. 
API addition: The timestamps are represented as nanoseconds from some
arbitrary time point. Like the SurfaceTexture transform matrix, the
timestamp retrieved by getTimestamp is for the last frame sent to the
GL texture using updateTexImage().

Camera HAL change: Expect vendors to set these timestamps using
native_window_set_buffers_timestamp().  For now, they are
autogenerated by SurfaceTextureClient if set_buffers_timestamp() is
never called, but such timing is likely not accurate enough to pass a
CTS test.

bug:3300707

Change-Id: Ife131a0c2a826ac27342e11b8a6c42ff49e1bea7
 2011-03-17 13:10:03 -07:00
James Dong
15ff8ea06f am 782ffe91: am 9c0c5b56: am 2f1f2248: Fix missing AOSP copyright headers for a bunch of media framework files 
* commit '782ffe91da665c6b1fb9e297faa6e0dc6035f40c':
  Fix missing AOSP copyright headers for a bunch of media framework files
 2011-03-17 12:38:58 -07:00
Gloria Wang
247dbd1750 am 2c3257b2: am 9940c8b6: am def35f7a: Merge "Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls" into honeycomb-mr1 
* commit '2c3257b21ddf2a3da843f11d1bb3b4fa8e912707':
  Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses   DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls
 2011-03-17 12:38:40 -07:00
James Dong
b747834201 am 9c0c5b56: am 2f1f2248: Fix missing AOSP copyright headers for a bunch of media framework files 
* commit '9c0c5b5638fd2810b68e033963026cc1830b9ade':
  Fix missing AOSP copyright headers for a bunch of media framework files
 2011-03-17 12:31:09 -07:00
Gloria Wang
590d5971a1 am 9940c8b6: am def35f7a: Merge "Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls" into honeycomb-mr1 
* commit '9940c8b6c8ab1711c9ee77cb9288888879b0b310':
  Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses   DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls
 2011-03-17 12:30:52 -07:00
James Dong
892c399bdc am 2f1f2248: Fix missing AOSP copyright headers for a bunch of media framework files 
* commit '2f1f2248c8439adbd686810e306c55f9e6a5abc3':
  Fix missing AOSP copyright headers for a bunch of media framework files
 2011-03-17 11:56:05 -07:00
Gloria Wang
95a8679095 am def35f7a: Merge "Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls" into honeycomb-mr1 
* commit 'def35f7a47cde8bf66d4cba4570b289e0e9d625a':
  Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses   DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls
 2011-03-17 10:54:00 -07:00
Gloria Wang
3e99aa92cb Merge "Fix for 4089881. - Add one more parameter in the interface of DrmEvent and its subclasses DrmInfoEvent and DrmErrorEvent - Send back DrmInfo in the response of async processDrmInfo calls" into honeycomb-mr1 2011-03-17 10:49:43 -07:00
Brad Fitzpatrick
3d8e6ed45e am 8698c912: am b8332786: am d973bed3: Merge "Removing dead store; it was likely a relict of debuging code." 
* commit '8698c91204d56ea52a4393cd8cf91c9a3a49c4c8':
  Removing dead store; it was likely a relict of debuging code.
 2011-03-17 10:39:21 -07:00
Brad Fitzpatrick
8fa2e62dd3 am b8332786: am d973bed3: Merge "Removing dead store; it was likely a relict of debuging code." 
* commit 'b8332786e3ac6d58504a7c3128e94e63255b3515':
  Removing dead store; it was likely a relict of debuging code.
 2011-03-17 10:36:47 -07:00
Paul Milovanov
cb2a19756a am 074903a9: am eca7ff02: am 87f50f19: Merge "PACKAGE_FIRST_LAUNCH intent sent to wrong pkg" into honeycomb-mr1 
* commit '074903a95b2e48ee6431eb7a586dfa541e08d559':
  PACKAGE_FIRST_LAUNCH intent sent to wrong pkg
 2011-03-17 10:33:02 -07:00
Paul Milovanov
892ce1fe33 am eca7ff02: am 87f50f19: Merge "PACKAGE_FIRST_LAUNCH intent sent to wrong pkg" into honeycomb-mr1 
* commit 'eca7ff02fb6e75d4355565f05abf8f3af51731a0':
  PACKAGE_FIRST_LAUNCH intent sent to wrong pkg
 2011-03-17 10:29:50 -07:00
Paul Milovanov
7c4c1cc17a am 87f50f19: Merge "PACKAGE_FIRST_LAUNCH intent sent to wrong pkg" into honeycomb-mr1 
* commit '87f50f19eef2e70fcf7294c3b9cd5ca0344b99ee':
  PACKAGE_FIRST_LAUNCH intent sent to wrong pkg
 2011-03-17 10:26:32 -07:00
Paul Milovanov
c7112b9ef8 Merge "PACKAGE_FIRST_LAUNCH intent sent to wrong pkg" into honeycomb-mr1 2011-03-17 10:23:48 -07:00
Brad Fitzpatrick
25fd80d611 am d973bed3: Merge "Removing dead store; it was likely a relict of debuging code." 
* commit 'd973bed36cb4d4da1d97f309119f4114f60e7171':
  Removing dead store; it was likely a relict of debuging code.
 2011-03-17 10:18:15 -07:00
Brad Fitzpatrick
64069d47d8 Merge "Removing dead store; it was likely a relict of debuging code." 2011-03-17 09:51:47 -07:00
Mike Lockwood
b82fc408b4 am 132b23f8: am c97022e7: am 11473332: Merge "MtpServer: Do not attempt to stop MTP if it has not been started" into honeycomb-mr1 
* commit '132b23f84905060163be6a30d718074cd4e1770d':
  MtpServer: Do not attempt to stop MTP if it has not been started
 2011-03-17 07:30:53 -07:00
Mike Lockwood
7832a8571a am c97022e7: am 11473332: Merge "MtpServer: Do not attempt to stop MTP if it has not been started" into honeycomb-mr1 
* commit 'c97022e7acc6da71e558e9137036622b4c77ca46':
  MtpServer: Do not attempt to stop MTP if it has not been started
 2011-03-17 07:28:26 -07:00
Mike Lockwood
ba47878adf am 11473332: Merge "MtpServer: Do not attempt to stop MTP if it has not been started" into honeycomb-mr1 
* commit '11473332b4df78610ebb903e255d69ab35e5bf59':
  MtpServer: Do not attempt to stop MTP if it has not been started
 2011-03-17 07:26:44 -07:00