summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-10-29Merge "Make SYSTEM_ALERT_WINDOW development permission" into mnc-dr-devmarshmallow-mr1-devSvetoslav Ganov
2015-10-28Merge "Import translations. DO NOT MERGE" into mnc-dr-devGeoff Mendal
2015-10-28Import translations. DO NOT MERGEGeoff Mendal
Change-Id: Id9e2298a05893e3769f0e62bcda5fe70c058d11a Auto-generated-cl: translation import
2015-10-28Import translations. DO NOT MERGEGeoff Mendal
Change-Id: If7c4ccf382e85f88a4fac586ca870068d8219974 Auto-generated-cl: translation import
2015-10-27Make SYSTEM_ALERT_WINDOW development permissionSvetoslav
bug:25329324 Change-Id: I0086464846bab9424764dd0d726692d96a0f1207
2015-10-27Merge "Petites fautes." into mnc-dr-devDaniel Sandler
2015-10-27Petites fautes.Dan Sandler
Bug: 25308153 Change-Id: I62ffe080e3f36eb685cdc06d8c106d32e18092ed
2015-10-27Fix issue #25289999: Lower device idle alarm limit to 10 mins.Dianne Hackborn
This helps with some cases where perisistent network connections need a more frequent keep alive signal. Actually make it 9 minutes to ensure that things needing a 10 minute cycle will execute within that time. Change-Id: Ife8c7b7f7f82b108d5a6c1624bd6115e6087c3be
2015-10-26Merge "Import translations. DO NOT MERGE" into mnc-dr-devGeoff Mendal
2015-10-26Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I0383c1869f289a39ca3db684712dbd812e626e9a Auto-generated-cl: translation import
2015-10-26Import translations. DO NOT MERGEGeoff Mendal
Change-Id: I9bf90d06113d8333bed3eec1c65ed799a785fb63 Auto-generated-cl: translation import
2015-10-24Merge "Prevent recents from coming up when in SUW" into mnc-dr-devPuneet Kumar
2015-10-24Prevent recents from coming up when in SUWMichael Wright
Bug: 25229538 Change-Id: I141c4eb928a5ce7f9858922862fe3dc1d3a33a90
2015-10-24Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: ↵Dan Sandler
b1de85487a -s ours am: 410bea181b am: 511357c39b am: 7e16b2e8f5 -s ours am: e68e70d509 * commit 'e68e70d509e2a0ba1c8bd56c231bf1c6cc3da967': Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-24Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: ↵Dan Sandler
b1de85487a -s ours am: 410bea181b am: 511357c39b am: 7e16b2e8f5 -s ours * commit '7e16b2e8f5b74d29711d330f6982d8ed12c3f4db': Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-24Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: ↵Dan Sandler
b1de85487a -s ours am: 410bea181b am: 511357c39b * commit '511357c39b058b0d03beb175c1c35990729ee3d0': Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-24Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77 am: ↵Dan Sandler
6026b5b17e am: 6c3186ea07 -s ours am: ab4857790b * commit 'ab4857790bc84388817c0bec8c4010d660f35ada': Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-24Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77 am: ↵Dan Sandler
6026b5b17e am: 6c3186ea07 -s ours * commit '6c3186ea07a735d84e9a33e9864366b01f1f4c86': Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-24Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3 am: ↵Dan Sandler
b1de85487a -s ours am: 410bea181b * commit '410bea181b229adef7a2c1a9308379eead260706': Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-23Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 51c2619c77Dan Sandler
am: 6026b5b17e * commit '6026b5b17e786c180909d8fe5f6747e446e1d365': Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-23Delay hiding the cast icon for 3 seconds. DO NOT MERGE am: 1044e162c3Dan Sandler
am: b1de85487a -s ours * commit 'b1de85487af1726c3d9e80d78bd643f550d9f3a4': Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-23Delay hiding the cast icon for 3 seconds. DO NOT MERGEDan Sandler
am: 51c2619c77 * commit '51c2619c7706575a171cf29819db14e91b815a62': Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-23Delay hiding the cast icon for 3 seconds. DO NOT MERGEDan Sandler
am: 446dcc9ed7 * commit '446dcc9ed7efa0b80ed7d353478326b2236f2cab': Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-23Delay hiding the cast icon for 3 seconds. DO NOT MERGEDan Sandler
am: 1044e162c3 * commit '1044e162c3dc4169b79112fc1a2de14757bca8c3': Delay hiding the cast icon for 3 seconds. DO NOT MERGE
2015-10-23Merge "[DO NOT MERGE] EAP-TLS PMKID mismatch error" into mnc-dr-devxin He
2015-10-23[DO NOT MERGE] EAP-TLS PMKID mismatch errorxinhe
b/24253154 Change-Id: I45c770dc4769e74b668385dbc3a618d31a40dc7e
2015-10-23Merge "Revert "Revert "Track ashmem memory usage in Parcel""" into mnc-dr-devAdrian Roos
2015-10-23Merge "DO NOT MERGE Fix issue #24118803: The screen doesn't turn off..." ↵Dianne Hackborn
into mnc-dr-dev
2015-10-23Delay hiding the cast icon for 3 seconds. DO NOT MERGEDan Sandler
Ensure that the user has had a chance to see it for a few seconds after screen recording has ended. Bug: 19121797 (cherry picked from commit 8fd25bf7711aabffe73213ba1f9056f285270695) Change-Id: I14d9fb54521dc6d60822e7c683e4e92fd62cdc6a
2015-10-23Delay hiding the cast icon for 3 seconds. DO NOT MERGEDan Sandler
Ensure that the user has had a chance to see it for a few seconds after screen recording has ended. (cherry picked from commit 8fd25bf7711aabffe73213ba1f9056f285270695) Bug: 19121797 Change-Id: I7a5c12b371b735c756ca5a3e8716c385fb3fbfe9
2015-10-23Delay hiding the cast icon for 3 seconds. DO NOT MERGEDan Sandler
Ensure that the user has had a chance to see it for a few seconds after screen recording has ended. Bug: 19121797 Change-Id: I52b69b2029439d42163ead5dc8748889b4f61934 (cherry picked from commit 8fd25bf7711aabffe73213ba1f9056f285270695)
2015-10-22Revert "Revert "Track ashmem memory usage in Parcel""Adrian Roos
This reverts commit e2adb2cf0f2c90c77fab3f09285a92e05e70b567. Bug: 25004154 Change-Id: I9b432d1ebc39f3bbcd7afdefc403f0fb6ced8158
2015-10-22DO NOT MERGE Fix issue #24118803: The screen doesn't turn off...Dianne Hackborn
...after more than 60 minutes left The sensing timeout alarm was being cancelled immediately after it was scheduled it. Now only cancel it when we are done sensing or have reset activity. Change-Id: Id0440cda7dd1b81bf871f16dfb015df6284cf6af
2015-10-22Remove tether_apndata for SasktelSungmin Choi
Device has second APN (inet.stm.sk.ca) is being used for hot spot/tethered data. SaskTel has moved to a single APN on devices (pda.stm.sk.ca). BUG=25064017 Change-Id: I5ba1f9e7c3b54cf8e8681a289693aba0ac584296
2015-10-22Merge "Revert "Track ashmem memory usage in Parcel"" into mnc-dr-devIan Pedowitz
2015-10-22Revert "Track ashmem memory usage in Parcel"Ian Pedowitz
This reverts commit ab3f9724035046d65124a72db2a09c824b3d5c67. Bug: 25169267 Bug: 25191602 Bug: 25004154 Change-Id: Ic51e62515273e4687359dfd9ff770a4d06c0c667
2015-10-22Merge "Don't resolve cross-profile app links without intent picker." into ↵Nicolas Prévot
mnc-dr-dev
2015-10-22SystemUI: fix automatic pairing of BT keyboardsDmitry Torokhov
After reset (docking) Pixel C Keyboard that was previously paired with a device goes into so-called non-discoverable mode, where it will establish connection only with device that it has connected before. When scanning for available devices we need to wait till the keyboard starts advertising itself as discoverable, and only then try to pair. Also, let's flush the device cache when we attach the base to make sure the device that we seen before and cached again in the right state after reset. Bug: 24915541 Change-Id: I136c1c4235080a25529b4b1c2b1da9bc18508811
2015-10-22Don't resolve cross-profile app links without intent picker.Nicolas Prevot
If ALLOW_CROSS_PROFILE_APP_LINKING has been set: If there is an app with status always across profiles, and some apps without status always in the current profile: show an intent picker instead of directly resolving across profiles. BUG:25109215 Change-Id: I74a67d231284ce912121ea0818109fbf904183e8
2015-10-22Fix crash on calling removeSelection with showing selection handlersYoshiki Iguchi
A crash occured on updating after calling removeSelection with showing selection handlers. This was because some selection-handler code didn't consider the case the selection index was -1 (-1 means there is no selection). This patch fixes this crash. Bug: 23299977 Change-Id: I736d315e073f773aec597522203015205a8da42b
2015-10-22Merge "Reinstate CHANGE_NETWORK_STATE as a normal permission." into mnc-dr-devLorenzo Colitti
2015-10-21Add the FEATURE_TELEPHONY restriction to TelephonyManager.getAllCellInfo()Nathan Harold
-Fixed doc string Bug: 23979591 This reverts commit f7b6474de87fd2eee377dc612c757102cdacc003. Change-Id: I127f1452f4319a154dd4d962d4a63c84f0833702
2015-10-22Merge "Revert "Add the FEATURE_TELEPHONY restriction to ↵Nathan Harold
TelephonyManager.getAllCellInfo()"" into mnc-dr-dev
2015-10-22Revert "Add the FEATURE_TELEPHONY restriction to ↵Nathan Harold
TelephonyManager.getAllCellInfo()" This reverts commit 5d1429e0dd1a13f76dbb354f9e4e415f71956299. Doc string isn't resolving. Temporarily reverting. Change-Id: I128b13abcf938c96b24225e373ac0885c24e083e
2015-10-22Merge "Add the FEATURE_TELEPHONY restriction to ↵Nathan Harold
TelephonyManager.getAllCellInfo()" into mnc-dr-dev
2015-10-22Merge "Track ashmem memory usage in Parcel" into mnc-dr-devAdrian Roos
2015-10-22Merge "Hopefully fix issue #25153459: Sandboxed_process1 thrashing" into ↵Dianne Hackborn
mnc-dr-dev
2015-10-22Track ashmem memory usage in ParcelAdrian Roos
Bug: 25004154 Change-Id: Id9d5656dd0605f1b50525596b75601309f67ebdc (cherry picked from commit 4701a496a5477a7de01fbc9eaf4af9812f83770c)
2015-10-21Hopefully fix issue #25153459: Sandboxed_process1 thrashingDianne Hackborn
There is a race where if you unbind to a service before its process has come up, we would leave the service record active and keep it running. Fix this by checking the service state after its process up and proceed to bring it down if it is no longer needed. Also added a similar check when restarting a service, just in case there are other ways we can get into this situation. And while I am at it, I tweaked the broadcast queue dump output a bit to hopefully make it a lot easier to figure out how long it is taking to process broadcasts. Change-Id: I46b98f1fe394ab8039ea4cc81fb5d3afb6391a31
2015-10-22Reinstate CHANGE_NETWORK_STATE as a normal permission.Lorenzo Colitti
This is a partial revert of http://ag/738523 , but not a full revert because M apps that have gone through the WRITE_SETTINGS route to obtain permission to change network state should continue to have permission to do so. Specifically: 1. Change the protection level of CHANGE_NETWORK_STATE back from "signature|preinstalled|appop|pre23" to "normal". This allows apps that declare CHANGE_NETWORK_STATE in their manifest to acquire it, even if they target the M SDK or above. 2. Change the ConnectivityManager permission checks so that they first check CHANGE_NETWORK_STATE, and then ask Settings if the app has the WRITE_SETTINGS runtime permission. 3. Slightly simplify the code in the Settings provider code that deals specifically with the ability to change network state. 4. Make the ConnectivityService permissions checks use the ConnectivityManager code to avoid code duplication. 5. Update the ConnectivityManager public Javadoc to list both CHANGE_NETWORK_STATE and WRITE_SETTINGS. Bug: 21588539 Bug: 23597341 Change-Id: Ic06a26517c95f9ad94183f6d126fd0de45de346e
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 05:11:47 +0000