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

47294 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Ho
93b1a4dd97 am dd8f9268: am 5dbd0978: Merge "Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF" into honeycomb-mr1 
* commit 'dd8f9268415de539b9b17a9b7d24405b50d9c053':
  Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF
 2011-03-17 18:00:23 -07:00
James Dong
14438b81a1 am 970bad67: am be368de7: Merge "Fix missing AOSP copyright headers for more files" into honeycomb-mr1 
* commit '970bad677585b3cba1ff1b48db9040c2005bd907':
  Fix missing AOSP copyright headers for more files
 2011-03-17 18:00:19 -07:00
Justin Ho
dd8f926841 am 5dbd0978: Merge "Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF" into honeycomb-mr1 
* commit '5dbd0978cd7f2d3ff1e28bbfdef2f757de28e1bc':
  Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF
 2011-03-17 17:55:58 -07:00
James Dong
970bad6775 am be368de7: Merge "Fix missing AOSP copyright headers for more files" into honeycomb-mr1 
* commit 'be368de7b7614e89bae8fb59ea4283eba890a2c1':
  Fix missing AOSP copyright headers for more files
 2011-03-17 17:55:48 -07:00
Justin Ho
5dbd0978cd Merge "Updated copy/paste/cut assets for AB Removing old unnecessary assets from tree Bug: 6699FF" into honeycomb-mr1 2011-03-17 16:49:32 -07:00
Xia Wang
74f1b60951 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
68957a0d75 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
f63113d158 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
0620ebd7c4 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
f309453bb8 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
01a111486d 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
3a90ec4e6b 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
a5b68f39e2 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
3fa3721e8f 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
af64e751e2 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
be368de7b7 Merge "Fix missing AOSP copyright headers for more files" into honeycomb-mr1 2011-03-17 16:11:13 -07:00
Xia Wang
e12a1a0949 Merge "Port wi-fi stress test into GB DO NOT MERGE" into gingerbread 2011-03-17 15:06:40 -07:00
James Dong
199d1c131d 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
Xavier Ducrohet
c7c8c599a6 Merge 67450db0 from honeycomb. Do not merge. 
Change-Id: I0ca140dd6d9279ff313f930739ad40fbbed4f335
LayoutLib: TypedArray.getDimensionPixelSize can actually return <0
 2011-03-17 14:24:50 -07:00
Teng-Hui Zhu
6b3c25c859 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
0318d6bfd3 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
73091273bb Merge "Fix the aspect ratio for full screen playing" into honeycomb-mr1 2011-03-17 14:20:39 -07:00
Xavier Ducrohet
47b4299120 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
a0215953b0 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
026d6be2dc Merge "LayoutLib: TypedArray.getDimensionPixelSize can actually return <0" into honeycomb-mr1 2011-03-17 14:12:49 -07:00
Xavier Ducrohet
67450db03e LayoutLib: TypedArray.getDimensionPixelSize can actually return <0 
Change-Id: I17853dc242e28f0c59916cad1b2a57beed480a57
 2011-03-17 14:11:23 -07:00
Eric Fischer
c3a785cbc6 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
Teng-Hui Zhu
1ab0df7f5a Fix the aspect ratio for full screen playing 
bug:4116475

Change-Id: I0b04ef4a6db24a9bc5c8d0f0a987783695bc3489
 2011-03-17 13:36:33 -07:00
Eric Fischer
b05fea7dc5 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
e6ef8d0b75 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-17 13:29:47 -07:00
Eric Fischer
00436f9bfb Import revised translations. DO NOT MERGE 
Change-Id: I774c6b4e13d3cb53b2364360f6f888e548110e7f
 2011-03-17 13:11:01 -07:00
James Dong
782ffe91da 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
2c3257b21d 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
9c0c5b5638 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
James Dong
2f1f2248c8 Fix missing AOSP copyright headers for a bunch of media framework files 
bug - 4119349

Change-Id: If5924e16a5f596d5d73d9beb66eaf5ac9a6f0e50
 2011-03-17 11:10:40 -07:00
Mike Lockwood
5982bf66d4 GPS: Restore XTRA downloading at boot. 
Between Froyo and Gingerbread we disabled scheduling an XTRA data download
at boot because the Qualcomm engineers thought it should not be necessary.
However, some users noticed a GPS performance degradation after receiving
their Gingerbread update, and some reported forcing an XTRA download cleared
up the problem.  This change restores the Froyo behavior of downloading
XTRA data after boot.

Bug: 3509901

Change-Id: I5a52201a2b24ce4a5d3ddb1f86340e3d5387f603
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-17 14:08:01 -04:00
Gloria Wang
9940c8b6c8 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
def35f7a47 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
8698c91204 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
074903a95b 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
eca7ff02fb 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
87f50f19ee Merge "PACKAGE_FIRST_LAUNCH intent sent to wrong pkg" into honeycomb-mr1 2011-03-17 10:23:48 -07:00
Brad Fitzpatrick
b8332786e3 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
d973bed36c Merge "Removing dead store; it was likely a relict of debuging code." 2011-03-17 09:51:47 -07:00
Mike Lockwood
132b23f849 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
c97022e7ac 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
Mike Lockwood
11473332b4 Merge "MtpServer: Do not attempt to stop MTP if it has not been started" into honeycomb-mr1 2011-03-17 07:24:12 -07:00
Mike Lockwood
a3f8514492 MtpServer: Do not attempt to stop MTP if it has not been started 
Fixes an ANR that occurred if we got a USB disconnected event
before the MTP service had started.

Bug: 4118033

Change-Id: I6cad4281a5911a9926cae923f34d3a6bf98346c5
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-17 09:43:50 -04:00
Daniel Sandler
1b4890c968 am 45026366: am 8f5cab8b: Merge "Remove logspew." into honeycomb-mr1 
* commit '4502636629ebb3f2ebb8521241c364666d1d7345':
  Remove logspew.
 2011-03-17 06:35:54 -07:00
Daniel Sandler
4502636629 am 8f5cab8b: Merge "Remove logspew." into honeycomb-mr1 
* commit '8f5cab8b31014a261f4e6e12e6d751de51de37c3':
  Remove logspew.
 2011-03-17 06:31:56 -07:00