OSDN Git Service
Andreas Huber [Tue, 20 Jul 2010 16:44:34 +0000 (09:44 -0700)]
Squashed commit of the following:
commit
4abf16bb04dc9695fedf4007a84f903074312ccd
Author: Andreas Huber <andih@google.com>
Date: Tue Jul 20 09:21:17 2010 -0700
Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we'll still play it back correctly.
Change-Id: Icc790122744745e9a88099788d4818ca1e265a82
related-to-bug:
2826841
commit
09c74da63e6ad5cb5dafb70f62696d75d2978967
Author: James Dong <jdong@google.com>
Date: Sun Jul 18 17:57:01 2010 -0700
Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled.
Change-Id: I883c81dad3ea465e71cb5590e89d763671a90ff8
commit
f672bf2a782dc7d5fb6325d611a7fe17045dfe9a
Author: James Dong <jdong@google.com>
Date: Thu Jul 8 20:56:13 2010 -0700
Enable the support for decoding audio with AAC+ and eAAC+ features
bug - 282684
Change-Id: I73c8377af3cc4edd3ee7cea86dc3b1c369fbd78b
Change-Id: I012f1179e933b6d1345d2368f357576c722485f7
Scott Main [Wed, 28 Jul 2010 21:20:18 +0000 (14:20 -0700)]
Merge "fix markup error bug:
2871538" into froyo
Scott Main [Wed, 28 Jul 2010 21:14:40 +0000 (14:14 -0700)]
fix markup error
bug:
2871538
Change-Id: I7ab4a9bb722ee8b3e5d740f79143776be8b56a6f
Dan Egnor [Wed, 28 Jul 2010 19:28:04 +0000 (12:28 -0700)]
Minor changes to ContentProvider javadoc to improve consistency.
Change-Id: I710f618c94ffd5d6368ef04a39ac08f675bec11b
Brad Fitzpatrick [Tue, 27 Jul 2010 23:44:53 +0000 (16:44 -0700)]
Merge "COMMENT ONLY change to clarify ContentProvider documentation." into froyo
Dan Egnor [Tue, 27 Jul 2010 23:32:17 +0000 (16:32 -0700)]
COMMENT ONLY change to clarify ContentProvider documentation.
Gets a little more specific about thread behavior, and makes
pointed comments about not doing too much work in onCreate().
Change-Id: I682f0eb7d7559babee901ed26642751a6ba0a1ea
Joe Onorato [Tue, 27 Jul 2010 16:05:05 +0000 (09:05 -0700)]
Merge "Add a method to let a properly permissioned app directly manipulate the user activity timeout. We should come up with a better API for this, but this is for a last minute power manager hack to turn off the screen sooner after a phone call ends." into froyo
Dirk Dougherty [Wed, 21 Jul 2010 01:38:53 +0000 (18:38 -0700)]
Doc change: Add docs for licensing service.
Change-Id: Ia78467b8857cb8e83ab3920f4126bc7985a9d93d
Joe Onorato [Sat, 24 Jul 2010 15:50:05 +0000 (11:50 -0400)]
Add a method to let a properly permissioned app directly
manipulate the user activity timeout. We should come up
with a better API for this, but this is for a last minute
power manager hack to turn off the screen sooner after a
phone call ends.
Change-Id: I76422f952e3e894c90b3311e7d889899c79cbbaa
Dan Egnor [Wed, 21 Jul 2010 20:53:23 +0000 (13:53 -0700)]
Merge "Avoid leaking file descriptors when returning drop box events." into froyo
Dan Egnor [Tue, 20 Jul 2010 22:24:09 +0000 (15:24 -0700)]
Avoid leaking file descriptors when returning drop box events.
We can't use Parcel.writeValue() to write the ParcelFileDescriptor, otherwise
it leaks when returning the value to the caller (the flag gets lost). Change
the way DropBoxManager.Entry gets serialized so that it uses a bit of its own
flags value to track whether the data is a byte[] or a ParcelFileDescriptor.
Modify the dropbox unit test to add extensive checking of Entry serialization
and deserialization under various circumstances, and to include a regression
test to ensure that FD leaking doesn't happen.
Bug:
2847738
Change-Id: I4ccd17dd03ffab234340cd359e6f3510fdf81193
Tom Taylor [Wed, 21 Jul 2010 17:49:48 +0000 (10:49 -0700)]
Fix a merge problem with html mms
Html mms message support was added back in Jan '10. At that time, we
had moved the mms code out of the framework into the mms app. We decided
to back out that change and leave the mms code in its original place.
As a result, the changes to support html messages were lost. This
handmerged CL restores those changes. I'll cherry-pick this into master
as well. Bug
2858888
Change-Id: Icf8835edc8ac396698c167be5433a6fe1cfe6103
Dan Egnor [Tue, 20 Jul 2010 20:57:08 +0000 (13:57 -0700)]
Merge "COMMENT ONLY change to add some warnings about ParcelFileDescriptor behavior with Parcel.writeValue()." into froyo
Scott Main [Tue, 20 Jul 2010 16:59:35 +0000 (09:59 -0700)]
docs: add information about using color resources as drawables
Change-Id: I24d82292b700104294d268894b660bc8b7e5ddb0
Dan Egnor [Tue, 20 Jul 2010 16:03:35 +0000 (09:03 -0700)]
COMMENT ONLY change to add some warnings about ParcelFileDescriptor
behavior with Parcel.writeValue().
Change-Id: If55fcce29559379855735ff5297cf4f46d5d6be6
Bug:
2847738
Dan Egnor [Tue, 20 Jul 2010 01:14:50 +0000 (18:14 -0700)]
Merge "COMMENT-ONLY change to clarify Camera documentation." into froyo
Scott Main [Mon, 19 Jul 2010 21:42:13 +0000 (14:42 -0700)]
Merge "docs: add troubleshooting to eclipse guide about restarting adb" into froyo
Hung Dang [Fri, 16 Jul 2010 22:13:12 +0000 (15:13 -0700)]
Merge "Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test." into froyo
Scott Main [Fri, 16 Jul 2010 20:33:37 +0000 (13:33 -0700)]
docs: add troubleshooting to eclipse guide about restarting adb
Change-Id: I44bf5f488a2a322dabe86ec2e4f25169fc7091ce
Scott Main [Fri, 16 Jul 2010 21:52:03 +0000 (14:52 -0700)]
Merge "docs: editorial revisions to Search guide" into froyo
Scott Main [Wed, 26 May 2010 00:04:01 +0000 (17:04 -0700)]
docs: editorial revisions to Search guide
Change-Id: I6a2065304d1d80c46f3bb3c658ab55f1fe58b211
Yu Shan Emily Lau [Fri, 16 Jul 2010 18:55:43 +0000 (11:55 -0700)]
Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test.
Change-Id: I42527612764252d1c47bd29a2b88d5e3019cfdf9
Scott Main [Fri, 16 Jul 2010 01:14:16 +0000 (18:14 -0700)]
Merge "docs: update notepad tutorial to change EditNote activity title and update codelab zip" into froyo
Scott Main [Fri, 16 Jul 2010 00:56:59 +0000 (17:56 -0700)]
docs: dashboard update
Change-Id: I289cc30b0ae2f88429a8a01b4b7219a86b6d479c
Katie McCormick [Fri, 16 Jul 2010 00:25:10 +0000 (17:25 -0700)]
Merge "Doc change: Update AVD create instructions." into froyo
Katie McCormick [Thu, 8 Jul 2010 22:24:16 +0000 (15:24 -0700)]
Doc change: Update AVD create instructions.
Change-Id: Icb1a8200d1b8de4aedea0718a014ab57e057235d
Scott Main [Thu, 15 Jul 2010 18:16:32 +0000 (11:16 -0700)]
Merge "docs: lots of additions to the resources docs new drawable resources add <merge> and <include> to layout resource update drawable class descriptioons to point to resources guide add ID resource type" into froyo
Andrew Stadler [Thu, 15 Jul 2010 05:26:56 +0000 (22:26 -0700)]
Merge "Skip hostname verification when using insecure factory" into froyo
Dan Egnor [Mon, 12 Jul 2010 22:12:54 +0000 (15:12 -0700)]
COMMENT-ONLY change to clarify Camera documentation.
Change-Id: I6b75cfdfc34d1c16d93c02a32649022ce5505b11
Dianne Hackborn [Tue, 13 Jul 2010 02:03:26 +0000 (19:03 -0700)]
Merge "Fix issue #
2834005: Android Settings.Secure bypass" into froyo
Dianne Hackborn [Mon, 12 Jul 2010 22:54:38 +0000 (15:54 -0700)]
Fix issue #
2834005: Android Settings.Secure bypass
Change-Id: Ic4f14e2ff5c2b4f623405d30389863a9e3e82572
Dirk Dougherty [Tue, 15 Jun 2010 19:27:00 +0000 (12:27 -0700)]
Doc change: add notes for ndk r4b.
Change-Id: Idf4e4d2ac2ed9c30b3afe258546861084f3f20aa
Andrew Stadler [Mon, 12 Jul 2010 22:31:40 +0000 (15:31 -0700)]
Skip hostname verification when using insecure factory
If the factory was obtained by calling getInsecure(), calls to
createSocket() should skip hostname verification (along with all of the
other skipped safety checks.)
This change slightly relaxes the too-strict checking that was introduced
in change
7fc93c36ae235115727296780dbc35101622bbd4.
Bug:
2834174
Change-Id: Iab7ef861ad0ca727f82ee8cdb78b89b9e835740d
Robert Ly [Mon, 12 Jul 2010 21:32:22 +0000 (14:32 -0700)]
docchange: fixed typo "Pacskage" to "Package"
Change-Id: I6004dc7743dcd74315cbfc2cccc306ff8724e569
Scott Main [Thu, 8 Jul 2010 18:26:36 +0000 (11:26 -0700)]
docs: add redirect for download.html
Change-Id: Id54f1899c1933796524d6c2b5e991a652b354287
Scott Main [Thu, 8 Jul 2010 01:37:48 +0000 (18:37 -0700)]
Merge "docs: add caution about adt in eclipse 3.6" into froyo
Scott Main [Wed, 7 Jul 2010 23:47:16 +0000 (16:47 -0700)]
docs: add caution about adt in eclipse 3.6
Change-Id: I37c920f6a5290d891c4a6dea5978147a50eec807
Dirk Dougherty [Wed, 7 Jul 2010 21:29:29 +0000 (14:29 -0700)]
Merge "Doc change: Add revision notes for Android 2.2_r2 development platform. Fix some umappable characters in WebView class doc." into froyo
Dirk Dougherty [Wed, 23 Jun 2010 22:38:39 +0000 (15:38 -0700)]
Doc change: Add revision notes for Android 2.2_r2 development platform. Fix some umappable characters in WebView class doc.
Change-Id: I5522406335fbf96164a5b812ec4891c499343d1e
Scott Main [Fri, 2 Jul 2010 18:11:34 +0000 (11:11 -0700)]
docs: fix misc broken links
Change-Id: I7294276aff0c80498215870d5d72f7a3a9b2c99a
Chih-Chung Chang [Fri, 2 Jul 2010 14:43:31 +0000 (07:43 -0700)]
Merge "Flush binder buffer after setting raw heap to avoid leaking a reference." into froyo
Scott Main [Fri, 2 Jul 2010 06:26:58 +0000 (23:26 -0700)]
Merge "docs: update device dashboard; add historical chart" into froyo
Chih-Chung Chang [Thu, 1 Jul 2010 13:06:45 +0000 (21:06 +0800)]
Flush binder buffer after setting raw heap to avoid leaking a reference.
The problem was:
1. In handleShutter(), thread A in CameraService calls
registerBuffers(IMemoryHeap) and it's received by thread B
in system_server. [transaction 1]
2. While thread A is waiting for the reply, thread B calls
back to thread A to get the id of the heap
(IMemoryHeap.getHeapID). [transaction 2]
3. Thread A replies transaction 2 and is preemptied in kernel.
Thread B gets the reply and finishes registerBuffers and send
reply for transaction 1.
4. When thread A runs again, it gets the reply for transaction 1
and returns to handleShutter().
5. At this point the transaction buffer for transaction 2 (which
holds a reference to IMemoryHeap) is not freed because the
BC_FREE_BUFFER command is kept in thread A's local command
queue and not sent to the kernel.
6. Normally when thread A makes next transaction, the
BC_FREE_BUFFER command will be sent together (piggyback) with
the commands for that transaction. But in this case thread A
is a callback thread from camera driver, so it does not make
any binder calls afterwards, and the IMemoryHeap is never freed
(until the next time handleShutter is called).
Change-Id: I435a258187509bdbbaf353339eb9ea577610cbd2
Eric Laurent [Thu, 1 Jul 2010 02:41:56 +0000 (19:41 -0700)]
Fix issue
2811538: System server crash when disconnecting BT headset after using SCO off call.
Problem:
When the bluetooth device is removed, the AudioService clears all active SCO connections
and unlinks from the client application's binder interface death.
The problem is that the unlinking is done even if no more connections are active for a given client,
which throws a runtime exception that is not catched causing the system server to crash.
The fix consists in calling unlinkToDeath() in ScoClient.clearCount() only if the number of
active SCO connections for this client is not 0. The NoSuchElementException exception is also
catched when calling unlinkToDeath()
Change-Id: I7086424301fc63a5666da61c38169349d3e078f4
Scott Main [Thu, 1 Jul 2010 18:39:08 +0000 (11:39 -0700)]
docs: update device dashboard; add historical chart
Change-Id: Iafed4ed927141d34dcdb728918320be2fa2cf151
Doug Zongker [Wed, 30 Jun 2010 18:12:19 +0000 (11:12 -0700)]
Merge "Verify hostname where possible, and clarify where not." into froyo
Dan Egnor [Wed, 30 Jun 2010 00:51:28 +0000 (17:51 -0700)]
Verify hostname where possible, and clarify where not.
Bug:
2807409
Change-Id: I6f6a6b22a48149d9f1f45ff8f53103b25706ecc0
Scott Main [Wed, 7 Apr 2010 17:50:20 +0000 (10:50 -0700)]
docs: revise menu guide to focus more on using menu resources
instead of defining menus in code.
And revise some style.
Change-Id: I0a5a19a51062d72cdb9045c9607cab04b69f554c
Scott Main [Tue, 29 Jun 2010 22:22:03 +0000 (15:22 -0700)]
docs: fix typo
Change-Id: I39849068bb1b35a766df93ab3440829730efabaa
Scott Main [Fri, 25 Jun 2010 22:55:57 +0000 (15:55 -0700)]
docs: update backup guide and bmgr tool
elaborate the guide to testing a backup agent and add links between the docs
Change-Id: I35f815d1848c6bd7c6bfaee214f333e35a6cb23c
Scott Main [Fri, 25 Jun 2010 01:10:41 +0000 (18:10 -0700)]
Merge "docs: Remove the TOS from download flow and remove TOS entirely because it's no longer relevant to the SDK download package" into froyo
Scott Main [Thu, 24 Jun 2010 23:18:56 +0000 (16:18 -0700)]
docs: Remove the TOS from download flow and remove TOS entirely because
it's no longer relevant to the SDK download package
Change-Id: I5f0b2b6258db1f09f300567fc0d22b5e3effd324
Dianne Hackborn [Thu, 24 Jun 2010 23:00:06 +0000 (16:00 -0700)]
Merge "Properly note the current active restore set's token" into froyo
Christopher Tate [Thu, 24 Jun 2010 22:58:01 +0000 (15:58 -0700)]
Properly note the current active restore set's token
Bug:
2796780
Change-Id: Iad601ed96ae73cf34910a276350712e6af19bb4e
Nick Pelly [Thu, 24 Jun 2010 18:52:39 +0000 (11:52 -0700)]
Merge "Do not log AT command traffic by default." into froyo
Nick Pelly [Thu, 24 Jun 2010 16:38:27 +0000 (09:38 -0700)]
Do not log AT command traffic by default.
Bug:
2792732
Change-Id: I0ef25f38f38685291af6680cf653046eb391da5a
Scott Main [Wed, 23 Jun 2010 16:57:46 +0000 (09:57 -0700)]
Merge "docs: update backup dev guide with Android Backup Service registration info" into froyo
Scott Main [Tue, 22 Jun 2010 05:05:12 +0000 (22:05 -0700)]
docs: update backup dev guide with Android Backup Service registration info
Change-Id: I16696abbd517a5a740ff641ca0b17ffafbcf4993
Dirk Dougherty [Tue, 22 Jun 2010 18:13:48 +0000 (11:13 -0700)]
Merge "Doc change: Fix description of certificate matching requirement for app updates." into froyo
Dirk Dougherty [Mon, 21 Jun 2010 23:15:28 +0000 (16:15 -0700)]
Doc change: Fix description of certificate matching requirement for app updates.
Change-Id: I38a0b997f5cb634bfdab1c0ecaa2b0d19e68256a
Scott Main [Tue, 8 Jun 2010 22:54:52 +0000 (15:54 -0700)]
docs: lots of additions to the resources docs
new drawable resources
add <merge> and <include> to layout resource
update drawable class descriptioons to point to resources guide
add ID resource type
Change-Id: I733eec50bb2671f28c9e6dd7dec14eb6586f5193
Kenny Root [Mon, 21 Jun 2010 18:03:50 +0000 (11:03 -0700)]
Import revised translations
Change-Id: I4b91aea9c53332569a7123fdb32141530ede6d3d
Kenny Root [Mon, 21 Jun 2010 01:54:45 +0000 (18:54 -0700)]
Import revised translations
Change-Id: Ife82312cc21acc144a70718f79afcafbdd7eda7a
Dianne Hackborn [Thu, 17 Jun 2010 22:49:33 +0000 (15:49 -0700)]
Work on issue #
2778549: Idle FRF72 is awake 18 mins more than ERE27 in 13hr test
Modify UIModeManager to not get location updates every thirty minutes.
Instead it gets one once a day, and requests a new update when airplane
mode is turned off or the time zone changes.
Change-Id: I8044c27b5cd77709e4b872e2e8edd352f23e4af1
Scott Main [Thu, 17 Jun 2010 17:07:25 +0000 (10:07 -0700)]
docs: update notepad tutorial to change EditNote activity title and update codelab zip
bug:
2762919
Change-Id: Iad1698893b949d921d2807730041e07694c06571
Scott Main [Thu, 17 Jun 2010 00:29:40 +0000 (17:29 -0700)]
docs: small edits to catchup to edits made in html pushed live
Change-Id: I62b3e7dc5fcab881dd09ca897b05425a8c28cb92
James Dong [Wed, 16 Jun 2010 23:10:52 +0000 (16:10 -0700)]
Merge "When filling the cache, we always time out waiting for a condition that won't occur. We are actually improving the power consumption for streaming applications like Pandora." into froyo
James Dong [Wed, 16 Jun 2010 01:14:03 +0000 (18:14 -0700)]
When filling the cache, we always time out waiting for a condition that won't occur.
We are actually improving the power consumption for streaming applications like Pandora.
Change-Id: Id32bacbc962e8c69c056599479b308d6a07b7a20
Dave Sparks [Wed, 16 Jun 2010 21:11:40 +0000 (14:11 -0700)]
Merge "TimedEventQueue is apparently important for glitch-free media playback, and so having it inherit its priority from the thread that created it is a bad idea. Instead, set the priority explicitly, and bump it to slightly higher than normal." into froyo
Scott Main [Wed, 16 Jun 2010 18:06:43 +0000 (11:06 -0700)]
docs: edits to resources doc
Change-Id: I1dbe5d213d8f85b2ecaeed45ddbe215f199e2c9e
Marco Nelissen [Tue, 15 Jun 2010 19:34:50 +0000 (12:34 -0700)]
TimedEventQueue is apparently important for glitch-free media playback, and so
having it inherit its priority from the thread that created it is a bad idea.
Instead, set the priority explicitly, and bump it to slightly higher than normal.
Change-Id: I01843f24905790ce2e2cde5d11a99346cfbf968d
Scott Main [Wed, 16 Jun 2010 17:22:53 +0000 (10:22 -0700)]
docs: update dashboard again
Change-Id: Ia3ae9149879e355d15d42ac612e6a758c83b59f6
Dan Morrill [Wed, 16 Jun 2010 04:41:42 +0000 (21:41 -0700)]
As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
that have minSdkLevel (or targetSdkLevel) set to 4 or lower should not be
presumed to require Bluetooth just because they take the permission.
Change-Id: Ia629e9ef0425a577e4e14f9b348f5aa2b39c1e74
Scott Main [Wed, 16 Jun 2010 02:33:03 +0000 (19:33 -0700)]
Merge "docs: update dashboard" into froyo
Ying Wang [Tue, 15 Jun 2010 20:45:08 +0000 (13:45 -0700)]
Move android-common to framework/ex
This is one necessary step by unbundling.
Change-Id: I9d922a52374ad6331fa2e39fa4b5e16ad7d108fa
Joe Onorato [Tue, 15 Jun 2010 20:59:10 +0000 (13:59 -0700)]
Merge "Use the droidcore goal with dist-for-goals." into froyo
Joe Onorato [Tue, 15 Jun 2010 20:58:33 +0000 (13:58 -0700)]
Merge "The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them." into froyo
Scott Main [Tue, 15 Jun 2010 17:42:10 +0000 (10:42 -0700)]
docs: update dashboard
Change-Id: If8d1ad8aa99d93f707635631a44e6c359895302a
Scott Main [Tue, 15 Jun 2010 17:36:27 +0000 (10:36 -0700)]
Merge "docs: add information about known issues in resource matching for screen density and system version. Add section about providing compatibility for multiple devices" into froyo
Scott Main [Tue, 15 Jun 2010 17:36:14 +0000 (10:36 -0700)]
Merge "docs: fix markup error" into froyo
Scott Main [Fri, 11 Jun 2010 01:05:13 +0000 (18:05 -0700)]
docs: add information about known issues in resource matching
for screen density and system version.
Add section about providing compatibility for multiple devices
bug:
2760561
Change-Id: I9b3a515a14d53923a15b1931f6dd24f295874362
Dirk Dougherty [Fri, 11 Jun 2010 23:49:14 +0000 (16:49 -0700)]
Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo
Dirk Dougherty [Fri, 11 Jun 2010 22:59:47 +0000 (15:59 -0700)]
Doc change: remove pdf summary of guidelines from templates archive.
Change-Id: I5394d1f95013ddf7790beda1f33e212bfbaee641
Scott Main [Fri, 11 Jun 2010 16:03:22 +0000 (09:03 -0700)]
docs: fix markup error
Change-Id: Icea017095f58068c55dd3c1c18cecbdf06afb595
Irfan Sheriff [Fri, 11 Jun 2010 01:56:04 +0000 (18:56 -0700)]
Merge "Remove indefinite DHCP retries" into froyo
Joe Onorato [Thu, 10 Jun 2010 02:06:02 +0000 (19:06 -0700)]
Use the droidcore goal with dist-for-goals.
Change-Id: Ie0042028c4a33a23a4eb9aed1d1015e580c3e168
Joe Onorato [Fri, 11 Jun 2010 01:34:55 +0000 (18:34 -0700)]
The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.
Change-Id: I9896b11a9b90cbbbe2170243c8bdbc40231dfbff
Irfan Sheriff [Thu, 10 Jun 2010 21:05:23 +0000 (14:05 -0700)]
Remove indefinite DHCP retries
Replace indefinite DHCP retries
with a sufficiently large retry count
Bug:
2761057
Change-Id: I4570b74476aa78c71c73e06c2aafac33d924e867
Mike Lockwood [Thu, 10 Jun 2010 22:28:31 +0000 (15:28 -0700)]
Merge "Don't adjust lights if screen or button brightness is changed when the screen is off." into froyo
Adam Powell [Thu, 10 Jun 2010 21:09:50 +0000 (14:09 -0700)]
Merge "Fix bug
2757693 - Multi-touch coordinates can jump when a finger goes down." into froyo
Mike Lockwood [Thu, 10 Jun 2010 18:12:33 +0000 (14:12 -0400)]
Don't adjust lights if screen or button brightness is changed when the screen is off.
Change-Id: I798a240374c3a739e1f1eaf36fa9fdef8416f2a2
BUG:
2758292
Signed-off-by: Mike Lockwood <lockwood@android.com>
Nick Kralevich [Wed, 9 Jun 2010 21:27:43 +0000 (14:27 -0700)]
do not merge: cherry-picked
929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch
Change-Id: Ie20371234a531f65f523682a0d0c27394dc30afa
Kenny Root [Thu, 10 Jun 2010 05:25:58 +0000 (22:25 -0700)]
Import revised translations
Change-Id: I25faf1ade5252fa29cf43aa13e99fef9fc31b418
Adam Powell [Thu, 10 Jun 2010 00:10:04 +0000 (17:10 -0700)]
Fix bug
2757693 - Multi-touch coordinates can jump when a finger goes down.
Change-Id: I26bd54cec739ca8d91d2c2b18b90134f20dbd907
Jim Miller [Tue, 8 Jun 2010 23:31:32 +0000 (16:31 -0700)]
Merge "Fix
2737842: Disable KeguardManager API if device policy is enabled" into froyo
Jim Miller [Tue, 8 Jun 2010 21:27:42 +0000 (14:27 -0700)]
Fix
2737842: Disable KeguardManager API if device policy is enabled
This change adds notification to find out when the device policy
has changed. When an admin adds or changes a policy, we get notified
and reset the state of keyguard to be enabled.
It also moves disabling keyguard into the TokenWatcher.acquired()
method to avoid disabling keyguard when a policy doesn't permit it.
This avoids reference counting issues in TokenWatcher and hence relieves
the ordering issue.
There is one remaining caveat. An application that uses KeyguardManager
to disable keyguard will need to disable keyguard again after any
policy change.
Tested:
Install and run app that disables keyguard with no admin. Result: keyguard is enabled/disabled as expected.
Enable admin and set quality = "something" after installing & running app. Result: keyguard is enabled.
Change admin password quality to "unspecified" and re-run app (per caveat). Result: keyguard is disabled.
Change admin password quality to "something" again. Result: keyguard is enabled.
Disable admin : Result: keyguard is enabled until app runs again (per caveat).
Added minor cosmetic changes after review.
Change-Id: I302f2b01446bf031f746b0f3e8b5fd7a6cc0e648
Romain Guy [Tue, 8 Jun 2010 19:59:36 +0000 (12:59 -0700)]
Merge "Add a method to hide/show a SurfaceView's surface." into froyo
Romain Guy [Tue, 8 Jun 2010 00:04:33 +0000 (17:04 -0700)]
Add a method to hide/show a SurfaceView's surface.
This can be used to move a surface offscreen to avoid the cost of compositing it.
This preserves the window and therefore the OpenGL context when used in h/w
accelerated apps.
Change-Id: I280295376601b17989d0fc8a271af66650016f09
Jim Miller [Tue, 8 Jun 2010 04:19:16 +0000 (21:19 -0700)]
Fix SDK build.
On branch fix_sdk
Changes to be committed:
(use "git reset HEAD <file>..." to unstage)
modified: core/java/android/app/KeyguardManager.java
Change-Id: I56848db098822536f0ac32efc8f0eb1d725bf6f9
Jim Miller [Tue, 8 Jun 2010 02:24:45 +0000 (19:24 -0700)]
Merge "Fix
2737842: disable keyguard API when device policy is enabled." into froyo