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

30077 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
287fbba5b8 am 5f2def8c: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit '5f2def8cfdad2491a646be69347444a3be6ddf84':
  Import revised translations.  DO NOT MERGE
 2011-01-28 14:19:36 -08:00
Eric Fischer
5f2def8cfd Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-01-28 14:10:43 -08:00
Eric Fischer
1c3f1af182 Import revised translations. DO NOT MERGE 
Change-Id: Id8afb303d2ecfc6270d1af1abd189c0ef0bf2314
 2011-01-28 13:16:00 -08:00
Dirk Dougherty
30a85ec7e8 am fa809dba: Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread 
* commit 'fa809dba8ec7f894bd53dba8e1cf742082c5cb3e':
  Doc change: Add time-lapse video to 3.0 highlights.
 2011-01-28 12:00:51 -08:00
Dirk Dougherty
fa809dba8e Merge "Doc change: Add time-lapse video to 3.0 highlights." into gingerbread 2011-01-28 11:57:42 -08:00
Andreas Huber
70888c00a0 am b6c2e2b4: DO NOT MERGE: More robust parsing of NPT time ranges in RTSP. 
* commit 'b6c2e2b46c574a90450438cccfb6cb97b7edc20f':
  DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
 2011-01-28 10:42:10 -08:00
Andreas Huber
b6c2e2b46c DO NOT MERGE: More robust parsing of NPT time ranges in RTSP. 
Change-Id: If5a00f1e29dbc12956e1fb000dac859706d19791
related-to-bug: 3217210
 2011-01-28 09:58:11 -08:00
Eric Laurent
13212f8338 am 0ef57993: Merge "Fix issue 2988031." into gingerbread 
* commit '0ef579939e6c96fcd2b42b164c5debf535a6a53b':
  Fix issue 2988031.
 2011-01-27 18:40:42 -08:00
Eric Laurent
0ef579939e Merge "Fix issue 2988031." into gingerbread 2011-01-27 18:37:04 -08:00
Jim Miller
145643ca4b am 226e5756: Merge "Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread 
* commit '226e57563c3110aa688fc41f10b7a96cd21b6231':
  Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]
 2011-01-27 18:25:12 -08:00
Jim Miller
226e57563c Merge "Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE]" into gingerbread 2011-01-27 18:22:14 -08:00
Jim Miller
c0a1387f0f Fix 3391330: Use BATTERY_STATUS_FULL as "Charged" state [DO NOT MERGE] 
Some devices that use LiPo batteries do not charge them to 100%
as a safety margin and to preserve battery longevity.  This change
allows KeyguardUpdateMonitor to determine when the battery state should be
reported as "Charged", provided the device sets BATTERY_STATUS_FULL in
that case.

Change-Id: Iac6cb78e24f9a696017459cc773c38ef7fe7779f
 2011-01-27 18:07:44 -08:00
Dirk Dougherty
85dacef709 Doc change: Add time-lapse video to 3.0 highlights. 
Change-Id: I5fb9cb76a544a502cd2f67bc1902b2c02a2a52a8
 2011-01-27 17:55:35 -08:00
Nick Pelly
34afc2cd83 am d350dc04: Merge "API: Make close() throw an IOException." into gingerbread 
* commit 'd350dc0492fab3614749955f5dcf21ec1c522b24':
  API: Make close() throw an IOException.
 2011-01-27 16:26:28 -08:00
Nick Pelly
d350dc0492 Merge "API: Make close() throw an IOException." into gingerbread 2011-01-27 16:23:35 -08:00
Nick Pelly
3fcedf7728 API: Make close() throw an IOException. 
IOException on close() can be useful to indicate that in-progress transactions
were canceled.

I also audited all of our tech classes to make sure every function that needs
to throw IOException does so.

Change-Id: Iaa9c43d79d59ff85772d5c3e4b4d57a6fa8df4cf
 2011-01-27 16:17:14 -08:00
Eric Fischer
e49e30cc4d am 3d73c4d3: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit '3d73c4d386e5ae66aa5c472342207728ab4fbf3a':
  Import revised translations.  DO NOT MERGE
 2011-01-27 15:00:43 -08:00
Eric Fischer
3d73c4d386 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2011-01-27 14:56:29 -08:00
Nick Pelly
32f7d50df1 am 21d0a173: Fix build - javadoc. 
* commit '21d0a173f138563e2eaba286b0eb505f987918a9':
  Fix build - javadoc.
 2011-01-27 14:12:49 -08:00
Nick Pelly
21d0a173f1 Fix build - javadoc. 
Change-Id: I0168fb4a75f4dff88e347c0dfd1f0b39e2dba0d6
 2011-01-27 14:07:50 -08:00
Eric Fischer
f4323d8d6a Import revised translations. DO NOT MERGE 
Change-Id: I1cf12c4a061a7982666176b42ac68d6dedd207ed
 2011-01-27 13:57:31 -08:00
Scott Main
51330184fe am 7a9741ca: Merge "cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it\'s not final" into gingerbread 
* commit '7a9741caca3ec0f6f3fd95426f2bd03b45b57758':
  cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it's not final
 2011-01-27 13:29:13 -08:00
Nick Pelly
55e124c448 am eab0e97b: Merge "Clean up MifareUltralight API." into gingerbread 
* commit 'eab0e97bf0951057a0624cdde2f4bc5434ade0ac':
  Clean up MifareUltralight API.
 2011-01-27 13:25:52 -08:00
Scott Main
7a9741caca Merge "cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d revise info about emulator snapshots to indicate it's not final" into gingerbread 2011-01-27 13:25:10 -08:00
Nick Pelly
eab0e97bf0 Merge "Clean up MifareUltralight API." into gingerbread 2011-01-27 12:23:53 -08:00
Nick Pelly
4a5e253220 Clean up MifareUltralight API. 
o Some javadoc updates
o writeBlock -> writePages  (Block means something else in NFC Forum).
o validate page offset

Change-Id: Icae54db3397d57aaa451caaa86d56e8ba82507f2
 2011-01-27 12:22:56 -08:00
Scott Main
f9af3015ef cherry pick Change-Id: I82981801475dc1be766d59e0e384c856bdf59d6d 
revise info about emulator snapshots to indicate it's not final

Change-Id: Ica1584fce9d55deb224937e16696127718e501da
 2011-01-27 11:54:30 -08:00
Eric Laurent
111df679af Fix issue 2988031. 
Limit SYSTEM stream volume when a headset is connected and music is playing.

Change-Id: Ieb44ae5bb53ffa9cd5fe8e317798eed279b78df8
 2011-01-27 11:32:34 -08:00
Robert Greenwalt
b27ce98451 am 89a54408: Merge "Update networktype before sending state change." into gingerbread 
* commit '89a544088fcfa849be0d8824a2ac0a545950847b':
  Update networktype before sending state change.
 2011-01-27 10:20:33 -08:00
Robert Greenwalt
89a544088f Merge "Update networktype before sending state change." into gingerbread 2011-01-27 10:17:33 -08:00
Dirk Dougherty
d1ca9aa561 am 591a5f86: Doc change: fix adt archive filename. 
* commit '591a5f86bd4b3f1732b935daad909e4e63149f01':
  Doc change: fix adt archive filename.
 2011-01-27 10:08:09 -08:00
Dirk Dougherty
591a5f86bd Doc change: fix adt archive filename. 
Change-Id: I1cf33678e52b4e85dca472763bfe53b7ecfcfb8b
 2011-01-27 10:00:48 -08:00
Scott Main
77ba255e32 am ba3dd323: enable preview mode for docs and add api level 10 flag for api level diffs 
* commit 'ba3dd32357b47ab0b55a1976bbafc225df78a59d':
  enable preview mode for docs and add api level 10 flag for api level diffs
 2011-01-26 18:37:22 -08:00
Scott Main
ba3dd32357 enable preview mode for docs and add api level 10 flag for api level diffs 
Change-Id: Ief2adca0f7f5c37d9381bd69d39a27aa11ec85dc
 2011-01-26 18:29:50 -08:00
Scott Main
bedd242768 am a7ce2f04: Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread 
* commit 'a7ce2f04ef0ae548370eebd1314558f24f40e8f0':
  catchup the gingerbread branch to gingerbread-docs for all sdk docs
 2011-01-26 17:56:26 -08:00
Scott Main
a7ce2f04ef Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread 2011-01-26 17:52:08 -08:00
Scott Main
9e6c0686be catchup the gingerbread branch to gingerbread-docs for all sdk docs 
This is just a manual copy of all files that changed, rather than a dozen cherry picks.

Change-Id: I672f74a2ec9242a1d96713d1d84bfc4d2d47dd85
 2011-01-26 17:42:49 -08:00
Andreas Huber
586096a957 am 2dce338e: DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes. 
* commit '2dce338e01678620db0734fc3d84bcb3f2512d62':
  DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
 2011-01-26 16:40:04 -08:00
Andreas Huber
2dce338e01 DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes. 
And now we're just ignoring them. Yay standards.

Change-Id: Ia8c0b9161e606152fb681f0dda3ba901954dc749
related-to-bug: 3353752
 2011-01-26 16:03:33 -08:00
Jeff Brown
91f2dbb782 am 7b448b8a: Merge "Move keymaps from sdk/emulator/keymaps." 
* commit '7b448b8a6c1ababc3a3e4553ebe9bac7473051c8':
  Move keymaps from sdk/emulator/keymaps.
 2011-01-26 15:03:32 -08:00
Jeff Brown
7b448b8a6c Merge "Move keymaps from sdk/emulator/keymaps." 2011-01-26 14:25:08 -08:00
Dianne Hackborn
ccd79399cc am 1d07b5bc: Merge "Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm." into gingerbread 
* commit '1d07b5bc9b0a9e3de4495834242548a600cae1d8':
  Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm.
 2011-01-26 14:08:30 -08:00
Jean-Michel Trivi
1155efdc71 am 2ba92c71: do not merge bug 3370834 Cherrypick from master 
* commit '2ba92c71b5684dce700cf848bf157153c156df1d':
  do not merge bug 3370834 Cherrypick from master
 2011-01-26 14:05:18 -08:00
Dianne Hackborn
1d07b5bc9b Merge "Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm." into gingerbread 2011-01-26 13:59:42 -08:00
Robert Greenwalt
67881c414a Update networktype before sending state change. 
Fixes potential race condition in network-type info.  May fix this issue.

bug:3376930
Change-Id: I3d5fd7c76e54923b62c56defa947be3c9c1cd585
 2011-01-26 13:39:46 -08:00
Dianne Hackborn
f5e4f208b9 Make CHANGE_COMPONENT_ENABLED_STATE a signatureOrSystem perm. 
Change-Id: I53a6671d5478e7dbca44b17d90f1edfa8e3420bc
 2011-01-26 12:40:18 -08:00
Jean-Michel Trivi
2ba92c71b5 do not merge bug 3370834 Cherrypick from master 
Cherripick from master CL 79833, 79417, 78864, 80332, 87500

Add new audio mode and recording source for audio communications
 other than telelphony.

The audio mode MODE_IN_CALL signals the system the device a phone
 call is currently underway. There was no way for audio video
 chat or VoIP applications to signal a call is underway, but not
 using the telephony resources. This change introduces a new mode
 to address this. Changes in other parts of the system (java
 and native) are required to take this new mode into account.
The generic AudioPolicyManager is updated to not use its phone
 state variable directly, but to use two new convenience methods,
 isInCall() and isStateInCall(int) instead.

Add a recording source used to designate a recording stream for
voice communications such as VoIP.

Update the platform-independent audio policy manager to pass the
 nature of the audio recording source to the audio policy client
 interface through the AudioPolicyClientInterface::setParameters()
 method.

SIP calls should set the audio mode to MODE_IN_COMMUNICATION,
 Audio mode MODE_IN_CALL is reserved for telephony.

SIP: Enable built-in echo canceler if available.
1. Always initialize AudioRecord with VOICE_COMMUNICATION.
2. If echo canceler is available, disable our echo suppressor.

Note that this CL is intentionally not correcting the
 getAudioSourceMax() return value in MediaRecorder.java as the
 new source is hidden here.

Change-Id: Ie68cd03c50553101aa2ad838fe9459b2cf151bc8
 2011-01-26 11:20:01 -08:00
Kenny Root
2ec4af5920 am 138757db: Merge "Make OBB results a one-way call" into gingerbread 
* commit '138757db4f19cb626ef5c1d371d4fca004304a08':
  Make OBB results a one-way call
 2011-01-26 09:25:43 -08:00
Kenny Root
138757db4f Merge "Make OBB results a one-way call" into gingerbread 2011-01-26 09:17:28 -08:00
Jeff Brown
2786b312d3 Move keymaps from sdk/emulator/keymaps. 
Change-Id: Ia10992a5988641b338cb4a50f57deadd5188a5e2
 2011-01-25 19:08:04 -08:00