summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Avoid use-after-free race condition when rebasing theme" into mnc-devAlan Viverette2015-08-112-11/+0
|\
| * Avoid use-after-free race condition when rebasing themeAlan Viverette2015-08-112-11/+0
| | | | | | | | | | | | | | | | ... by never rebasing the theme. We don't need to do this unless the system theme is configuration-dependent, which it is not currently. Bug: 22943781 Change-Id: I96e695441543379e4d5fdf3cc6f18d9e6cf953b4
* | Merge "Crash apps with bad notification icons." into mnc-devDaniel Sandler2015-08-111-1/+8
|\ \
| * | Crash apps with bad notification icons.Dan Sandler2015-08-101-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This shouldn't happen, since there are many places where invalid icons should already have been either fixed (in the case where there's an .icon but no .mSmallIcon) or rejected (if they're both null or invalid). But if a notification makes it all the way to SystemUI without a valid icon, let's crash the sender. Bug: 23011305 Change-Id: Ifaebec57d59baa1defb4520178b5815d47ed5712
* | | Merge "Update setApplicationRestrictions documentation" into mnc-devEsteban Talavera2015-08-111-2/+7
|\ \ \
| * | | Update setApplicationRestrictions documentationEsteban Talavera2015-08-101-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | From M we support nested Bundles in the input parameter Bug: 23076454 Change-Id: I9c27d19ccfbc713ca757cbdde7ea9fbbc3839302
* | | | Frameworks/base: Disable Clang in core/jniAndreas Gampe2015-08-111-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | thread_local does not work with Clang at the moment. Bug: 22414716 Change-Id: I4059b63a1621c346bfc72dbbec0b9cb165485e26 (cherry picked from commit 2bc67a1b5f9d4662ef7da4645ca8e580302b3553)
* | | | Merge "Pushing the startActivity before the calls to remove task." into mnc-devWinson Chung2015-08-111-3/+5
|\ \ \ \
| * | | | Pushing the startActivity before the calls to remove task.Winson2015-08-101-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - It appears that there is contention between startActivityAsUser() and removeTask() (called on two separate threads) which can cause jank when a user removes all the tasks from their recents list. This CL ensures that startActivityAsUser() is always run first so it is not blocked by the other call (which should be able to run in the background uninterrupted). Bug: 22760556 Change-Id: I7564a2f0e43414686419d3657379bbd0ca6b4152
* | | | | Merge "Don't show fingerprint cancellation messages in keyguard" into mnc-devJorim Jaggi2015-08-111-1/+4
|\ \ \ \ \
| * | | | | Don't show fingerprint cancellation messages in keyguardJim Miller2015-08-061-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cancellation messages can come from a variety of sources and are not user-actionable. As a result, we just shouldn't show them. Fixes bug 22863862 Change-Id: I2154c774fd5ac7477e01d1cbf3bdde2d1929363b
* | | | | | Merge "Fix issue #23037899: Support for Battery Optimization permission + ↵Dianne Hackborn2015-08-116-4/+45
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Dialog" into mnc-dev
| * | | | | | Fix issue #23037899: Support for Battery Optimization permission + DialogDianne Hackborn2015-08-106-4/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New permission, new Intent action. Change-Id: I1d9ba55be8f72074e29d33ad7a0a12a820bbac39
* | | | | | | Merge "DO NOT MERGE: Idle Job Start During SCREEN_ON or DREAMING_STOPPED" ↵Matthew Williams2015-08-101-7/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev
| * | | | | | | DO NOT MERGE: Idle Job Start During SCREEN_ON or DREAMING_STOPPEDKevin Zhu2015-08-101-7/+12
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 23086704 Cherry-picked from https://android-review.googlesource.com/#/c/162280/ When the screen goes off or dreaming start, an alarm will be scheduled and idle state will be true when the alarm expired. If the screen goes on or dreaming stop happens before the alarm expired, the alarm isn't cancelled and idle state is set to be true when the device is in SCREEN_ON or DREADING_STOPPED state. There is also a case that Idle alarm triggered when the screen on or dreaming stop just start to be processed. ACTION_TRIGGER_IDLE will set mIdle to true during screen on or dreaming stop. In this patch, the alarm will be cancelled when the screen goes on or dreaming stop and screen-on flag will be set. So the idle state can only be set when screen is off or dreaming started. Change-Id: Ic21a2394418ca55513ab932b3bfad1126b8769c1
* | | | | | | Merge "Fix wifi disable during restore" into mnc-devChris Tate2015-08-101-16/+49
|\ \ \ \ \ \ \
| * | | | | | | Fix wifi disable during restoreChristopher Tate2015-08-071-16/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The main looper needs to run freely for a moment after disabling wifi in order for various signals (content observers, broadcast) to propagate to all the listeners that need to take action for the wifi stack to shut all the way down. This patch breaks up the disable-and-rewrite-config sequence of wifi AP restore in to two distinct operations separated by a moment so as not to block those necessary messages. Bug 22979342 Change-Id: I271766cad0e454669a194652fb67f835bb022cd1
* | | | | | | | Merge "[Fix getAccounts MANAGE_USERS permission]" into mnc-devSimranjit Kohli2015-08-101-2/+10
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | [Fix getAccounts MANAGE_USERS permission]Simranjit Singh Kohli2015-08-101-2/+10
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make code having potential to call userInfo inside clearIdentity. Bug: 22917218 Change-Id: If95fb7c0ec36a2f5c737f04bc7d8af95b44fea22
* | | | | | | Close ZipFiles correctly in WebViewFactory.Torne (Richard Coles)2015-08-101-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We weren't closing the ZipFiles created in WebViewFactory to check inside APKs - use try-with-resources to get them closed automatically. Bug: 23072621 Change-Id: I11c6b77e960a7d240d19d22240cac177b6ba27b2
* | | | | | | Merge "Initialize network name better in NetworkController" into mnc-devJason Monk2015-08-101-2/+4
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Initialize network name better in NetworkControllerJason Monk2015-08-101-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initialize current network name to correct value from the SubscriptionInfo until we get a broadcast about its current state. Bug: 22212693 Change-Id: I17fa4378cc7a540c81268f8c4d5aa6a505f3ee40
* | | | | | | Merge "Filtering Remote-Submix and Back-mic devices from AudioDeviceInfo ↵Paul Mclean2015-08-101-2/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | API." into mnc-dev
| * | | | | | | Filtering Remote-Submix and Back-mic devices from AudioDeviceInfo API.Paul McLean2015-08-071-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22729461 Change-Id: Ie581c385af2be16e61fcab5993391ef42f82a7d8
* | | | | | | | Merge "Revert "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS ↵Paul Mclean2015-08-101-10/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | / / / / / / | |/ / / / / / |/| | | | | | test."" into mnc-dev
| * | | | | | Revert "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test."Paul Mclean2015-08-071-10/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8b2562b14c37cd61f9c8e1b21e28cf57ff5b7523. Change-Id: I731d01fd652e928ba331fa28bb09cc8234753fbf
* | | | | | Merge "Do not show removed permissions in the UI - framework" into mnc-devSvetoslav Ganov2015-08-084-9/+19
|\ \ \ \ \ \
| * | | | | | Do not show removed permissions in the UI - frameworkSvet Ganov2015-08-074-9/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:23043018 Change-Id: Ia5cf49f299eda627d9fde2b34498812afcb3a6d5
* | | | | | | Merge "Fix issue #23037093: "Write system settings" permission value ↵Dianne Hackborn2015-08-081-1/+50
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | fails..." into mnc-dev
| * | | | | | Fix issue #23037093: "Write system settings" permission value fails...Dianne Hackborn2015-08-071-1/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...to persist after reboot We were writing a corrupt settings file, so would always reset back to the default app ops state after boot...! Also add new appops service commands to manually write and read its settings, since that is very useful for testing. Change-Id: Ia510507764738fd82e45ec0be6db840c6ea30c28
* | | | | | | Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" ↵Billy Lau2015-08-074-18/+105
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | into mnc-dev
| * | | | | | Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGSBilly Lau2015-08-074-18/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge the CHANGE_NETWORK_STATE permission with WRITE_SETTINGS. AndroidManifest.xml: Raised the protection level of CHANGE_NETWORK_STATE permission from normal to signature|appops and pre23|preinstall for compatibility provider/Settings: Wrote new helper methods to check if app is allowed to change network state. ConnectivityManager.java & ConnectivityService.java: Replace enforcement checks for CHANGE_NETWORK_STATE with checkAndNoteChangeNetworkStateOperations instead. Change-Id: If8c2dd3c76a5324ca43f1d90fa17973216c2bcc5
* | | | | | | Merge "Fix issue #22989030: Separate battery whitelists" into mnc-devDianne Hackborn2015-08-078-63/+411
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Fix issue #22989030: Separate battery whitelistsDianne Hackborn2015-08-078-63/+411
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now have a new whitelist you can put apps in, which opts them out of the old battery saver mode and new app idle, but doesn't keep them from going in to doze. This is for a few special cases that we had previously whitelisted for battery saver, and inherited to the new modes... ultimately we should figure out how to get these apps out of the whitelist completely, but this will help for now. Apps in this new whitelist are not shown in the UI, because they are still significantly restricted by not being able to operate normally in doze. This also means they are still visible in the list of all apps for the user to be able to put them on/off the complete whitelist if that is what they really want. In the course of doing this, I needed to clean up code in the network policy manager to better separate management of the two firewall rules that now have different whitelists applied to them. This also hopefully just generally simplifies and cleans up that code. Hopefully! Change-Id: I92e15f2f85899571dd8b049b5e3eb1354f55f353
* | | | | | | Merge "Correctly skip files that are excluded from restore" into mnc-devMatthew Williams2015-08-071-5/+13
|\ \ \ \ \ \ \
| * | | | | | | Correctly skip files that are excluded from restoreMatthew Williams2015-08-061-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 22957980 If a file was present in the backup but excluded on restore, it can result in the restored data being corrupted. Ensure that FullBackup.restoreFile is called with a null destination, which will result in the file not being written to disk, but still properly pulled from the socket. Change-Id: Iac882a961b76e687654535aec352678486a08c39
* | | | | | | | Merge "Fix check for caller being the active network scorer" into mnc-devShirish Kalele2015-08-072-12/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix check for caller being the active network scorerShirish Kalele2015-08-062-12/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compare caller and scorer uids to decide if caller is the active scorer instead of calling AppOps.checkPackage(). Bug: 23000690 Change-Id: I64285f965716f3aceb24f193d86ab9d6be7202c5
* | | | | | | | | Merge "Keep intent verification status of system apps when uninstalling ↵Nicolas Prévot2015-08-071-2/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | them." into mnc-dev
| * | | | | | | | | Keep intent verification status of system apps when uninstalling them.Nicolas Prevot2015-08-071-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When creating a work profile, system apps are uninstalled and then sometimes reinstalled. In the process, they lose their intent verification status. BUG:22943461 Change-Id:I5b008c6de2125f190063b08908076a649067c60d
* | | | | | | | | | Merge "Update Navigation bar assets." into mnc-devJulia Reynolds2015-08-0720-0/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Update Navigation bar assets.Julia Reynolds2015-08-0720-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22855920 Change-Id: I2d66bb087b092cdb6280e78c064f32ae9e42ad61
* | | | | | | | | | Merge "Allow system to disable lockscreen" into mnc-devJason Monk2015-08-072-6/+6
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Allow system to disable lockscreenJason Monk2015-08-072-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even when there is a pin. Bug: 22920549 Change-Id: Ib84e1c3ac67be0318d4186c66ee582a49969e373
* | | | | | | | | | Merge "Fix partial user cleanup on restart" into mnc-devAmith Yamasani2015-08-072-7/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix partial user cleanup on restartAmith Yamasani2015-08-072-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Internal volume was not available during PackageManagerService creation, which resulted in a zombie user's folder not being cleaned after a reboot. Add the internal volume earlier in the boot cycle so that it can be accessed for user cleanup. Bug: 22483086 Change-Id: I8f3ffbb25f3902d00a96d1ee2d7a79373c5e35b7
* | | | | | | | | | | Merge "Wait a bit longer for wifi to shut down before rewriting the config" ↵Chris Tate2015-08-071-2/+4
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dev
| * | | | | | | | | | | Wait a bit longer for wifi to shut down before rewriting the configChristopher Tate2015-08-071-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We've seen case of it taking longer than 1500ms for the wifi system to actually shut down after the triggering settings element is written, so extend the wait time a bit. We've seen it take more than 1500ms but not more than 2500ms, so that's the new heuristic. This will of course all become happily obsolete once we start applying restored AP definitions programmatically rather than by filesystem-level operations. Bug 22979342 Change-Id: I6acf1baac23d4100124093128b82abf242b11a0e
* | | | | | | | | | | | Merge "Debugging for issue #22556778: Starting under voice control not ↵Dianne Hackborn2015-08-071-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allowed" into mnc-dev
| * | | | | | | | | | | | Debugging for issue #22556778: Starting under voice control not allowedDianne Hackborn2015-08-071-0/+8
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better error messages in log to explain what is going on. Change-Id: Ie686a323ceedd42453b6581fe79653b407d49ee5
generated by cgit v1.1 at 2025-01-10 02:59:08 +0000