summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Persist Show IME option." into lmp-devMichael Wright2014-08-184-35/+88
|\
| * Persist Show IME option.Michael Wright2014-08-174-35/+88
| | | | | | | | | | | | | | | | Add a new setting to persist whether to show the IME when a hard keyboard is connected. Bug: 14066881 Change-Id: I2237ded850a0d4ab43ca441d0b7df13e0958e630
* | Merge "Update MenuItem#setShortcut docs" into lmp-devMichael Wright2014-08-181-6/+6
|\ \
| * | Update MenuItem#setShortcut docsMichael Wright2014-08-171-6/+6
| | | | | | | | | | | | Change-Id: I6b73992b0c8d590e8c9884bec377c7c0c1e35720
* | | Merge "Add callbacks for MediaProjection start / stop." into lmp-devMichael Wright2014-08-1810-55/+551
|\ \ \
| * | | Add callbacks for MediaProjection start / stop.Michael Wright2014-08-1710-55/+551
| |/ / | | | | | | | | | | | | | | | | | | Also, enforce that there is only one valid MediaProjection at a time. Bug: 16488053 Change-Id: Id05445d798c98cb208bc4dab186296392e15d30b
* | | Merge "Update the print spooler icon." into lmp-devSvetoslav2014-08-166-2/+21
|\ \ \
| * | | Update the print spooler icon.Svetoslav2014-08-186-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed a duplicate resource also defined in the platform resources. Added a tint to the print spooler icon. bug:16568027 Change-Id: I1c0b9a7bd75bc59d1d86653c05d8fc2bb77056c1
* | | | Merge "Include build number in aapt version" into lmp-devAdam Lesinski2014-08-162-1/+13
|\ \ \ \
| * | | | Include build number in aapt versionAdam Lesinski2014-08-182-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teams are constantly confused over which version of aapt they are running. Include the build number from the Android build system in the binary. Can be retrieved by executing 'aapt version'. Change-Id: I9165c7d01f977344e143c2cb4dd963310ab28b72
* | | | | Merge "Add @SystemApi annotation to Geofence Hardware types." into lmp-devdestradaa2014-08-166-83/+22
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add @SystemApi annotation to Geofence Hardware types.destradaa2014-08-186-83/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/17008446 Change-Id: Id3f92dd03309324d3343c87da8c3e30733d06a64
* | | | | Merge "Minor restore fixes" into lmp-devChristopher Tate2014-08-161-5/+9
|\ \ \ \ \
| * | | | | Minor restore fixesChristopher Tate2014-08-181-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. We were missing a 'break' in the session-timeout case of message dispatch, so were falling through into a different case. Oops. Fortunately it was benign; the other case's logic was merely logging "hey it doesn't look like there's anything to do here" and cleanly exiting. 2. After a restore operation finishes we were previously always leaving the session timeout clock running. However, this was not appropriate in the case of restore-at-install, when the restore was a one-shot kicked off by the package manager rather than an operation on an ongoing RestoreSession. That logic now properly tidies up the session timeout when winding up the restore in either situation. Bug 17080648 Change-Id: I51d4a50db4feefc4c355230a3bfb926ea2fb5944
* | | | | | Merge "Expose system apis for backup transport migration" into lmp-devarete2014-08-183-2/+9
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Expose system apis for backup transport migrationarete2014-08-183-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16542048 Change-Id: I45e710028316e7b2dc4195700a1e7344afb54691
* | | | | | TIF: Fix some comment warningsJae Seo2014-08-185-44/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixed some other obvious warnings from Eclipse Bug: 16876068 Change-Id: Ic9c44caf3fd53e965043aa96039d5f3a5655eaff
* | | | | | Merge "Fix a bug propagating navigation button events from ToolbarActionBar" ↵Adam Powell2014-08-183-2/+170
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into lmp-dev
| * | | | | | Fix a bug propagating navigation button events from ToolbarActionBarAdam Powell2014-08-183-2/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a simple internal wrapper for dealing with window callback events. This should also make working with things like action modes from ToolbarActionBar significantly easier in later changes. Bug 16980711 Change-Id: I2c3d7525489a21847f4af9b80f6ebf9b34b4dd58
* | | | | | | Merge "Add page info in each segment if carrier does not support EMS." into ↵Jake Hamby2014-08-162-0/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev
| * | | | | | | Add page info in each segment if carrier does not support EMS.Xia Ying2014-08-182-0/+8
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If EMS is not supported, framework breaks down EMS into single segment SMS and adds page info " x/y". In the case of UCS2 encoding type, we need 8 bytes for this, but we only have 6 bytes from UDH, so truncate the limit for each segment by 2 bytes (1 char). Change-Id: Ieadb8d27d1cdf2f1e5322ec16c5a62d55e26bdfd
* | | | | | | Merge "Progress towards staging ASECs." into lmp-devJeff Sharkey2014-08-169-516/+538
|\ \ \ \ \ \ \
| * | | | | | | Progress towards staging ASECs.Jeff Sharkey2014-08-189-516/+538
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move location selection logic into shared PackageHelper location, and share it between DCS and PackageInstaller. Fix bugs related to installed footprint calculation; always count unpacked native libs. Have PMS do its own threshold checking, since it's fine to stat devices. PMS only ever deleted staging ASECs, so move that logic into installer and nuke unclaimed staging ASECs. Allocate legacy ASEC names using PackageInstaller to make sure they don't conflict with sessions. Start wiring up session to allocate ASEC and pass through staged container for installation. Fix bug to actually delete invalid cluster-style installs. Bug: 16514385 Change-Id: I325e0c4422fc128398c921ba45fd73ecf05fc2a9
* | | | | | | | Merge "Update fast scroller preview for Material" into lmp-devAlan Viverette2014-08-186-13/+90
|\ \ \ \ \ \ \ \
| * | | | | | | | Update fast scroller preview for MaterialAlan Viverette2014-08-156-13/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 16374061 Change-Id: Iefbbc4f3e8eccb89072bd0885cc337f9e0470d81
* | | | | | | | | Merge "Revert "Include build number in aapt version"" into lmp-devAdam Lesinski2014-08-182-2/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Revert "Include build number in aapt version"Adam Lesinski2014-08-182-2/+1
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a7ce555ee82ed91345a54ee171dc9a415b65e134. Change-Id: I1018747766963e75bec11ddb01ba6d138f133959
* | | | | | | | | Merge "Fix path for handling system window with app token." into lmp-devDianne Hackborn2014-08-163-4/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix path for handling system window with app token.Dianne Hackborn2014-08-183-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is wrong to turn the token into a null appWindowToken; we need to create a new top-level token as if they had passed in null. Change-Id: I870d8167c6ed456ea8fd58b149809ec9e0103bce
* | | | | | | | | | Merge "Throw exception when inset drawable is missing drawable attribute" ↵Alan Viverette2014-08-181-14/+19
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev
| * | | | | | | | | | Throw exception when inset drawable is missing drawable attributeAlan Viverette2014-08-151-14/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 17068252 Change-Id: I3f5757966c1bb723311a2e2c41d419ed41369061
* | | | | | | | | | | Merge "Fix crash in AnimationDrawable" into lmp-devChet Haase2014-08-181-1/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix crash in AnimationDrawableChet Haase2014-08-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a drawable becomes invisible, it unschedule itself, which sets mCurrentFrame to -1. Later, when it becomes visible, it calls setFrame() with either 0 (if 'restart' is true) or mCurrentFrame. Calling setFrame() with a value of -1 causes a crash later as we dereference an invalid location in the state durations array. This fix also checks mCurrentFrame and calls setFrame with 0 when the current frame is invalid. This takes the code back closer to what it used to be when setFrame was always called with 0, although now it will use a valid frame when it is set. Issue #16489419 Google Translate crashes whenever hitting done button on keyboard to get translation result. Change-Id: I1f5b8672d209017aa8a4eaa15bd7ddd2f3ae38d1
* | | | | | | | | | | Include build number in aapt versionAdam Lesinski2014-08-182-1/+2
| |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teams are constantly confused over which version of aapt they are running. Include the build number from the Android build system in the binary. Can be retrieved by executing 'aapt version'. Change-Id: Ie4692fb160c7cbe720a8e76b73e435170214fe0e
* | | | | | | | | | Merge "Fix 48kHz limitation on AudioTrack" into lmp-devAndy Hung2014-08-161-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Fix 48kHz limitation on AudioTrackAndy Hung2014-08-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed to 96kHz. Bug: 12979141 Bug: 17069369 Change-Id: I7643901f6d365d8b46da4872bd2266ec20cb0339
* | | | | | | | | | Merge "Fix BitmapDrawable outline crash" into lmp-devChris Craik2014-08-161-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix BitmapDrawable outline crashChris Craik2014-08-181-3/+3
| | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:17103753 Change-Id: Ia3d2c7d61b3f3b9ea8879f941d726d8627e155bb
* | | | | | | | | | am cce5036c: am 88a1f40c: am fb1f5bde: docs: Removing radio from music intentsRicardo Cervera2014-08-181-28/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cce5036cb00c7e25f1d226c6405e6231f5913444': docs: Removing radio from music intents
| * \ \ \ \ \ \ \ \ \ am 88a1f40c: am fb1f5bde: docs: Removing radio from music intentsRicardo Cervera2014-08-181-28/+5
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '88a1f40c5d6111c74feb8e3022ffdccbf489a2e4': docs: Removing radio from music intents
| | * \ \ \ \ \ \ \ \ \ am fb1f5bde: docs: Removing radio from music intentsRicardo Cervera2014-08-181-28/+5
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fb1f5bdef03844547152f921dcaa044269b5a0cb': docs: Removing radio from music intents
| | | * | | | | | | | | | docs: Removing radio from music intentsRicardo Cervera2014-08-181-28/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iaf645d692b247994dd8c12835c387ff296b26019
* | | | | | | | | | | | | Merge "Temporary workaround for NetworkOverLimitActivity dialog." into lmp-devJohn Spurlock2014-08-161-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Temporary workaround for NetworkOverLimitActivity dialog.John Spurlock2014-08-181-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the window type, since it now crashes SystemUI. Bug:17102499 Change-Id: I69230242e27150f9e38822b5cd3745caae108287
* | | | | | | | | | | | | Merge "When forwarding intents, ignoring the package set in the intent." ↵Nicolas Prevot2014-08-162-17/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev
| * | | | | | | | | | | | | When forwarding intents, ignoring the package set in the intent.Nicolas Prevot2014-08-152-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apps should not be allowed to target a specific package in the target user. BUG: 17025506 Change-Id: I81afa2f8d0a1114d91c001e357366792c63b6577
* | | | | | | | | | | | | | Merge "Fix issue #14617210: Apps can gain access to any ContentProvider..." ↵Dianne Hackborn2014-08-167-5/+256
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev
| * | | | | | | | | | | | | | Fix issue #14617210: Apps can gain access to any ContentProvider...Dianne Hackborn2014-08-187-5/+256
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...with grantUriPermissions (no user interaction required) Add a new path in to the activity manager to start an activity as if it was directy started by the original calling activity. This is specifically for the resolver activity and chooser activity to be able to safely launch its data after serving as an intermediary. Access to the new method is highly restricted -- it can only be called by an activity that is declared in the framework apk itself, and the execute-as-the-caller behavior will only happen if the code is running under the system uid. (This means we could still have these run in the client's process in some cases and still work correctly.) Note there is some commented out code here half-done about trying to propagate security exceptions back to the original calling activity. This would be really nice, especially now with the chooser activity running in a system process so any errors made by the app (bad permission grants, bad intents, etc) no longer actually appear in the app so are essentially invisible. I'd really like to figure out a way to propagate these exceptions back to the app, but this is hard since the app's process may no longer even be running at this point. Also tweak activity manager dump output to split the recents dump out from activities, since recents can now be super large. Change-Id: I50410c4783faf9302c69290589a068a846e0973a
* | | | | | | | | | | | | | | Merge "Revert "Adding the requiredForProfile flag."" into lmp-devNicolas Prévot2014-08-165-42/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Revert "Adding the requiredForProfile flag."Nicolas Prévot2014-08-185-42/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 531270a4a177a9f245d328d9467c6d1adbd5354a. BUG: 17102702 Change-Id: Iec5d047dc74bd4899662ede82c48fc024238427c