summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Import revised translationsKenny Root2010-06-094-10/+10
| | | | Change-Id: I25faf1ade5252fa29cf43aa13e99fef9fc31b418
* Merge "Fix 2737842: Disable KeguardManager API if device policy is enabled" ↵Jim Miller2010-06-083-37/+77
|\ | | | | | | into froyo
| * Fix 2737842: Disable KeguardManager API if device policy is enabledJim Miller2010-06-083-37/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge "Add a method to hide/show a SurfaceView's surface." into froyoRomain Guy2010-06-081-0/+41
|\ \ | |/ |/|
| * Add a method to hide/show a SurfaceView's surface.Romain Guy2010-06-081-0/+41
| | | | | | | | | | | | | | | | 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
* | Fix SDK build.Jim Miller2010-06-071-4/+4
| | | | | | | | | | | | | | | | | | | | 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
* | Merge "Fix 2737842: disable keyguard API when device policy is enabled." ↵Jim Miller2010-06-072-19/+50
|\ \ | | | | | | | | | into froyo
| * | Fix 2737842: disable keyguard API when device policy is enabled.Jim Miller2010-06-072-19/+50
| |/ | | | | | | | | | | | | This fix disables KeyguardManager's enable/disable API when any device policy admin requests a policy that enforces a password. Change-Id: Idb1da16b14ed8963142f7b1f62d2b060d84ffa65
* | Merge "Don't bring up Launcher until after boot complete" into froyoChristopher Tate2010-06-071-1/+1
|\ \
| * | Don't bring up Launcher until after boot completeChristopher Tate2010-06-071-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The preboot upgrade handling was bringing up the acore process with a default application object, then the normal "start the HOME app" code was bringing up Launcher2 [hosted in acore] in anticipation of boot completion... but then it saw that the host process was alive and continued with Launcher2's init. Launcher2 depends on a custom application object, however, so it crashed immediately. This change ensures that the HOME app is not actually initted at that level until after boot has completed, at which point its proper application class can be instantiated. Fixes bug #2732250 Change-Id: I1a15384e2c0d50e14300df0c0db236bd7b1a187c
* | Merge "Fix issue #2749322: addPackageToPreferred throws SecurityException" ↵Dianne Hackborn2010-06-071-6/+2
|\ \ | | | | | | | | | into froyo
| * | Fix issue #2749322: addPackageToPreferred throws SecurityExceptionDianne Hackborn2010-06-071-6/+2
| |/ | | | | | | Change-Id: I96cdc110fd9acca4b6c95d281e819bad1e4557f8
* | Cut logging, boost efficiency of ThrottleServiceRobert Greenwalt2010-06-071-17/+20
|/ | | | | | | | Changed the Alarms to be non-waking. bug:2748959 bug:2747862 Change-Id: I9e4294162a4fc2f90aed36393b858edcf82aa307
* Merge "Watchdog now records kernel stacks when it fires" into froyoChristopher Tate2010-06-044-0/+136
|\
| * Watchdog now records kernel stacks when it firesChristopher Tate2010-06-044-0/+136
| | | | | | | | | | | | | | | | The kernel threads are appended to the usual /data/anr/traces.txt file and dropboxed along with the usual Dalvik stack dumps. Change-Id: I120f1f5ee54c965efe9ac0c7f40fdef56385f1fa NOTE: this change depends on the kernel publishing /proc/$PID/stack
* | Merge "xhdpi" into froyoDianne Hackborn2010-06-041-0/+5
|\ \
| * | xhdpiDianne Hackborn2010-06-041-0/+5
| | | | | | | | | | | | | | | | | | This is only a tool (aapt) change, and does not impact any current code. Change-Id: I562063f612af919eaadba8ac4868a95ff41ac840
* | | Merge "Make the DUN apn data secure." into froyoRobert Greenwalt2010-06-045-5/+90
|\ \ \
| * | | Make the DUN apn data secure.Robert Greenwalt2010-06-045-5/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than come out of the user-modifiable APN DB, the DUN APN data will come first from a built-in resource and then potentially overriden by a secure setting (which is gservices upgradable). Also made the "require-dun" setting secure-setting overridable. bug:2736390 Change-Id: I1e4644c3839f06c977b83797641f3948785146a2
* | | | Don't crash when low storage is encountered pre-boot completion.Jeff Hamilton2010-06-041-0/+2
| |/ / |/| | | | | | | | | | | Bug: 2741633 Change-Id: Ic073ead64ff43b2e2c32b439756cd71c2b6550b8
* | | Merge "Changes to the prefetcher to allow for bursts of data to be ↵Andreas Huber2010-06-031-12/+50
|\ \ \ | | | | | | | | | | | | transferred, hopefully allowing the radio to go to low-power mode while idle." into froyo
| * | | Changes to the prefetcher to allow for bursts of data to be transferred, ↵Andreas Huber2010-06-031-12/+50
| |/ / | | | | | | | | | | | | | | | | | | hopefully allowing the radio to go to low-power mode while idle. Change-Id: I03dbdac3cd250340059ea43b341129b30acce4e2 related-to-bug: 2736779
* | | Merge "Doc change: Adjust security sandbox description." into froyoDirk Dougherty2010-06-031-9/+8
|\ \ \
| * | | Doc change: Adjust security sandbox description.Dirk Dougherty2010-06-021-9/+8
| |/ / | | | | | | | | | Change-Id: I7b2f530afe65fe0abe6c66e69c9abddcfbc5ae9c
* | | Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." ↵James Dong2010-06-031-2/+6
|\ \ \ | |/ / |/| | | | | into froyo
| * | Fix a Javadoc to clarify when setAudioStreamType() should be called.James Dong2010-06-031-2/+6
| |/ | | | | | | | | | | bug - 2737926 Change-Id: I8718c3d1a544cf5cb1b7e98b6c24fe0e6d3574ba
* | Merge "docs: a couple doc bug fixes" into froyoScott Main2010-06-022-3/+3
|\ \ | |/ |/|
| * docs: a couple doc bug fixesScott Main2010-06-022-3/+3
| | | | | | | | Change-Id: I37b2adf9d30249eb9c0cbb007d9172d3956421b5
* | Merge "Doc change: rename slide decks for sorting by year then quarter." ↵Dirk Dougherty2010-06-013-0/+0
|\ \ | | | | | | | | | into froyo
| * | Doc change: rename slide decks for sorting by year then quarter.Dirk Dougherty2010-06-013-0/+0
| | | | | | | | | | | | Change-Id: I77b60f2e38915eae1a23e3c78a2260eacc33c117
* | | Merge "Comment-only change to add documentation for FileObserver" into froyoDan Egnor2010-06-011-13/+67
|\ \ \ | |/ / |/| |
| * | Comment-only change to add documentation for FileObserverDan Egnor2010-05-311-13/+67
| | | | | | | | | | | | Change-Id: Icd9bc65be020a23f78c8bcda78fc68e7d05c93b4
* | | Merge "Doc change: updated dashboards stats." into froyoDirk Dougherty2010-06-013-12/+12
|\ \ \
| * | | Doc change: updated dashboards stats.Dirk Dougherty2010-06-013-12/+12
| | | | | | | | | | | | | | | | Change-Id: Id86dcc432d81fa4154995211d3e65a7c3366814e
* | | | Also dump system process threads halfway through the watchdog intervalChristopher Tate2010-05-282-6/+26
| |/ / |/| | | | | | | | | | | | | | | | | | | | This gives us a snapshot of what the system process was doing after 30 seconds of apparent inactivity as well as after 1 minute, to help distinguishing actual deadlocks from too-slow progress, livelock, etc. Change-Id: I19758861d1b25f298e88788e8f1c7ec7bf828823
* | | Merge "Fix typo in EastAsianWidth javadoc" into froyoKenny Root2010-05-271-3/+3
|\ \ \
| * | | Fix typo in EastAsianWidth javadocKenny Root2010-05-271-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The Javadoc had a missing close <code> tag and also failed to mention the "start" parameter in the doc. Change-Id: I861d6646e82e1d49f23a09de8b68a61f81689f83
* | | | Merge "Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove ↵Dirk Dougherty2010-05-274-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | latest_samples.zip from shareables." into froyo
| * | | | Doc change: Add ADL 2Q10 slide decks to shareables directory. Remove ↵Dirk Dougherty2010-05-274-0/+0
| | |/ / | |/| | | | | | | | | | | | | | | | | | latest_samples.zip from shareables. Change-Id: I5ff67605829b4fc09263d56a76aefe57f40783fd
* | | | Merge "Don't enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts." ↵Jeff Hamilton2010-05-271-4/+14
|\ \ \ \ | | | | | | | | | | | | | | | into froyo
| * | | | Don't enforce broadcast timeouts for PRE_BOOT_COMPLETED broadcasts.Jeff Hamilton2010-05-261-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They're designed to handle one time upgrade code, which may take a significant amount of time. Third party code cannot receive this broadcast so the timing should be able to be kept under control. Bug: 2713849 Change-Id: I3733b6530198bebd9b8c2ba6f9f27a7999336b8d
* | | | | Merge "Fix null pointer exception" into froyoIrfan Sheriff2010-05-261-2/+5
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix null pointer exceptionIrfan Sheriff2010-05-261-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 2718857 Change-Id: I4b04284fd5b3a4881297fe15555e9f1ca91d73cb
* | | | | Merge "Doc change: Suggest min keysize of 2048 for keys." into froyoDirk Dougherty2010-05-261-17/+20
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Doc change: Suggest min keysize of 2048 for keys.Dirk Dougherty2010-05-261-17/+20
| | | | | | | | | | | | | | | | | | | | Change-Id: I6dcfe9aa12338e4ad71db2e6812ce387a75c09f0
* | | | | Merge "Doc change: fix adt download page, misc doc fixes." into froyoDirk Dougherty2010-05-264-16/+13
|\ \ \ \ \
| * | | | | Doc change: fix adt download page, misc doc fixes.Dirk Dougherty2010-05-264-16/+13
| |/ / / / | | | | | | | | | | | | | | | Change-Id: Ifa04ea6f31cf0677bf95263188a137fd8dd721eb
* | | | | Merge "Fix escaping of characters" into froyoIrfan Sheriff2010-05-261-4/+9
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix escaping of charactersIrfan Sheriff2010-05-241-4/+9
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | \ and " in SSID and password cause issues with netd parsing. Fix it. Bug: 2708960 Change-Id: I278ca21c0bbfd9dc430a2f9ae02828274a0d2376
* | | | Merge "Added the runtime parameters for the mediarecorder stress test. Set ↵Yu Shan Emily Lau2010-05-253-20/+126
|\ \ \ \ | | | | | | | | | | | | | | | the total number of the stress loops of camera preview memory test to 200." into froyo