Xiyuan Xia
e927bd7014
am 43fe6dba: Merge "Fix ChoosePat/Pin/Pwd crash from async task" into mnc-dr-dev
...
* commit '43fe6dba693f8f23ffd69c1ffcd3b5642266be58':
Fix ChoosePat/Pin/Pwd crash from async task
2015-08-28 01:52:26 +00:00
Xiyuan Xia
43fe6dba69
Merge "Fix ChoosePat/Pin/Pwd crash from async task" into mnc-dr-dev
2015-08-28 01:46:57 +00:00
Xiaohui Chen
b7c8fbf402
Cleanup USER_OWNER for cryptkeeper
...
Bug: 19913735
Change-Id: If8df927e72321e00bfef49a6c81953442e04969d
2015-08-27 15:46:32 -07:00
Xiyuan Xia
3e7e3d6c59
Fix ChoosePat/Pin/Pwd crash from async task
...
Use a retained worker fragment to track the asynchronous
save-and-finish task so that ChoosePattern/Password activity
is properly dismissed after a configuration change.
Bug:23424884
Bug:23521530
Change-Id: I328022c1603cfb0f6812cd8aa7916ae7b72c9950
2015-08-27 13:35:55 -07:00
Sanket Padawe
024752b715
am a3618fca: am 62037449: (-s ours) am 3be6d0b4: Merge "Avoid new network to connect by using "Add Network" instead only Save it." into mnc-dev
...
* commit 'a3618fca903a5d2fd4e744e8bdd2944d57370be1':
2015-08-27 20:21:50 +00:00
Christopher Tate
28d19ae3f2
am bbacf99a: am 356e5b58: (-s ours) am ffe701dc: Present the security patch date in a human-friendly format
...
* commit 'bbacf99a638171059f5ce6743c8cff8f3daa637b':
2015-08-27 20:21:48 +00:00
Selim Cinek
411c7997a7
am 0376623a: am c877856a: (-s ours) am 19551115: Adapted string length translation limits
...
* commit '0376623ae4e8568bc0bf982ebfe9e9cf2257de7d':
2015-08-27 20:21:47 +00:00
Julia Reynolds
2de70565ad
am 09e311b9: am 42f2b354: (-s ours) am 0ece6a32: String update for battery details page.
...
* commit '09e311b9a977dcc9f89871278412142a9695728b':
2015-08-27 20:21:46 +00:00
Adam Lesinski
1cabf6855e
am 3f76d948: am f71fbbff: (-s ours) am 3cc05c9d: Merge "BatteryStats: Fix coalescing of shared app GIDs and system UIDs" into mnc-dev
...
* commit '3f76d948e6f217d23fe00e0f6b6e7ac6c439b1ae':
2015-08-27 20:21:45 +00:00
Jeff Sharkey
a3879c4223
am 875b1fec: am 08fe57cb: (-s ours) am b4158f0e: Merge "Only offer migration between private volumes." into mnc-dev
...
* commit '875b1fec7a5f8e0b67581721d33459f85b36b338':
2015-08-27 20:21:43 +00:00
Chris Tate
9c98de114d
am e5aeeffc: am 71efd816: (-s ours) am 7e36d33c: Merge "Make "Ask every time" actually work that way" into mnc-dev
...
* commit 'e5aeeffcdbfdeb5fcfb05d43571b22eec399db90':
2015-08-27 20:21:42 +00:00
Jeff Sharkey
7925d2a910
am 6d1ec23f: am 38c81907: (-s ours) am ae531f1f: Merge "Show storage slow dialog allowing state loss." into mnc-dev
...
* commit '6d1ec23f45ce6dcf0767cf92f221f37a572a4328':
2015-08-27 20:21:40 +00:00
Geoff Mendal
440b31b986
am f1f6a0b9: (-s ours) am 36fe2c6a: (-s ours) am eea96f22: (-s ours) Import translations. DO NOT MERGE
...
* commit 'f1f6a0b9204fafbf9553d2da90804d8e56e80505':
2015-08-27 20:21:39 +00:00
Dianne Hackborn
328c560d45
am 1b33e6b5: am df85a4fc: (-s ours) am f67d0785: Merge "Fix issue #23116383 : Include security patch level in Settings" into mnc-dev
...
* commit '1b33e6b5d064585c03f9a78359f369c25c2acb47':
2015-08-27 20:21:37 +00:00
Andres Morales
0d7ec9218e
am 68bf9508: am af48dffe: (-s ours) am 9f879ef0: Merge "[ConfirmPattern] use correct user id for stealth mode" into mnc-dev
...
* commit '68bf9508178a9fbfe89fa75bdebf5599de5155ba':
2015-08-27 20:21:36 +00:00
Dianne Hackborn
a42b6e0fac
am 9344eb45: am 7f45b55d: (-s ours) am 8500822b: Merge "Fix issue #23079119 : Description for write settings permission says..." into mnc-dev
...
* commit '9344eb4534eccfe6be89f10fc08e81f8295409aa':
2015-08-27 20:21:34 +00:00
Maurice Lam
c1336374bd
am 9ee252e8: am ef906938: (-s ours) am 3d9cb926: Merge "[Fingerprint] Use different ring size for setup" into mnc-dev
...
* commit '9ee252e8634961981776ca0be26b9c74e56e013f':
2015-08-27 20:21:31 +00:00
Dianne Hackborn
7c3acf5207
am 838c4a2e: am ef54ab61: (-s ours) am be4df036: Fix issue #23037899 : Support for Battery Optimization permission + Dialog
...
* commit '838c4a2e70c659688a5969fbb738075ad7b824dd':
2015-08-27 20:21:28 +00:00
Dianne Hackborn
3b57ad1e70
am 9c0a7f91: am f6649472: (-s ours) am ba38155d: Merge "Fix issue #23037720 : New Battery Optimization Strings" into mnc-dev
...
* commit '9c0a7f91a98e19cd0fedb773cf8b63c7c70464c8':
2015-08-27 20:21:25 +00:00
Dianne Hackborn
0f9e7b629c
am e81e1816: am 6aeabbf2: (-s ours) am 996e285c: Merge "Fix issue #23037720 : New Battery Optimization Strings" into mnc-dev
...
* commit 'e81e1816c86e27deab8935454648a2ee09130ddd':
2015-08-27 20:21:23 +00:00
Julia Reynolds
f5bc872cdd
am b88ee9bd: am 0a27e57d: (-s ours) am 2557d8a2: Merge "Wrap text on long preferences." into mnc-dev
...
* commit 'b88ee9bd79fd400af0593344aa9ac3109254859c':
2015-08-27 20:21:21 +00:00
Jason Monk
a221600a1e
am 06e661fa: am 656145a0: (-s ours) am cf1e22f4: Merge "Remove extra help & feedback menu from power usage" into mnc-dev
...
* commit '06e661fadc2876e51bacf087f9c889e13afc160e':
2015-08-27 20:21:20 +00:00
Pavel Zhamaitsiak
63da5b0a78
am dd38b4d4: am 667be5d6: (-s ours) am 8cf54264: Merge "Ensure that listener is removed only if it was added" into mnc-dev
...
* commit 'dd38b4d4ed0841f0dc898b98add67a855b4e3e62':
2015-08-27 20:21:18 +00:00
Jeff Sharkey
525b75c10c
am 5a9e0e82: am e56724ba: (-s ours) am 67f0739c: Merge "Block moving when already in progress." into mnc-dev
...
* commit '5a9e0e8236dcab5e086d95c45e9b0e4ca30da88d':
2015-08-27 20:21:16 +00:00
Billy Lau
bebcd7ee91
am a75c60d7: am 2cbb3c86: (-s ours) am a59f39fc: Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
...
* commit 'a75c60d7ddd6612bf7bc4cf87d12156be72ac50f':
2015-08-27 20:21:14 +00:00
Dianne Hackborn
165919c393
am 528a2548: am e426005b: (-s ours) am e7a5966a: Merge "Fix issue #23037720 : New Battery Optimization Strings" into mnc-dev
...
* commit '528a2548b824867572984be40b26c02902504e83':
2015-08-27 20:21:12 +00:00
Julia Reynolds
7e4965728b
am 2af5aa09: am a9490b68: (-s ours) am 5ab0e183: Merge "Hide optimization control on battery details page for non whitelisted apps." into mnc-dev
...
* commit '2af5aa09a0e8506c64a544dc74475b5ce5aaed1d':
2015-08-27 20:21:10 +00:00
Geoff Mendal
22909549ae
am ab74a871: (-s ours) am acf198a7: (-s ours) am 2d546b77: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ab74a871817767ac861fc7ae30ebb16f406f3109':
2015-08-27 20:21:08 +00:00
Andres Morales
a51a9b3bd3
am dcaf07d0: am af2ea2f4: (-s ours) am 4897fa87: Merge "fix CC for work profiles" into mnc-dev
...
* commit 'dcaf07d0bb6cf031cab7ab04fa927421fbf7311e':
2015-08-27 20:21:06 +00:00
Geoff Mendal
727d279117
am 14457a0a: (-s ours) am 9acc740e: (-s ours) am 7930f872: (-s ours) Import translations. DO NOT MERGE
...
* commit '14457a0aec66e5c712c38d8f81c3bbac9c5ea87b':
2015-08-27 20:21:03 +00:00
Jason Monk
3934c1f4de
am 81a08e38: am aceedc73: (-s ours) am 888673bd: Hide show/hide system from battery optimizations list
...
* commit '81a08e382ac09c07b353a1c5ce515f26c9064354':
2015-08-27 20:20:56 +00:00
Sanket Padawe
8f37500b08
am cac8f172: am 086dde01: (-s ours) am 151612fb: am 5f9d15ed: am 86d85300: am 19336da3: am ac2347c0: am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct.
...
* commit 'cac8f172102289a608f2b894d3402cf231f424d0':
2015-08-27 20:20:54 +00:00
Ajay Panicker
90ef0c7cc0
am 5fca7d06: am 8c0139b1: (-s ours) am cd8acb22: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev
...
* commit '5fca7d06fea5c890c224d40319eb7e4b4fa56986':
2015-08-27 20:20:51 +00:00
Jason Monk
b3ff7c501f
am 7d474282: am 12c70b7c: (-s ours) am 244fd782: Merge "Remove summaries fro configure apps page" into mnc-dev
...
* commit '7d474282be18ada378517478fecd6631d459814b':
2015-08-27 20:20:49 +00:00
Maurice Lam
1fe1d33bdc
am 6f9b92f8: am a2f78eaf: (-s ours) am 311a2d95: Merge "[Fingerprint] Update string for enrolling" into mnc-dev
...
* commit '6f9b92f83bd5f32f8b588698f53de5737a1e08b3':
2015-08-27 20:20:47 +00:00
Maurice Lam
27a167bc97
am 2d5c9de6: am 6863fac2: (-s ours) am 8c9136ef: Merge "[Fingerprint] Shrink fingerprint progress ring" into mnc-dev
...
* commit '2d5c9de6b54cbc6e63071dbac874cec32e989340':
2015-08-27 20:20:45 +00:00
Nick Kralevich
2aadd76a88
am 35e08b44: am 8a85dcc9: (-s ours) am 1adca55f: Merge "UsbModeChooserActivity: Ensure MIDI available with DISALLOW_USB_FILE_TRANSFER" into mnc-dev
...
* commit '35e08b441c308110b91df03cb2d456f05a2bdfa4':
2015-08-27 20:20:43 +00:00
Jason Monk
a9d5776a23
am d50c024c: am 25adfb00: (-s ours) am f61ead7a: Make sure accessibility service desc isn\'t clickable
...
* commit 'd50c024c109f86be5dcb637c336acdf99b2cfa2d':
2015-08-27 20:20:41 +00:00
Dianne Hackborn
483bdc171f
am e885c27c: am 50cb6411: (-s ours) am f426126a: Merge "Fix issue #22860466 : viapi security bug - rubber stamping in nested VIs" into mnc-dev
...
* commit 'e885c27c08acb3a01388d597ffda9c15ce49c9a2':
2015-08-27 20:20:36 +00:00
Chris Tate
938a03c676
am 8c2593e0: am 5977cfdf: (-s ours) am 6e64e22e: Merge "Explain properly when apps can open multiple hosts\' links" into mnc-dev
...
* commit '8c2593e0da66de2996630438d97d40d6104036ad':
2015-08-27 20:20:29 +00:00
Prem Kumar
c69e77071d
am dc30961b: am 0694de93: (-s ours) am eed361bb: Merge "Allow Contact sharing by default while connecting Car Kit." into mnc-dev
...
* commit 'dc30961b4354c9fa24bc810f10b4136068c56335':
2015-08-27 20:20:26 +00:00
Maurice Lam
b93d972442
am 98d6d7c9: am 01495108: (-s ours) am 87fadbe6: [Fingerprint] Help text for backup screen lock
...
* commit '98d6d7c9d4ec59c78fa3106d65e0805d54f8fde8':
2015-08-27 20:20:24 +00:00
Geoff Mendal
a92e7c5342
am ad6eb955: (-s ours) am a5af1375: (-s ours) am c493f042: (-s ours) Import translations. DO NOT MERGE
...
* commit 'ad6eb955e4f7f2cc7950e8f8cc0446fa6fc1060e':
2015-08-27 20:20:22 +00:00
Vinit Deshpande
319669f62e
am ac23c640: am 96ae93e4: (-s ours) am b74c0b2a: Merge "wifi: Check for the sizeof ssid to start SoftAP" into mnc-dev
...
* commit 'ac23c640b53d6353504946e76b9a004c456e0b5c':
2015-08-27 20:20:19 +00:00
Jim Miller
7989230e1f
am 6b120f32: am fe87f19b: (-s ours) am efaa19d9: Fix fingerprint enrolling bug.
...
* commit '6b120f324e19bbea4b855050c8c5f3948e913af0':
2015-08-27 20:20:17 +00:00
Maurice Lam
127bcbf35d
am d9e42d64: am e1548aba: (-s ours) am 88832a3d: Merge "[Fingerprint] Disable back in setup enrolling screen" into mnc-dev
...
* commit 'd9e42d64ea649f94a2fd756aaef7417b2f9bcca4':
2015-08-27 20:20:15 +00:00
Geoff Mendal
230eebf305
am 78ed71c6: (-s ours) am b02410c4: (-s ours) am 13cbe053: (-s ours) Import translations. DO NOT MERGE
...
* commit '78ed71c68a246d34154a03b7e5661e73dbd97e26':
2015-08-27 20:20:13 +00:00
Jeff Sharkey
a734dd52e8
am 10957201: am bf49bdf9: (-s ours) am c7e59e52: Merge "Let Settings measure transient free space." into mnc-dev
...
* commit '109572010bb3875bf4b8155743c4f00716f2cdf2':
2015-08-27 20:20:11 +00:00
Maurice Lam
348740aeec
am 605396b5: am 0074510a: (-s ours) am 997bcaa7: Merge "[Fingerprint] Advertise wake & unlock during SUW" into mnc-dev
...
* commit '605396b5429ffe6c491cb3649c95e661f02d1f52':
2015-08-27 20:20:09 +00:00
Geoff Mendal
6c6f3e0443
am 02b262d4: (-s ours) am 197cfdbd: (-s ours) am 6b0a2d21: (-s ours) Import translations. DO NOT MERGE
...
* commit '02b262d4bc1c599f32eec0d63aa60f46a24efe74':
2015-08-27 20:20:07 +00:00
