25097 Commits

Author SHA1 Message Date
Mathias Agopian
570898098f am 37583aeb: am 1debc665: fix [2751143] Device crashes when in a text box for too long 2010-06-08 15:49:45 -07:00
Jim Miller
284b62e1b8 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
2010-06-08 15:47:52 -07:00
Mathias Agopian
37583aebc4 am 1debc665: fix [2751143] Device crashes when in a text box for too long 2010-06-08 15:47:37 -07:00
Jason Sams
cbe4a73fef Merge "Begin using reflected files." 2010-06-08 15:43:57 -07:00
Jean-Baptiste Queru
32d0d8fcc8 Merge "Bluetooth:LCD wakeup during remote BT pairing request. This change fixes the issue of LCD not coming up during remote initiated pairing request when android is in suspend" 2010-06-08 15:43:02 -07:00
Mathias Agopian
1debc66521 fix [2751143] Device crashes when in a text box for too long 2010-06-08 15:40:56 -07:00
Jason Sams
e29f3e74f7 Begin using reflected files.
Change-Id: I5307a0eac9c206b85c0cf7451d3f8300134bf8e3
2010-06-08 15:40:48 -07:00
Adam Powell
a408291e22 Dropdown mode for ActionBar; style and API updates 2010-06-08 14:25:24 -07:00
The Android Open Source Project
4bd6940c57 merge from open-source master
Change-Id: Id2305d345a6cc248e08c0bdc6f3c8d999cc1d861
2010-06-08 13:17:41 -07:00
James Dong
30bb8f89ad am d49c9818: am c44c4742: Merge "Remove some hard-coded encoding parameters" into kraken 2010-06-08 13:17:07 -07:00
James Dong
d49c981811 am c44c4742: Merge "Remove some hard-coded encoding parameters" into kraken 2010-06-08 13:15:47 -07:00
James Dong
c44c4742e7 Merge "Remove some hard-coded encoding parameters" into kraken 2010-06-08 13:13:26 -07:00
Romain Guy
8d49cd77df am c62c4c8b: am 804d0496: am 71d73a0d: Merge "Add a method to hide/show a SurfaceView\'s surface." into froyo 2010-06-08 13:05:31 -07:00
Romain Guy
c62c4c8be4 am 804d0496: am 71d73a0d: Merge "Add a method to hide/show a SurfaceView\'s surface." into froyo 2010-06-08 13:02:14 -07:00
Romain Guy
6a102b4bc7 am 71d73a0d: Merge "Add a method to hide/show a SurfaceView\'s surface." into froyo
Merge commit '71d73a0dfc110d0bdfc1b7ba385db3e2cfe007e5' into froyo-plus-aosp

* commit '71d73a0dfc110d0bdfc1b7ba385db3e2cfe007e5':
  Add a method to hide/show a SurfaceView's surface.
2010-06-08 13:01:05 -07:00
Romain Guy
804d04969d am 71d73a0d: Merge "Add a method to hide/show a SurfaceView\'s surface." into froyo
Merge commit '71d73a0dfc110d0bdfc1b7ba385db3e2cfe007e5' into kraken

* commit '71d73a0dfc110d0bdfc1b7ba385db3e2cfe007e5':
  Add a method to hide/show a SurfaceView's surface.
2010-06-08 13:00:30 -07:00
Romain Guy
71d73a0dfc Merge "Add a method to hide/show a SurfaceView's surface." into froyo 2010-06-08 12:59:36 -07:00
Kenny Root
b209c9e2a2 Merge "Range checking for ResTable_map" 2010-06-08 12:52:57 -07:00
Kenny Root
06983bc566 Range checking for ResTable_map
Correct previous offset change and get ready for safe-iop.

Change-Id: Ib276c726f32b0711a72f47d3263eb21640e5a800
2010-06-08 12:51:49 -07:00
Brad Fitzpatrick
37d33a546b am 599f7287: am 9ac3743d: Merge "Log.wtf when databases go to be downgraded." into kraken 2010-06-08 12:40:57 -07:00
Brad Fitzpatrick
599f7287d6 am 9ac3743d: Merge "Log.wtf when databases go to be downgraded." into kraken 2010-06-08 12:38:52 -07:00
Brad Fitzpatrick
9ac3743dbd Merge "Log.wtf when databases go to be downgraded." into kraken 2010-06-08 12:37:34 -07:00
James Dong
1244eab2ce Remove some hard-coded encoding parameters
Change-Id: I7a8ccd5d57891a6a585c8da2ee53acb094955913
2010-06-08 12:30:58 -07:00
Brad Fitzpatrick
44dc76a8a7 Log.wtf when databases go to be downgraded.
BUG=2734435

Change-Id: I686d6d9415f3081544c3fbe379287c31e0ecec20
2010-06-08 12:20:51 -07:00
James Dong
7cbc12b9ce am 15c0c098: am dae9fd31: Initial check-in for collecting stats from authoring engine at runtime 2010-06-08 12:00:30 -07:00
James Dong
15c0c0987d am dae9fd31: Initial check-in for collecting stats from authoring engine at runtime 2010-06-08 11:58:34 -07:00
James Dong
dae9fd3190 Initial check-in for collecting stats from authoring engine at runtime
Change-Id: I93a9d8bd260efc5e7fc135b726e3f1307c6df794
2010-06-08 11:54:21 -07:00
Romain Guy
afc3e11f10 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
2010-06-08 11:34:43 -07:00
Kenny Root
e5bc01ba10 Merge "Improve checking in aapt dump" 2010-06-08 10:29:17 -07:00
Kenny Root
3379195a76 Improve checking in aapt dump
The aapt dump reading had less error checking than the actual parsing,
so this change brings it more into parity so that bad APKs don't crash
"aapt dump"

Change-Id: Ib30e63e41be5c652645c4aa0de580a87b184529d
2010-06-08 10:28:19 -07:00
Jean-Baptiste Queru
e6c2b8d6bd Merge "Fixed problem with proxy server sometimes responds with 400 Bad Request when trying to connect to a site using https." 2010-06-08 10:19:51 -07:00
James Dong
cda2af1080 am ef2ad683: am 31b19758: Merge "Second part of speeding up video recording frame rate" into kraken 2010-06-08 10:17:29 -07:00
Andreas Huber
1f06de3102 am ae9348bc: am 097da964: Merge "Initial checkin of preliminary rtsp support for stagefright." into kraken 2010-06-08 10:15:34 -07:00
James Dong
ef2ad6838d am 31b19758: Merge "Second part of speeding up video recording frame rate" into kraken 2010-06-08 10:15:33 -07:00
Jim Miller
1a4ebd42e2 am cfa2d7c9: am 700a9506: am cb52cb52: Fix SDK build. 2010-06-08 10:15:27 -07:00
Jim Miller
aed22d27bb am a9a0a0b2: am 7d70358a: am bde25c20: Merge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo 2010-06-08 10:15:21 -07:00
Christopher Tate
c2bce63b66 am 40c20b06: am 8a7fa44f: am ac24d23c: Merge "Don\'t bring up Launcher until after boot complete" into froyo 2010-06-08 10:15:15 -07:00
Dianne Hackborn
e20a4a4fa8 am fe2c0864: am 0bc0a46a: am d1d9047d: Merge "Fix issue #2749322: addPackageToPreferred throws SecurityException" into froyo 2010-06-08 10:15:06 -07:00
James Dong
31b1975890 Merge "Second part of speeding up video recording frame rate" into kraken 2010-06-08 10:14:26 -07:00
Robert Greenwalt
ab30f50ee4 Merge "resolved conflicts for merge of ee09dc67 to master" 2010-06-08 10:13:25 -07:00
Robert Greenwalt
687f2a07bf resolved conflicts for merge of ee09dc67 to master
Change-Id: I8b0b595580d9c6d44b84e636012705dc913fa6ac
2010-06-08 10:10:54 -07:00
James Dong
4f501f0f2b Second part of speeding up video recording frame rate
1. Avoid copying the input recording frames to the encoder via OMX interface
   for TI video encoder
   This is a missing change for part one which help reduces the CPU load.

2. Release output buffers as early as possible. This is a little bit helpful, but not critical.

TODO:
We should save the underlying pointers allocated by the OMX component before we replace them
and restore them before we call OMX_FreeBuffer()!

Change-Id: Ib3a88978f4c3b1153808872eaa7ac4c265a811ff
2010-06-08 10:01:47 -07:00
Kenny Root
a5aa998173 Merge "Include stdlib to fix sim build" 2010-06-08 09:34:39 -07:00
Andreas Huber
ae9348bc6e am 097da964: Merge "Initial checkin of preliminary rtsp support for stagefright." into kraken 2010-06-08 09:20:59 -07:00
Andreas Huber
097da9644f Merge "Initial checkin of preliminary rtsp support for stagefright." into kraken 2010-06-08 09:19:07 -07:00
Kenny Root
36a685d70f Include stdlib to fix sim build
Change-Id: I7732461a9351f53f9ddadcfb26485f2e553e056b
2010-06-08 08:38:34 -07:00
Leon Clarke
2dbb41d790 Merge webkit.org at r60469: Skip a new isolated world test
Change-Id: I72f8da5c7a045dfd9ab2346d472756abcb4fe5a2
2010-06-08 15:17:15 +01:00
Ben Murdoch
fbc5cfea45 Merge "DumpRenderTree fix." 2010-06-08 02:46:21 -07:00
Jim Miller
cfa2d7c93a am 700a9506: am cb52cb52: Fix SDK build. 2010-06-07 21:25:15 -07:00
Jim Miller
700a95068e am cb52cb52: Fix SDK build.
Merge commit 'cb52cb52253c3832ccc7f5f1dbb4d8a0bd8178c0' into kraken

* commit 'cb52cb52253c3832ccc7f5f1dbb4d8a0bd8178c0':
  Fix SDK build.
2010-06-07 21:23:53 -07:00