PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,210 Commits 1 Branch 0 Tags
b2bf53703095b2fd5eadfcd677b3dbb51a75cb17
Commit Graph

22210 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
51b43e1236 am 99131cf6: (-s ours) am f191953c: (-s ours) Import translations. DO NOT MERGE 
am: 862568de0d  -s ours

* commit '862568de0d722af6f47e02b8c6fbf8efb9d6b6cc':
  Import translations. DO NOT MERGE
 2015-10-19 13:09:13 +00:00
Geoff Mendal
862568de0d am 99131cf6: (-s ours) am f191953c: (-s ours) Import translations. DO NOT MERGE 
* commit '99131cf64253cf997d8ee6e356843e376a141846':
  Import translations. DO NOT MERGE
 2015-10-19 13:04:28 +00:00
Geoff Mendal
99131cf642 am f191953c: (-s ours) Import translations. DO NOT MERGE 
* commit 'f191953c77af3c5b78e576a430577aaf050aa5f1':
  Import translations. DO NOT MERGE
 2015-10-19 13:01:28 +00:00
Geoff Mendal
f191953c77 Import translations. DO NOT MERGE 
Change-Id: Id2b08418cad5acba5716761650814489a2a94234
Auto-generated-cl: translation import
 2015-10-19 05:21:10 -07:00
Jason Monk
d2975f9d0c am d9774c9f: am cdcba9ce: Merge "Fix crashes in Settings" into mnc-dr-dev 
* commit 'd9774c9f5b4b5e0c51c03795cdc1658d1388ec87':
  Fix crashes in Settings
 2015-10-16 16:45:11 +00:00
Jason Monk
d9774c9f5b am cdcba9ce: Merge "Fix crashes in Settings" into mnc-dr-dev 
* commit 'cdcba9ce5f44cf4cad9e308919272db4e15e9717':
  Fix crashes in Settings
 2015-10-16 16:41:22 +00:00
Jason Monk
cdcba9ce5f Merge "Fix crashes in Settings" into mnc-dr-dev 2015-10-16 16:33:56 +00:00
Jeff Sharkey
31e2ce0ea6 am d36edb9f: am de005547: Merge "Bail if activity was destroyed." into mnc-dr-dev 
* commit 'd36edb9f462ee430d53515e02534e20d92e7a5d0':
  Bail if activity was destroyed.
 2015-10-16 16:24:30 +00:00
Jeff Sharkey
d36edb9f46 am de005547: Merge "Bail if activity was destroyed." into mnc-dr-dev 
* commit 'de005547bae3799265fdad8f61720a82241f4b07':
  Bail if activity was destroyed.
 2015-10-16 16:18:41 +00:00
Jeff Sharkey
de005547ba Merge "Bail if activity was destroyed." into mnc-dr-dev 2015-10-16 16:14:47 +00:00
Jason Monk
77b11fa470 Fix crashes in Settings 
Fix problems from unsupported intents being launched through adb.
Remove the ones we can, fix the other.

Bug: 19634064
Change-Id: Iba0adeb135e76ee70365e5891380ba8b55110c26
 2015-10-16 10:13:53 -04:00
Amit Mahajan
f20d51f3b0 am 6d042a69: am 1704ca96: Merge "Change to add user_visible field to Carriers table." into mnc-dr-dev 
* commit '6d042a69aa23db5a50c429e7fcda9dc3327f880d':
  Change to add user_visible field to Carriers table.
 2015-10-14 23:42:33 +00:00
Amit Mahajan
6d042a69aa am 1704ca96: Merge "Change to add user_visible field to Carriers table." into mnc-dr-dev 
* commit '1704ca968d4566218f159817625f849c1dc34d96':
  Change to add user_visible field to Carriers table.
 2015-10-14 23:37:32 +00:00
Amit Mahajan
1704ca968d Merge "Change to add user_visible field to Carriers table." into mnc-dr-dev 2015-10-14 23:33:01 +00:00
Jeff Sharkey
cabb62faf3 Bail if activity was destroyed. 
Bug: 24172045
Change-Id: I723951b3478459fc70e29d25386f8d7197964e3d
 2015-10-14 14:45:52 -07:00
Erik Kline
453d52b657 am 51d71aa2: am 583deb52: Merge "Unconfigure the lockdown VPN if the user forgets its profile." into mnc-dr-dev 
* commit '51d71aa2bf1f84fffda6b4144520e9a3bad25985':
  Unconfigure the lockdown VPN if the user forgets its profile.
 2015-10-14 17:48:50 +00:00
Erik Kline
51d71aa2bf am 583deb52: Merge "Unconfigure the lockdown VPN if the user forgets its profile." into mnc-dr-dev 
* commit '583deb524b2d6ed2fd2741c605d5ae02c5c5d52a':
  Unconfigure the lockdown VPN if the user forgets its profile.
 2015-10-14 17:42:15 +00:00
Erik Kline
583deb524b Merge "Unconfigure the lockdown VPN if the user forgets its profile." into mnc-dr-dev 2015-10-14 17:37:52 +00:00
Geoff Mendal
fbcbe2a97a am edbd1cd2: (-s ours) am 74d90b3e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit 'edbd1cd28a64887279179b69f0a51c05a61212f4':
  Import translations. DO NOT MERGE
 2015-10-14 14:43:38 +00:00
Geoff Mendal
edbd1cd28a am 74d90b3e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '74d90b3e4ed301f910b8e85616e5509822b00c14':
  Import translations. DO NOT MERGE
 2015-10-14 14:39:30 +00:00
Geoff Mendal
74d90b3e4e Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-10-14 14:35:49 +00:00
Geoff Mendal
d71db4f50c Import translations. DO NOT MERGE 
Change-Id: Ia691930a9cc7c1c69292023b397077faa42494f5
Auto-generated-cl: translation import
 2015-10-14 07:34:20 -07:00
Geoff Mendal
9535c47bea am 107baf55: (-s ours) am 0884f09a: (-s ours) am 67b0ffc8: (-s ours) am 8b6b589d: (-s ours) am cec2a65a: (-s ours) am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE 
* commit '107baf5504d938828b5212eb1bbb06e36945ae49':
  Import translations. DO NOT MERGE
 2015-10-14 13:09:26 +00:00
Geoff Mendal
107baf5504 am 0884f09a: (-s ours) am 67b0ffc8: (-s ours) am 8b6b589d: (-s ours) am cec2a65a: (-s ours) am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE 
* commit '0884f09acf51b2187abc5ec038590726f6923b29':
  Import translations. DO NOT MERGE
 2015-10-14 13:04:12 +00:00
Geoff Mendal
0884f09acf am 67b0ffc8: (-s ours) am 8b6b589d: (-s ours) am cec2a65a: (-s ours) am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE 
* commit '67b0ffc88ba0c7effc2f89fb457042bc471b3b98':
  Import translations. DO NOT MERGE
 2015-10-14 12:59:54 +00:00
Geoff Mendal
67b0ffc88b am 8b6b589d: (-s ours) am cec2a65a: (-s ours) am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE 
* commit '8b6b589dbd43bd30c7a52ad5503a0c6c5beb09b2':
  Import translations. DO NOT MERGE
 2015-10-14 12:53:54 +00:00
Geoff Mendal
8b6b589dbd am cec2a65a: (-s ours) am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE 
* commit 'cec2a65a98161c6c69e373647f03745c59246097':
  Import translations. DO NOT MERGE
 2015-10-14 12:49:34 +00:00
Geoff Mendal
cec2a65a98 am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE 
* commit '26bb544ff277020444b79543302b015160ead18a':
  Import translations. DO NOT MERGE
 2015-10-14 12:45:51 +00:00
Geoff Mendal
26bb544ff2 am 46eb1857: (-s ours) Import translations. DO NOT MERGE 
* commit '46eb1857b6ba487d3b6e4fb449ca18b8656a51d7':
  Import translations. DO NOT MERGE
 2015-10-14 12:40:45 +00:00
Geoff Mendal
e3e4bd7f32 am 54158bc7: (-s ours) am d1ba8f73: (-s ours) am c6d5ac0f: (-s ours) am 974dfc1f: (-s ours) Import translations. DO NOT MERGE 
* commit '54158bc74debbe76637077cb354d910cfcf8ef01':
  Import translations. DO NOT MERGE
 2015-10-14 12:38:52 +00:00
Geoff Mendal
54158bc74d am d1ba8f73: (-s ours) am c6d5ac0f: (-s ours) am 974dfc1f: (-s ours) Import translations. DO NOT MERGE 
* commit 'd1ba8f73cebeedf4da291db868afddd34ba94092':
  Import translations. DO NOT MERGE
 2015-10-14 12:34:05 +00:00
Geoff Mendal
46eb1857b6 Import translations. DO NOT MERGE 
Change-Id: I8e182bafdc9327ed8097cc26294de58783112d62
Auto-generated-cl: translation import
 2015-10-14 05:30:54 -07:00
Geoff Mendal
d1ba8f73ce am c6d5ac0f: (-s ours) am 974dfc1f: (-s ours) Import translations. DO NOT MERGE 
* commit 'c6d5ac0fb71fdeefb5eaee8dbd83f9e34e84ba91':
  Import translations. DO NOT MERGE
 2015-10-14 12:30:14 +00:00
Geoff Mendal
c6d5ac0fb7 am 974dfc1f: (-s ours) Import translations. DO NOT MERGE 
* commit '974dfc1fbd8cedae3c3ff48c35082ee7efa90a3a':
  Import translations. DO NOT MERGE
 2015-10-14 12:23:45 +00:00
Geoff Mendal
974dfc1fbd Import translations. DO NOT MERGE 
Change-Id: I01aed0db8e7a6e11ba4b2bd204d42bee53ccf586
Auto-generated-cl: translation import
 2015-10-14 05:17:15 -07:00
Lorenzo Colitti
c311c94af5 Unconfigure the lockdown VPN if the user forgets its profile. 
Currently, if the user clicks "forget" on the configuration
dialog for the profile that is currently being used by the
always-on VPN, we don't disable the lockdown VPN, and we crash
on next boot because ConnectivityService tries to start
LockdownVpnTracker with an invalid configuration.

Fix this by removing the LOCKDOWN_VPN variable in the keystore
(which disables the always-on VPN), and notifying
ConnectivityService.

Bug: 23625458
Change-Id: I3545286c9fc23517306aa94607a4b2cb55cc56c4
 2015-10-13 15:23:38 +09:00
Geoff Mendal
56b7a690d1 am 14bd3435: (-s ours) am c16b10ea: (-s ours) Import translations. DO NOT MERGE 
* commit '14bd3435f306d0ece1715c8bd32e843d0f836fdd':
  Import translations. DO NOT MERGE
 2015-10-12 19:42:31 +00:00
Geoff Mendal
14bd3435f3 am c16b10ea: (-s ours) Import translations. DO NOT MERGE 
* commit 'c16b10ea6bc544c3707adfada28b68c98aea5bb4':
  Import translations. DO NOT MERGE
 2015-10-12 19:36:14 +00:00
Geoff Mendal
c16b10ea6b Import translations. DO NOT MERGE 
Auto-generated-cl: translation import

Change-Id: I324bc1847519b9058a6951a6ef63e5668e9746ba
 2015-10-12 19:28:03 +00:00
Geoff Mendal
93c6f4fc3a am 20625ebc: (-s ours) am 49848a63: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '20625ebc5ba22b7b0d9a38a79a9a70e12143f6e2':
  Import translations. DO NOT MERGE
 2015-10-12 14:54:45 +00:00
Geoff Mendal
20625ebc5b am 49848a63: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '49848a637a341d64317b0fcb371ca695919a8cd1':
  Import translations. DO NOT MERGE
 2015-10-12 14:49:06 +00:00
Geoff Mendal
49848a637a Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-10-12 14:43:57 +00:00
Geoff Mendal
0ec2f9f6be Import translations. DO NOT MERGE 
Change-Id: Ib419916b4455d3b42a8a8b2395c14dba9afcc8a3
Auto-generated-cl: translation import
 2015-10-12 07:43:01 -07:00
Geoff Mendal
7f15902c4b am f999d572: (-s ours) am c123f953: (-s ours) am 4accfd0b: (-s ours) am 1bd19dd1: (-s ours) am 0e3ffe7c: (-s ours) am 5fa0a93d: (-s ours) am 4fedc0fd: (-s ours) Import translations. DO NOT MERGE 
* commit 'f999d57278db3c12ce0911d83781978f657f8ede':
  Import translations. DO NOT MERGE
 2015-10-12 13:22:50 +00:00
Geoff Mendal
f999d57278 am c123f953: (-s ours) am 4accfd0b: (-s ours) am 1bd19dd1: (-s ours) am 0e3ffe7c: (-s ours) am 5fa0a93d: (-s ours) am 4fedc0fd: (-s ours) Import translations. DO NOT MERGE 
* commit 'c123f953007aefb7297b399eb03397d1a7406593':
  Import translations. DO NOT MERGE
 2015-10-12 13:17:48 +00:00
Geoff Mendal
c123f95300 am 4accfd0b: (-s ours) am 1bd19dd1: (-s ours) am 0e3ffe7c: (-s ours) am 5fa0a93d: (-s ours) am 4fedc0fd: (-s ours) Import translations. DO NOT MERGE 
* commit '4accfd0b121d2b258bca301b16f62c1ac760d89c':
  Import translations. DO NOT MERGE
 2015-10-12 13:14:14 +00:00
Geoff Mendal
4accfd0b12 am 1bd19dd1: (-s ours) am 0e3ffe7c: (-s ours) am 5fa0a93d: (-s ours) am 4fedc0fd: (-s ours) Import translations. DO NOT MERGE 
* commit '1bd19dd17e2038df6c374ca6ed48498de4dde730':
  Import translations. DO NOT MERGE
 2015-10-12 13:11:42 +00:00
Geoff Mendal
1bd19dd17e am 0e3ffe7c: (-s ours) am 5fa0a93d: (-s ours) am 4fedc0fd: (-s ours) Import translations. DO NOT MERGE 
* commit '0e3ffe7cce1ceeac9eeac839d41db40ba983f97d':
  Import translations. DO NOT MERGE
 2015-10-12 13:04:48 +00:00
Geoff Mendal
0e3ffe7cce am 5fa0a93d: (-s ours) am 4fedc0fd: (-s ours) Import translations. DO NOT MERGE 
* commit '5fa0a93d3ed1ad838fd43a41f4df9703ae206345':
  Import translations. DO NOT MERGE
 2015-10-12 13:00:56 +00:00
Geoff Mendal
5fa0a93d3e am 4fedc0fd: (-s ours) Import translations. DO NOT MERGE 
* commit '4fedc0fdaf6a372c5607c4b8c6667cf4b85d7202':
  Import translations. DO NOT MERGE
 2015-10-12 12:55:33 +00:00