summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add layout and keymap for Pixel C Bluetooth keyboardDmitry Torokhov2015-09-292-0/+404
| | | | | | | | | | | | | | | | | | | This adds special layout and character map for Pixel C keyboard (Dragon base) that lacks several keys, such as ESC, bracket keys, tilda and backslash, which are mapped various Alt-R combinations. Currently we map: [Shift]+AltR+2 -> ~ and ` [Shift]+AltR+O -> { and [ [Shift]+AltR+P -> } and ] [Shift]+AltR+= -> | and \ ESC mapping requires additional changes. Bug: 24504154 Change-Id: I24fc68efe7e2ddebee26a273838443b441491857
* Fix black KeyguardJorim Jaggi2015-09-241-3/+1
| | | | | | | | | | | When a window has both the flag fullscreen and the dismiss Keyguard flag, we end up in a state where we hide the status bar window but all other windows, because mShowingLockscreen nevers gets set correctly. Move it up so we always set it no matter whether the status bar window was visible. Bug: 22875357 Change-Id: I7953fe7100cc99fe8fb7424a9b311b4630426657
* Merge "Disable wifi firmware logging by default" into mnc-dr-devVinit Deshpande2015-09-242-0/+4
|\
| * Disable wifi firmware logging by defaultVinit Deshpande2015-09-232-0/+4
| | | | | | | | | | | | | | | | | | This is really needed for debugging phase, which is over now; and disabling it will reduce surface area Bug: 24317401 Change-Id: I0acf9efc94333cb274d4286df9c853431d86883d
* | Merge "Update message in SIM PIN view when configuration changes" into ↵Jorim Jaggi2015-09-241-0/+7
|\ \ | | | | | | | | | mnc-dr-dev
| * | Update message in SIM PIN view when configuration changesJorim Jaggi2015-09-231-0/+7
| | | | | | | | | | | | | | | Bug: 24273807 Change-Id: I497fcd2ee527ec22d14ff1b6c30be4ef9a878980
* | | Do not go over handler to dispatch keyguard visibilityJorim Jaggi2015-09-232-19/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When going over the handler, it could happen with a bad interleaving we thought that Keyguard was not showing when getting the onFinishedGoingToSleep message, so we stopped fingerprint authentication. For some reason our state machine for canceling /restarting authentication didn't work correctly so the fingerprint listening state was not correct. Bug: 24178814 Change-Id: I2a4731f195982395244c12e4d33b2b7d561c5671
* | | Merge "save "retain loader" state" into mnc-dr-devTodd Kennedy2015-09-233-1/+16
|\ \ \
| * | | save "retain loader" stateTodd Kennedy2015-09-223-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We cannot pull the "retain loader" state from the Activity; an Activity may not always be hosting a Fragment. Instead, save the "retain loader" state inside the individual fragments. Bug: 23838271 Change-Id: I8358183a7689b5a571ea7be03d769186b2812600
* | | | am 9971167f: am 5ebe8e26: am 4cbfe331: am 773d71e7: am 962c3a0f: am ↵Paul Jensen2015-09-230-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev * commit '9971167fbe7f3b356ba7fd89d91271376a56d235': Don't mark NetworkRequests restricted when they don't have restricted caps
| * \ \ \ am 5ebe8e26: am 4cbfe331: am 773d71e7: am 962c3a0f: am ece4ac21: Merge ↵Paul Jensen2015-09-230-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev * commit '5ebe8e26f2c9517ce321a0fbcbed6efe2960da47': Don't mark NetworkRequests restricted when they don't have restricted caps
| | * \ \ \ am 4cbfe331: am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark ↵Paul Jensen2015-09-231-1/+5
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev * commit '4cbfe3316fd1105b697a9838ef7bafaebf5080a2': Don't mark NetworkRequests restricted when they don't have restricted caps
| | | * \ \ \ am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests ↵Paul Jensen2015-09-231-1/+5
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | restricted when they don\'t have restricted caps" into lmp-dev * commit '773d71e7c45d12810267bb24735360da6e5b258d': Don't mark NetworkRequests restricted when they don't have restricted caps
| | | | * \ \ \ am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when ↵Paul Jensen2015-09-231-1/+5
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | they don\'t have restricted caps" into lmp-dev * commit '962c3a0f2dd46d55ea591671c0a90c1c40214af7': Don't mark NetworkRequests restricted when they don't have restricted caps
| | | | | * \ \ \ am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t ↵Paul Jensen2015-09-231-1/+5
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | have restricted caps" into lmp-dev * commit 'ece4ac2105d18d8d7b6296d6de3fdd5641c35258': Don't mark NetworkRequests restricted when they don't have restricted caps
| | | | | | * \ \ \ Merge "Don't mark NetworkRequests restricted when they don't have restricted ↵Paul Jensen2015-09-231-1/+5
| | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | caps" into lmp-dev
| | | | | | | * | | | Don't mark NetworkRequests restricted when they don't have restricted capsPaul Jensen2015-08-281-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Requests without NET_CAPABILITIES_INTERNET and just the default network capabilities should not be marked restricted. Without this fix apps can hit permissions exceptions if they inadvertently make requests without NET_CAPABILITIES_INTERNET. Bug:23164917 Change-Id: I4c7136821315bcb05dfc42ffbc505a5d4f6109e6 (cherry picked from commit aae613d96134245af7c55976731a49fa59e77470)
* | | | | | | | | | | am 62bb1897: am 554cecea: (-s ours) am 10a7d744: am 96cd7c14: am 635f8711: ↵Paul Jensen2015-09-230-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev * commit '62bb18976f3a79405897bf44bdec8f0abd855b9f': Fix NOT_RESTRICTED network capability and enforce it.
| * | | | | | | | | | am 554cecea: (-s ours) am 10a7d744: am 96cd7c14: am 635f8711: am a9e98343: ↵Paul Jensen2015-09-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev * commit '554cecea4c5e39c25efb721258366ce12e6b861c': Fix NOT_RESTRICTED network capability and enforce it.
| | * | | | | | | | | am 10a7d744: am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix ↵Paul Jensen2015-09-236-44/+109
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT_RESTRICTED network capability and enforce it." into lmp-dev * commit '10a7d7449dae2aabf4f22f980e7efabf274a939a': Fix NOT_RESTRICTED network capability and enforce it.
| | | * | | | | | | | am 96cd7c14: am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network ↵Paul Jensen2015-09-236-44/+109
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | capability and enforce it." into lmp-dev * commit '96cd7c14b5e4a82727f7b56bbdf6cfafda0f17b6': Fix NOT_RESTRICTED network capability and enforce it.
| | | | * | | | | | | am 635f8711: am a9e98343: Merge "Fix NOT_RESTRICTED network capability and ↵Paul Jensen2015-09-236-44/+109
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enforce it." into lmp-dev * commit '635f871132449bea7489f6a61276979beeee5591': Fix NOT_RESTRICTED network capability and enforce it.
| | | | | * | | | | | am a9e98343: Merge "Fix NOT_RESTRICTED network capability and enforce it." ↵Paul Jensen2015-09-236-44/+109
| | | | | |\ \ \ \ \ \ | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit 'a9e98343146244b71e236d82c95a8d0fa30a41c1': Fix NOT_RESTRICTED network capability and enforce it.
| | | | | | * | | | | Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-devPaul Jensen2015-09-236-44/+109
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / /
| | | | | | | * | | | Fix NOT_RESTRICTED network capability and enforce it.Paul Jensen2015-08-286-44/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this change: 1. NOT_RESTRICTED should be removed from NetworkRequests that bring up special restricted carrier networks (e.g. IMS, FOTA). 2. NetworkRequests without NOT_RESTRICTED require CONNECTIVITY_INTERNAL permission to register 3. Binding sockets to networks without NOT_RESTRICTED requires CONNECTIVITY_INTERNAL permission Bug:21637535 Change-Id: I5991d39facaa6b690e969fe15dcbeec52e918321 (cherry picked from commit 487ffe7d3d84bf65212158f7098e8a84b5b55e09)
* | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-devBaligh Uddin2015-09-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2015-09-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If4dc7584743f13b1c0c8661b483af51cc10101a3 Auto-generated-cl: translation import
* | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-devBaligh Uddin2015-09-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2015-09-231-1/+1
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7c5c75590f30ee06cd8171bffb04da5073c394dc Auto-generated-cl: translation import
* | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-devBaligh Uddin2015-09-231-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2015-09-231-2/+2
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1e80237aa0c299f831687de31cb85cf2658d3f3f Auto-generated-cl: translation import
* | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-devBaligh Uddin2015-09-232-14/+14
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2015-09-222-14/+14
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I45408b967515cd8e66d922507127a392dacbdf4f Auto-generated-cl: translation import
* | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into mnc-dr-devBaligh Uddin2015-09-236-11/+11
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2015-09-236-11/+11
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia019f181e358d2925493075488bea307f7131215 Auto-generated-cl: translation import
* | | | | | | | | | | | Merge "Extended the maximum pulsing duration when dozing" into mnc-dr-devJustin Harrison2015-09-231-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Extended the maximum pulsing duration when dozingSelim Cinek2015-09-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib0f4cb4c7a011ce6df4100189b79ed4c2476c2c6
* | | | | | | | | | | | | Merge "Dismiss color fade when it is no longer used." into mnc-dr-devMichael Lentine2015-09-231-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Dismiss color fade when it is no longer used.Michael Lentine2015-09-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the color fade layers would stay active until the screen was turned back on. After this change, the layers are dismissed as soon as color fade completes. Bug: 24276564 Change-Id: I1f81b397d82d518c2bc921b22f7fe9fd066fc059
* | | | | | | | | | | | | Merge "Fix reintroduction of b/10845061" into mnc-dr-devSoonil Nagarkar2015-09-231-33/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix reintroduction of b/10845061Soonil Nagarkar2015-09-211-33/+21
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent crash in case where NLP is not available. Also fix an integer overflow bug that remained uncaught. BUG: 22345134 Change-Id: If6ff7b12f0d15bb2fe97589f8b0be10f9ed06197 (cherry picked from commit 2ec5c5cced4bd5b9dfbb7578f573c56b3bbc7ddf)
* | | | | | | | | | | | | Fix verifyUnlockJorim Jaggi2015-09-231-2/+20
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23970549 Change-Id: I899d8a92050c257217fa8528c33cb4592ad6d76a
* | | | | | | | | | | | Log time difference between power button presses for gestureJorim Jaggi2015-09-221-21/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24304031 Change-Id: Iab755268ee6d5c0c00836a6f68e65a74286074cf
* | | | | | | | | | | | Merge "Enforce a timeout for Content Providers to be published." into mnc-dr-devBaligh Uddin2015-09-221-7/+43
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Enforce a timeout for Content Providers to be published.Robert Carr2015-09-211-7/+43
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActivityManagerService: In the case where we are launching an application on behalf of a Content Provider request, enforce a timeout inbetween the application attaching and the content providers being published. Consider that a defective content provider may block in ContentProvider::onCreate indefinitely: in such a case the PROC_START_TIMEOUT has already been removed as the activity manager must have called bindApplication. In these cases, there will be nothing to wake threads blocking on the (non timed) wait for provider to be published at the end of ActivityManagerService::getContentProviderImpl. This can cause binder threads to block 1 by 1 until eventually AMS runs out and becomes unresponsive. Bug: 22141958 Change-Id: I2226da5df5c79b37f0b896423b3c1eaa4a7ecbba (cherry picked from commit da33c13434cb20a11b522374411a5b819503e4e0)
* | | | | | | | | | | | Merge "Fix Array Index Out of Bounds in BatteryStatsImpl" into mnc-dr-devAdam Lesinski2015-09-221-4/+13
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix Array Index Out of Bounds in BatteryStatsImplAdam Lesinski2015-09-211-4/+13
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the power profile was not set yet, the default sizes of cpu freq arrays could have been too small. Bug:24244089 Change-Id: Ic17a1e8f2058c51fbdda14db35b7b62f4880be00
* | | | | | | | | | | | Merge "Frameworks/base: Propagate boot status to installd" into mnc-dr-devAndreas Gampe2015-09-225-27/+51
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Frameworks/base: Propagate boot status to installdAndreas Gampe2015-09-215-27/+51
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Propagate the boot status explicitly to installd so that we do not have to rely on dev.bootcomplete, which isn't meaningfully set when the device needs the decryption screen on boot. Bug: 23898216 Change-Id: I9b34298caf70b1e5d40970cc0d04c469016a80a7
* | | | | | | | | | | am fed28546: am 3e344f3f: (-s ours) am ba80596b: am f8cda089: am b2b3cecb: ↵Zach Jang2015-09-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 7b5bf993: am fe4cbf2b: (-s ours) am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings * commit 'fed2854653d7e9d596cf1d9cb9c41ff05e744e94': DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
generated by cgit v1.1 at 2025-01-08 18:19:37 +0000