summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Prevent authenticators from using Settings to launch arbitrary ↵Carlos Valdivia2013-09-301-1/+55
|\ | | | | | | activities." into klp-dev
| * Prevent authenticators from using Settings to launch arbitrary activities.Carlos Valdivia2013-09-291-1/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Various authenticator results such as getAuthToken and addAccount might result in an Intent returned to the AccountManager caller. A malicious authenticator could exploit the fact that the Settings are a system app, lead the user to launch add account for their account type and thus get Settings to use the intent to start some arbitrary third parties Activity. The fix is to make sure that the UID of the app associated with Activity to be launched by the supplied intent and the Authenticators UID share the same signature. This means that an authenticator implementer can only exploit apps they control. Bug: 7699048 Change-Id: I34330454c341e6a8422ca1ed3b390466a0feedce
* | Merge "Add android.provider.Telephony to public API." into klp-devJake Hamby2013-09-302-0/+272
|\ \
| * | Add android.provider.Telephony to public API.Jake Hamby2013-09-242-0/+272
| | | | | | | | | | | | | | | | | | | | | | | | Add directory containing android/provider/Telephony.java to build. Add unhidden Telephony fields and classes to api/current.txt. Bug: 10653081 Change-Id: Ib4ba66e09be5320d35257fcf481db58f840fdc53
* | | Merge "Fix configuration changes in status bars." into klp-devDaniel Sandler2013-09-303-20/+37
|\ \ \
| * | | Fix configuration changes in status bars.Daniel Sandler2013-09-303-20/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Make sure SystemBars calls onConfigurationChanged on the status bar - Remove redundant ACTION_CONFIGURATION_CHANGED receiver in BaseStatusBar & move this code into onConfigurationChanged - Force locale refresh even if a configuration change touches only the layout direction Bug: 10113357 Change-Id: I92902d25cbae77f2558cfb85482484b11dc7294e
* | | | Merge "Fix issue #10948509: Crash in procstats when there is no data" into ↵Dianne Hackborn2013-09-304-166/+240
|\ \ \ \ | | | | | | | | | | | | | | | klp-dev
| * | | | Fix issue #10948509: Crash in procstats when there is no dataDianne Hackborn2013-09-294-166/+240
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not dealing with the case where there is a null list. Also fixed some bugs I found while looking at this: - When resetting the stats, we would use a newly computed time stamp for the total durations rather than the one we used to reset the proc/service entries. This would result in them being able to be slightly > 100%. - There was a bug in how we split a single process state into its per-package representation, where we would but the cloned process state into the new package's entry (instead of properly for its own package entry), to be immediately overwritten by the new process state we make for that package. This could result in bad data for processes that have multiple packages. - There was a bug in resetting service stats, where we wouldn't update the overall run timestamp, allowing that time to sometimes be > 100%. - There was a bug in computing pss data for processes with multiple packages, where the pss data was not distributed across all of the activity per-package process states. - There was a bug in computing the zram information that would cause it to compute the wrong value, and then never be displayed. Finally a little code refactoring so that ProcessState and ServiceState can now share a common implementation for the table of duration values. Change-Id: I5e0f4e9107829b81f395dad9419c33257b4f8902
* | | | | Merge "Printers in the list of printers change position." into klp-devSvetoslav Ganov2013-09-291-5/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Printers in the list of printers change position.Svetoslav Ganov2013-09-281-5/+4
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While the logic was correct the array map that holds the list of pritners does not keep the position of the items constant. Switched to linked hash map which gives this guarantee. bug:10955751 Change-Id: Idbbe14d753e6a1ad1002f2289b10cb62d7f9f040
* | | | Merge "Ensure correct window ordering." into klp-devCraig Mautner2013-09-292-2/+2
|\ \ \ \
| * | | | Ensure correct window ordering.Craig Mautner2013-09-282-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that moveStackWindowsLocked() is called every time that the stack ordering changes. This will rebuild the window list. Previously the call was being made after the moveStack() call which got forgotten in the addAppToken() causing the home stack to obscure incoming phone and video calls. Fixes bug 10023223. Fixes bug 10678010. Maybe fixes bug 10858941. Change-Id: I59922dc979a19210008eac1f528704984c63c886
* | | | | Merge "Don't kill home process with the rest of its package." into klp-devCraig Mautner2013-09-291-0/+4
|\ \ \ \ \
| * | | | | Don't kill home process with the rest of its package.Craig Mautner2013-09-281-0/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Killing the GEL search results was killing everything in its package. This fix keeps the home process from being killed when a task in its package is killed. Fixes bug 10927223. Change-Id: I56e75f0a0118885a1604cbd70320bbdb4f8cf1a2
* | | | | Merge "Remove home package name methods." into klp-devCraig Mautner2013-09-294-50/+6
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Remove home package name methods.Craig Mautner2013-09-284-50/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not use the shortcut of the package name to identify the home activity. Fixes bug 10963726. Fixes bug 10920950. Change-Id: I725781a26672b055a816994aee6ea458a7f07c88
* | | | Merge "Ignore historical printer records for installed services" into klp-devSvetoslav2013-09-285-5/+76
|\ \ \ \
| * | | | Ignore historical printer records for installed servicesSvetoslav2013-09-275-5/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When loading historical records for previously used printers we now ignore the ones whose target print service is not installed. bug:10955652 Change-Id: Ib295e7d88ed3c308ef6d8a11bdc1792ebbb6d526
* | | | | Keyguard transport controls: fullscreen artAdam Powell2013-09-277-21/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the transport controls are active, set the relevant art as a fullscreen background for the keyguard. Change-Id: I1e8a87f242153a2a2c5bf94dbd15f0fd3e07dde3
* | | | | Merge "Fix missing transport in keyguard" into klp-devJim Miller2013-09-282-6/+21
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix missing transport in keyguardJim Miller2013-09-272-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keyguard wasn't re-establishing a connection to the RCD after a crash. This results in a missing transport until the session reboots. Fixes bug 10204949 Change-Id: Ia030eacbcf1e3cfa9ee948c841c95d2040f9c1e0
* | | | | Merge "Fix permissions on WindowManagerService.showAssistant()" into klp-devJim Miller2013-09-289-76/+74
|\ \ \ \ \
| * | | | | Fix permissions on WindowManagerService.showAssistant()Jim Miller2013-09-279-76/+74
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since binder call permissions are not transitive by design, the proper way to fix this is to have the call talk directly to keyguard from the navigation bar. Fixes bug 9409008 Change-Id: Ibd90a79bb638c969b514455a2ad93c6ff668222d
* | | | | Merge "Print job files and print job records not always cleaned up." into ↵Svetoslav Ganov2013-09-285-129/+237
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | klp-dev
| * | | | | Print job files and print job records not always cleaned up.Svetoslav Ganov2013-09-275-129/+237
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. We want the files for a print job to be removed as early as possible typically because the print job was cancelled, completed, the app or the spooler crashed during print job construction. We were keeping around in the spooler and hence to disc infos for jobs that are in final state since the app that created them may hold a reference to a local print job objec whose info it can access to get the latest print job state potentially after the job reached final state. The issue was that we were persisting to disc created print jobs which were during construction which requires careful handling for the various cases above. This is tricky and error prone. We used to tell the spooler to forget the print jobs infos when the app that created them died. The implementation to forget a print job was not careful and was nuking currently running print jobs in addition to the ones in a terminal state. Further, if the app dies before a print job is completed we were left with a stale print job in the spooler since we missed the signal to forget it (assuming we forget only inactive jobs). These issues suggest that the approach is problematic. Now we have a cache of print job infos for the jobs an app created. This cache is updated when the state of a print jobs changes using the new print job state observation code. When the app dies we remove the cached jobs for that app. Now if the app calls to get the print jobs it gets the cached ones, i.e. the print jobs it created during its lifetime, plus the print jobs that are still active fetched from the spooler. Note that transient state cannot be kept in the spooler since we unbind from it if there is no work and it may get killed. 2. Improved the print sub-system logging code to show the cached print job infos for apps and also dump the print job PDF file names. bug:10958357 Change-Id: I6f7c1968b6b7ba5be182a10df044ff7ea1fc3a61
* | | | | | Merge "Centralize handleAppDied and fix return to home." into klp-devCraig Mautner2013-09-283-32/+65
|\ \ \ \ \ \
| * | | | | | Centralize handleAppDied and fix return to home.Craig Mautner2013-09-273-32/+65
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The home activity was being returned to when any activity in a task that was launched from home crashed. If there were still activities left in the task then the crash should have brought up those activities next, not home. This may be a partial fix for crashes where the back stack was showing up under launcher icons. Bug 10858941. Change-Id: I840a25bd8395bfce46f4e21b112d78b12884706d
* | | | | | Merge "Add badging of Payment apps" into klp-devAdam Lesinski2013-09-281-11/+142
|\ \ \ \ \ \
| * | | | | | Add badging of Payment appsAdam Lesinski2013-09-271-11/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HCE apps that declare themselves as payment apps will receive that badge when running aapt dump badging. bug:10899864 Change-Id: I7c095214412465ad7a925285d6167e12de16b600
* | | | | | | Merge "Add support for dumping new badging" into klp-devAdam Lesinski2013-09-281-3/+68
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Add support for dumping new badgingAdam Lesinski2013-09-271-3/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | APKs with AccessibilityServices, PrintServices, and or DeviceAdmin will have those services dumped when running 'aapt dump badging'. bug:10899864 Change-Id: I9c1f1f36c397b128dca802510368573a54977459
* | | | | | | Merge "Adding a timeout for waiting to get the selected printer's ↵Svetoslav Ganov2013-09-282-9/+49
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | capabilities." into klp-dev
| * | | | | | | Adding a timeout for waiting to get the selected printer's capabilities.Svetoslav Ganov2013-09-272-9/+49
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A print service may choose to provide only the printer info and then when it is requested to start tracking the state of the printer, the service should provide the printer capabilities. If the capabilities are not received within ten seconds we mark the printer as unavailable and stop tracking it. bug:10748639 Change-Id: I9171cb5dc116fd321c23a8e4ab55109448e2fc6a
* | | | | | | Merge "New roots UX, async, performance, docs." into klp-devJeff Sharkey2013-09-2842-367/+553
|\ \ \ \ \ \ \
| * | | | | | | New roots UX, async, performance, docs.Jeff Sharkey2013-09-2742-367/+553
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Yet another iteration from UX on how roots should be ordered. Since we no longer categorize by type, remove from public API. Updated asset drop with new dividers. Update public API docs to be explicit about required columns. Hide flags and columns that aren't required for third-party apps. Move remainder of potentially blocking work to AsyncTasks, including creating directories, picked root resolution, and creation of new documents once picked. Improve performance of layouts by removing baseline alignment and reduce hierarchy depth. Set alpha on ImageViews directly to avoid offscreen rendering hit. Limit returned recents to 45 days. Show load in recents when still waiting for backends. Show empty message when no recents stacks to create from. Use unique key when saving recent stacks. Bug: 10941423, 10819454, 10964412, 10960718 Change-Id: I08cf589dcda7e203acf67928f4d30322ae36ee94
* | | | | | | | Merge "Add missing constructor parameter to KeyEvent" into klp-devMichael Wright2013-09-281-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Add missing constructor parameter to KeyEventMichael Wright2013-09-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When in the SyntheticKeyHandler, a missing constructor paramater caused the wrong contstructor to be called. This would cause the device id, scan code and flags to be incorrect. Bug: 10966229 Change-Id: Ib84ef88d28c0da517b376c5493a851cf8fe0a9f7
* | | | | | | | | Merge "Camera2: remove CameraDevice#getProperties" into klp-devZhijun He2013-09-273-36/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Camera2: remove CameraDevice#getPropertiesZhijun He2013-09-273-36/+2
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also cleanup some unnecessary imports. Bug: 10360518 Change-Id: Id54aa4c9e3dff2bd354e3ebb83687b000842ea3f
* | | | | | | | | am 584d4f69: am 57177492: am 4a9999f1: remove Remembering Your Users class ↵Scott Main2013-09-271-23/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from nav. Separate CL will redirect these pages to the Google Auth doc. * commit '584d4f69e2f8e904f50169ad223b244de72aa5ed': remove Remembering Your Users class from nav. Separate CL will redirect these pages to the Google Auth doc.
| * \ \ \ \ \ \ \ \ am 57177492: am 4a9999f1: remove Remembering Your Users class from nav. ↵Scott Main2013-09-271-23/+0
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Separate CL will redirect these pages to the Google Auth doc. * commit '571774922ce5ace09c746fdb83cbdce243dad3e4': remove Remembering Your Users class from nav. Separate CL will redirect these pages to the Google Auth doc.
| | * \ \ \ \ \ \ \ \ am 4a9999f1: remove Remembering Your Users class from nav. Separate CL will ↵Scott Main2013-09-271-23/+0
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | redirect these pages to the Google Auth doc. * commit '4a9999f1ad20830df4aa38d3d3a42d73cb9986f0': remove Remembering Your Users class from nav. Separate CL will redirect these pages to the Google Auth doc.
| | | * | | | | | | | | remove Remembering Your Users class from nav.Scott Main2013-09-271-23/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Separate CL will redirect these pages to the Google Auth doc. Change-Id: Ib47b8e0fffbe776626b463c1199f435a82e64170
* | | | | | | | | | | | am 01c2e173: (-s ours) am 49039929: am 49eb1d95: am d084cc44: am 4f59a921: ↵Amith Yamasani2013-09-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 12fd0f16: am f6a0c116: am 9bf1a139: am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate * commit '01c2e173d99cf4dd1c91cacb9b461082091cbeb3': Don't instantiate non-Fragments in Fragment.instantiate
| * | | | | | | | | | | am 49039929: am 49eb1d95: am d084cc44: am 4f59a921: am 12fd0f16: am ↵Amith Yamasani2013-09-271-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f6a0c116: am 9bf1a139: am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate * commit '490399292d2160cf94231df7a9e07e8aa8237489': Don't instantiate non-Fragments in Fragment.instantiate
| | * | | | | | | | | | am 49eb1d95: am d084cc44: am 4f59a921: am 12fd0f16: am f6a0c116: am ↵Amith Yamasani2013-09-271-0/+4
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9bf1a139: am 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate * commit '49eb1d958198b2a88455c340c9d072469d065785': Don't instantiate non-Fragments in Fragment.instantiate
| | | * \ \ \ \ \ \ \ \ \ am d084cc44: am 4f59a921: am 12fd0f16: am f6a0c116: am 9bf1a139: am ↵Amith Yamasani2013-09-271-0/+4
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 72c5e376: am ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate * commit 'd084cc44eb59407c851399d548256c145eb45342': Don't instantiate non-Fragments in Fragment.instantiate
| | | | * \ \ \ \ \ \ \ \ \ am 4f59a921: am 12fd0f16: am f6a0c116: am 9bf1a139: am 72c5e376: am ↵Amith Yamasani2013-09-271-0/+4
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ba1ae3af: am 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate * commit '4f59a9216e76207a7003bfe010076aa78eee629a': Don't instantiate non-Fragments in Fragment.instantiate
| | | | | * \ \ \ \ \ \ \ \ \ am 12fd0f16: am f6a0c116: am 9bf1a139: am 72c5e376: am ba1ae3af: am ↵Amith Yamasani2013-09-271-0/+4
| | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 42786418: Don\'t instantiate non-Fragments in Fragment.instantiate * commit '12fd0f1644b28b6938a504492397e8ca8d38a1c5': Don't instantiate non-Fragments in Fragment.instantiate
| | | | | | * \ \ \ \ \ \ \ \ \ am f6a0c116: am 9bf1a139: am 72c5e376: am ba1ae3af: am 42786418: Don\'t ↵Amith Yamasani2013-09-271-0/+4
| | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instantiate non-Fragments in Fragment.instantiate * commit 'f6a0c11615bd5c2c934527a0b20ba13f958913c4': Don't instantiate non-Fragments in Fragment.instantiate