summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix SetupWizard black screen issue for EDU devices" into lmp-mr1-devJim Miller2014-11-031-7/+9
|\
| * Fix SetupWizard black screen issue for EDU devicesJim Miller2014-10-311-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a problem where EDU devices show a black screen if the device is rebooted after setting a pin/pattern/password but before completing SetupWizard. The issue is that the system doesn't expect to see a state where the device is not provisioned but has a pin/pattern/password because it wasn't possible before. With the addition of the ability for EDU devices to add a pin/pattern/password, we can now get into this unforseen state. The fix ignores provisioning if a password is set so that the user can reach the security screen to unlock the device and continue with SetupWizard. Fixes bug 18022051 Change-Id: Ie88a75530d964c02458c25866f0629877214edf4
* | Merge "Fix USB audio disconnect logic" into lmp-mr1-devMike Lockwood2014-11-032-136/+206
|\ \
| * | Fix USB audio disconnect logicMike Lockwood2014-10-312-136/+206
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, disconnecting any USB device would terminate USB audio playback. Also moved USB audio support to a separate class and did some prep work for multiple USB audio device support. Bug: 18203024 Change-Id: I49822c2c47428e658c853b2ec83c7313e626a1cb
* | | Merge "Fix counting" into lmp-mr1-devJohn Reck2014-11-031-1/+1
|\ \ \
| * | | Fix countingJohn Reck2014-11-031-1/+1
| | | | | | | | | | | | | | | | Change-Id: I9a3568908a7223d69430c1765fb5a4db96d7ac9c
* | | | Merge "Improve TrustManagerService user lifecycle" into lmp-mr1-devAdrian Roos2014-11-031-6/+49
|\ \ \ \
| * | | | Improve TrustManagerService user lifecycleAdrian Roos2014-11-031-6/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Only bind agents of running users - Explicitly clean up state when users are removed - Delay binding until third-party apps can actually run Bug: 18102460 Change-Id: I5017adc1634b249068099fc5779ba95904312438
* | | | | Merge "Fix cancel crash" into lmp-mr1-devJohn Reck2014-11-031-1/+1
|\ \ \ \ \
| * | | | | Fix cancel crashJohn Reck2014-11-031-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Bug: 18059003 Change-Id: I579468fbd1645049f8fbe335faf4da1f2d3bb0a3
* | | | | am 2d7e612e: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Geoff Mendal2014-11-030-0/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-sprout-dev * commit '2d7e612ed1df3580d35cfc94bbcba660f0f058e2': Import translations. DO NOT MERGE
| * \ \ \ \ Merge "Import translations. DO NOT MERGE" into lmp-sprout-devGeoff Mendal2014-11-032-5/+5
| |\ \ \ \ \
| | * | | | | Import translations. DO NOT MERGEGeoff Mendal2014-11-032-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia68d4e853864dd44c7531374c30794d4a0bbd8a3 Auto-generated-cl: translation import
* | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-devGeoff Mendal2014-11-036-10/+9
|\ \ \ \ \ \ \
| * | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-11-036-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I21e1890c7ff4490469fb0243df69b560db9b29b6 Auto-generated-cl: translation import
* | | | | | | | am 6ff586f7: am fa37321f: am 3e621914: Merge "docs: Add links to Wear UI ↵Ricardo Cervera2014-11-030-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | training from Design pages." into lmp-docs * commit '6ff586f71b03b658096e51fdbc17274044341713': docs: Add links to Wear UI training from Design pages.
| * | | | | | | am fa37321f: am 3e621914: Merge "docs: Add links to Wear UI training from ↵Ricardo Cervera2014-11-030-0/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Design pages." into lmp-docs * commit 'fa37321f05ad96a1de6863bc08fe1e496cceea9e': docs: Add links to Wear UI training from Design pages.
| | * \ \ \ \ \ \ am 3e621914: Merge "docs: Add links to Wear UI training from Design pages." ↵Ricardo Cervera2014-11-030-0/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-docs * commit '3e621914cacf692700dce007ec7d7893fcc12a8c': docs: Add links to Wear UI training from Design pages.
| | | * \ \ \ \ \ \ Merge "docs: Add links to Wear UI training from Design pages." into lmp-docsRicardo Cervera2014-11-034-7/+45
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | docs: Add links to Wear UI training from Design pages.Ricardo Cervera2014-10-274-7/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17897252 Bug: 17315120 Change-Id: I58185b76f8197a0124804a296bd32565e4487a33
* | | | | | | | | | | am d4e3825a: am 1b2cf3f8: am cd796536: Merge "docs: b/18119632 isGame, ↵Scott Rowe2014-11-035-85/+170
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/18119595 banner" into lmp-docs * commit 'd4e3825a83764f9692f833c73915c310f83e38eb': docs: b/18119632 isGame, b/18119595 banner
| * | | | | | | | | | am 1b2cf3f8: am cd796536: Merge "docs: b/18119632 isGame, b/18119595 banner" ↵Scott Rowe2014-11-035-85/+170
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-docs * commit '1b2cf3f8f64013441fc021db45e00381d4b2d19b': docs: b/18119632 isGame, b/18119595 banner
| | * | | | | | | | | am cd796536: Merge "docs: b/18119632 isGame, b/18119595 banner" into lmp-docsScott Rowe2014-11-035-85/+170
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cd796536ce81fe6f8a63c3867b57e7b7f92a8542': docs: b/18119632 isGame, b/18119595 banner
| | | * | | | | | | | Merge "docs: b/18119632 isGame, b/18119595 banner" into lmp-docsScott Rowe2014-11-035-85/+170
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | docs: b/18119632 isGame, b/18119595 bannerScott Rowe2014-10-315-85/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I171b4aff3359ec96b2ea1003870739ad586971c7
* | | | | | | | | | | | am 2997285f: Merge "Disable circular display mask with color inversion" into ↵Casey Burkhardt2014-11-031-23/+47
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | / / / | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-sprout-dev * commit '2997285f362349097882d1b31eb23cb867227192': Disable circular display mask with color inversion
| * | | | | | | | | | Merge "Disable circular display mask with color inversion" into lmp-sprout-devCasey Burkhardt2014-11-031-23/+47
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Disable circular display mask with color inversionCasey Burkhardt2014-10-281-23/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Causes WindowManagerService to only add a circular display mask on qualified devices if the accessibility display color inversion feature is turned off. When enabled, this causes a visual artifact. Bug:18120660 Change-Id: I0b1ac08487098942e2e0dd2794905e845a70c1bc
* | | | | | | | | | | | Merge "Fix colored status bar panning issues" into lmp-mr1-devAdrian Roos2014-11-033-0/+42
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix colored status bar panning issuesAdrian Roos2014-10-293-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17695293 Change-Id: I6a1267f8dff27e7b78ab312a71648ef16ab9483b
* | | | | | | | | | | | am c95236de: (-s ours) Import translations. DO NOT MERGEGeoff Mendal2014-11-030-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c95236deadfed31966661c7ed5c5db7422b3d0dc': Import translations. DO NOT MERGE
| * | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-11-033-6/+6
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic1ed8ade48ee37210f335564cc5640675db47290 Auto-generated-cl: translation import
* | | | | | | | | | | Merge "Improve dump of status bar service" into lmp-mr1-devAdrian Roos2014-11-034-6/+8
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Improve dump of status bar serviceAdrian Roos2014-10-294-6/+8
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tracks which window caused the disable flags instead of just blaming PhoneWindowManager. Bug: 17830264 Change-Id: If6c957120bb2ee8e0083f80e35c71eb21b8672b6
* | | | | | | | | | | Merge "SysUI: Use mScreenOnFromKeyguard for panel visibility" into lmp-mr1-devChristoph Studer2014-11-032-46/+58
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | SysUI: Use mScreenOnFromKeyguard for panel visibilityChristoph Studer2014-10-292-46/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We currently depend on mScreenOn when determining whether the panel is visible to the user. However, this variable is updated via a broadcast and might hence be slightly out-of-date with other keyguard state. Bug: 18067294 Change-Id: I51078b4a470db9a5a1f639e84ac65f6066c5669c
* | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-devGeoff Mendal2014-11-0372-613/+1332
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-11-0372-613/+1332
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I93f51ef821e604f91d7323c953a98bea7ef8204c Auto-generated-cl: translation import
* | | | | | | | | | | | Merge "Move LOCK_TO_APP_EXIT_LOCKED from System to Secure" into lmp-mr1-devJason Monk2014-11-034-13/+28
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Move LOCK_TO_APP_EXIT_LOCKED from System to SecureJason Monk2014-10-314-13/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To prepare for controlling from settings. While here, add lock to app settings to backups. Bug: 16957435 Change-Id: I059140cd07a7a0d5ceb4e0bfe5e0176cb96629d3
* | | | | | | | | | | | Merge "Fix getPackageInfo("android") in the system server." into lmp-mr1-devNarayan Kamath2014-11-031-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix getPackageInfo("android") in the system server.Narayan Kamath2014-10-291-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix for bug 16555230 attempted to return the same LoadedApk object between the system context object and the activity thread's list of opened packaged. This ensured that we used the same classLoader on both these objects (among other things). However, the object the Context owns is actually incomplete (and necessarily so) because it might be created before the package manager is and we need the package manager to construct a complete LoadedApk object. Work around this by manually setting the classloader and aInfo for "android" contexts created by the system server's activity thread. bug: 18167468 Change-Id: I623634f912111f89eaf716b8258d1926d2513dcd
* | | | | | | | | | | | | Merge "Split Telecom PhoneAccount registration permissions." into lmp-mr1-devSantos Cordon2014-11-033-8/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Split Telecom PhoneAccount registration permissions.Santos Cordon2014-10-313-8/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18106506 Change-Id: Ic825b44c2dc42709073a3990f6a7ca8e372025e9
* | | | | | | | | | | | | | Merge "Even, Even more telecom javadoc." into lmp-mr1-devSantos Cordon2014-11-031-8/+58
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Even, Even more telecom javadoc.Santos Cordon2014-10-311-8/+58
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18142177 Change-Id: Ic952f3a81cb957bc5b9b6d0aa755adaab9fb74aa
* | | | | | | | | | | | | | TIF: Add more documentation on start/end time of TvContract.ProgramDongwon Kang2014-11-031-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18163685 Change-Id: Ifcd57330eb341adfbcb7fcf3482a701471bf729f
* | | | | | | | | | | | | | am 20ee9f12: am de740985: am aa275bf9: Merge "docs: b/15180738 - invalid ↵Scott Rowe2014-11-011-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | urls in badge generator" into lmp-docs * commit '20ee9f122da1572ffb4e9a76eddc71180a4e608d': docs: b/15180738 - invalid urls in badge generator
| * | | | | | | | | | | | | am de740985: am aa275bf9: Merge "docs: b/15180738 - invalid urls in badge ↵Scott Rowe2014-11-011-6/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | generator" into lmp-docs * commit 'de7409859315de19f081325a82a9c3ef99f28f26': docs: b/15180738 - invalid urls in badge generator
| | * | | | | | | | | | | | am aa275bf9: Merge "docs: b/15180738 - invalid urls in badge generator" into ↵Scott Rowe2014-11-011-6/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-docs * commit 'aa275bf989f0bf9e968f0804bb57ec7b1a7c1f54': docs: b/15180738 - invalid urls in badge generator
generated by cgit v1.1 at 2024-12-26 02:11:17 +0000