summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Import translations. DO NOT MERGEGeoff Mendal2015-07-2978-81/+1051
| | | | | Change-Id: Ic4e540e08175014515a7556425c751de60955005 Auto-generated-cl: translation import
* Merge "Remove dependencies on the package installer's package name" into mnc-devSvetoslav Ganov2015-07-297-11/+53
|\
| * Remove dependencies on the package installer's package nameSvet Ganov2015-07-297-11/+53
| | | | | | | | | | | | bug:22700053 Change-Id: I8540eb8577fbec84e1a67e31e1c31ba654c828a4
* | Merge "Default permissions for sim call manager" into mnc-devSailesh Nepal2015-07-296-1/+179
|\ \
| * | Default permissions for sim call managerSailesh Nepal2015-07-286-1/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL adds the following permissions by default to the SIM call manager: - microphone - phone BUG: 22790160 Change-Id: Icaf1db6c6943b3ddbd16a946a81d1bfb734d761f
* | | Merge "Allow non system to set perm policy flags - needed by the installer" ↵Svetoslav Ganov2015-07-291-2/+0
|\ \ \ | | | | | | | | | | | | into mnc-dev
| * | | Allow non system to set perm policy flags - needed by the installerSvet Ganov2015-07-291-2/+0
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | My previous change overtightened which permission flags can be changed by a non-system caller. This took away the capability of the package installer to set policy flags which it needs to implement the auto grant/deny behavior. bug:22776149 Change-Id: Ic2a82bedc413fc91360c3bcec355fac456f0fccf
* | | Merge "Do not reset runtime permissions on upgrade" into mnc-devSvetoslav Ganov2015-07-291-1/+1
|\ \ \
| * | | Do not reset runtime permissions on upgradeSvet Ganov2015-07-291-1/+1
| |/ / | | | | | | | | | | | | | | | bug:22772831 Change-Id: Ic7113f48bf4fe2fe2f50bf94c4b6dbb2130b6621
* | | Merge "Work on issue #22765972: Binder transactions running out of ↵Dianne Hackborn2015-07-293-6/+12
|\ \ \ | | | | | | | | | | | | address..." into mnc-dev
| * | | Work on issue #22765972: Binder transactions running out of address...Dianne Hackborn2015-07-283-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...space causing package manager to fail Lower the maximum IPC size we use in various places, to keep it under the threshold of becoming dangerous. Now everything tries to keep not much more than 64k. Change-Id: I814013097966a7843179e5d581bfdb254c5ae318
* | | | Merge "Send a public broadcast when the device owner is set." into mnc-devNicolas Prévot2015-07-295-1/+22
|\ \ \ \
| * | | | Send a public broadcast when the device owner is set.Nicolas Prevot2015-07-285-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it a protected broadcast. BUG: 22623518 Change-Id: Ia36e8f0b80a6301d7d8e0461476842c78762b5e8
* | | | | Merge "import more metrics enums" into mnc-devChris Wren2015-07-292-14/+13
|\ \ \ \ \
| * | | | | import more metrics enumsChris Wren2015-07-282-14/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sysui tuners inactive apps Bug: 21114836 Change-Id: I43c4b97c6998374b39d7346bae1e1eca3d761543
* | | | | | Merge "Disable WiFi autojoin when user decides via "Stay connected?" dialog" ↵Paul Jensen2015-07-292-8/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into mnc-dev
| * | | | | | Disable WiFi autojoin when user decides via "Stay connected?" dialogPaul Jensen2015-07-162-8/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the user selects "No" in the "Stay connected?" dialog box: 1. Disable autojoining that network in the future, and 2. Disassociate from that network. Bug:22187193 Change-Id: I14dc9236c57e3ab7d3ec95edc906787cbfbf3c9f
* | | | | | | Merge "Revert "Call getInstanceForPackage instead of creating a new ↵Narayan Kamath2015-07-292-2/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | SensorManager instance."" into mnc-dev
| * | | | | | | Revert "Call getInstanceForPackage instead of creating a new SensorManager ↵Narayan Kamath2015-07-292-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instance." This reverts commit 5967ddbf05f146bdb6744207e3daed1aa76fc637. Change-Id: I6d58129585a30d7c2ef39c8cbe796fd696c93f56
* | | | | | | | Merge "Resource for setting default NFC payment component." into mnc-devMartijn Coenen2015-07-292-1/+21
|\ \ \ \ \ \ \ \
| * | | | | | | | Resource for setting default NFC payment component.Martijn Coenen2015-07-272-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22756856 Change-Id: If97e0faead995fb95893a128c1890b61bbe86ce5
* | | | | | | | | Merge "Keymaster digest/padding NONE no longer means ANY." into mnc-devShawn Willden2015-07-295-55/+65
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Keymaster digest/padding NONE no longer means ANY.Alex Klyubin2015-07-285-55/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adjusts the public API documentation to no longer say that digest/padding NONE means any digest/padding. This also changes the implementation of legacy key generation and import to explicitly list which digests/paddings the generated/imported key is authorized for. Previously, such keys were simply authorized for digest NONE and padding NONE. Bug: 22556114 Change-Id: Id02d9450a07de16ccb795b76b6de0006dd49dcca
* | | | | | | | | Merge "Give secondary users read-only physical cards." into mnc-devJeff Sharkey2015-07-295-17/+52
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Give secondary users read-only physical cards.Jeff Sharkey2015-07-285-17/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Long ago, we mounted secondary physical cards as readable by all users on the device, which enabled the use-case of loading media on a card and viewing it from all users. More recently, we started giving write access to these secondary physical cards, but this created a one-directional channel for communication across user boundaries; something that CDD disallows. This change is designed to give us the best of both worlds: the package-specific directories are writable for the user that mounted the card, but access to those "Android" directories are blocked for all other users. Other users remain able to read content elsewhere on the card. Bug: 22787184 Change-Id: Ied8c98995fec1b7b50ff7d930550feabb4398582
* | | | | | | | | Merge "media: fix estimateFrameRatesFor to use correct ratio" into mnc-devRonghua Wu2015-07-291-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | media: fix estimateFrameRatesFor to use correct ratioRonghua Wu2015-07-281-1/+1
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22504214 Change-Id: I5a325ae495b76aadd3fcbb8932d865c2f6322b2a
* | | | | | | | | Merge "Fix issue #22802691: APR: NPE in ActivityRecord" into mnc-devDianne Hackborn2015-07-291-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix issue #22802691: APR: NPE in ActivityRecordDianne Hackborn2015-07-281-2/+2
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8d6265589c97edc7a1d6c63f98c7252a439e62da
* | | | | | | | | Merge "Fix issue #22802617: APR: spurious wtf when restarting a persistent ↵Dianne Hackborn2015-07-291-1/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | process" into mnc-dev
| * | | | | | | | | Fix issue #22802617: APR: spurious wtf when restarting a persistent processDianne Hackborn2015-07-281-1/+4
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just don't do a wtf here, it isn't really wrong (though it isn't really right, but at this point in a release it is right enough!). Change-Id: Ic38a2e27556224cf8868f1fa18b4810929d67fcc
* | | | | | | | | Merge "Fix issue #22802782: APR: NPE in package manager with bad intent ↵Dianne Hackborn2015-07-291-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | data" into mnc-dev
| * | | | | | | | | Fix issue #22802782: APR: NPE in package manager with bad intent dataDianne Hackborn2015-07-281-2/+2
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If they pass in a null data for the intent matching, don't throw up on it, just consider it to not match. Change-Id: I30b6af49989eb8b5c2e585ce5d96416f0daff3a8
* | | | | | | | | Merge "BatteryStats: Use proper power calculator when energy data is ↵Adam Lesinski2015-07-291-12/+17
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | received" into mnc-dev
| * | | | | | | | | BatteryStats: Use proper power calculator when energy data is receivedAdam Lesinski2015-07-281-12/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We check for the presence of energy data when determining whether to use the WiFiPowerCalculator or WiFiPowerEstimator. Since we can receive this data later, we need to switch to the WiFiPowerCalculator if we weren't using it before. We can't ask the hardware if it supports energy data because that would involve a call into WiFiManagerService, which can cause a deadlock if we are holding the BatteryStatsService lock while using this class. Bug:22776010 Change-Id: Id685d487c56595eab1d382f49da9417a423bb517
* | | | | | | | | | Merge "Add sizes to SysUI tests" into mnc-devJason Monk2015-07-295-0/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add sizes to SysUI testsJason Monk2015-07-285-0/+10
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I27e4a60e2658d3a5db32cdeb73bd0a031865ce86
* | | | | | | | | | Merge "Call getInstanceForPackage instead of creating a new SensorManager ↵Aravind Akella2015-07-292-5/+2
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | instance." into mnc-dev
| * | | | | | | | | Call getInstanceForPackage instead of creating a new SensorManager instance.Aravind Akella2015-07-272-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22529981 Change-Id: Id3adfbcf55d1268db1a555c72a06456a5219c086
* | | | | | | | | | Animation for touch, wake and unlockJorim Jaggi2015-07-2823-131/+420
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add callback to inform SysUI when the screen has been unblocked and turned on. - Cleanup inconsistent messaging about device interactive/screen on and off. - Add callbacks to inform SysUI about screen states - Implement a quick fade for the scrim after touch, wake, and unlock. First, start with a black scrim on top of everything, and then fade it out. - Make sure we play the normal unlock animation when device is pulsing - Override navigation bar animations for touch, wake and unlock: Fade in the same manner as the scrim. Bug: 22571198 Bug: 21855614 Change-Id: I8ff08d72cced1e0f03c78d71ff710d8a4f6b848c
* | | | | | | | | | Merge "Don't redundantly call transport.finishRestore()" into mnc-devChris Tate2015-07-281-10/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Don't redundantly call transport.finishRestore()Christopher Tate2015-07-281-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The RestoreSession is no longer responsible for calling finishRestore(); that happens as part of tidying up after running the restore itself, even in failure cases. Bug 22640096 Change-Id: I0be52af2ae8c2c1ac685e9904ccb8120f7fcf522
* | | | | | | | | | | Merge "Add filter for personal apps that are not disabled until first use" ↵Zach Johnson2015-07-281-0/+15
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev
| * | | | | | | | | | | Add filter for personal apps that are not disabled until first useZach Johnson2015-07-241-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed for the battery settings UI. b/22667081 Change-Id: I25ed5c1866dc3027e450c7ce9031de5def4f839a
* | | | | | | | | | | | Merge "Partially revert package freezing" into mnc-devTodd Kennedy2015-07-281-29/+19
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Partially revert package freezingTodd Kennedy2015-07-281-29/+19
| | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On the Nexus Player, upgrading the launcher would cause multiple, simultaneous processes to be running. In order to prevent this regression, revert the portion of ag/682591 dealing with package upgrades. Bug: 21123444 Change-Id: I7a4cf98c7e28fc9893b1c0358d3a98702d94c039
* | | | | | | | | | | Merge "Add "Call subject" capability to phone accounts." into mnc-devTyler Gunn2015-07-283-0/+11
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add "Call subject" capability to phone accounts.Tyler Gunn2015-07-273-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Indicates whether the phone account supports displaying a subject line for incoming calls and sending a subject line for outgoing calls. Supports the IMS Instant Lettering feature. Bug: 22769741 Change-Id: I6d803dc288bfd6d4e356310a8d10d5468c5d4186
* | | | | | | | | | | Merge "Work on issue #21516866: Implement voice interaction in ↵Dianne Hackborn2015-07-2810-6/+337
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ResolverActivity" into mnc-dev
| * | | | | | | | | | | Work on issue #21516866: Implement voice interaction in ResolverActivityDianne Hackborn2015-07-2810-6/+337
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The main change here is to not allow the dialog to go in to its "focus on the last app the user selected" when running in voice interaction mode, instead just always giving a simple list. This also fixes some problems with cleaning up active commands when an activity finishes and not forcing the current session to go away when the screen is turned off. Also added some debug help, having activity print the state of the voice interactor. Change-Id: Ifebee9c74d78398a730a280bb4970f47789dadf5