Commit Graph

21472 Commits

Author SHA1 Message Date
Jason Monk
6fde534148 Allow access to permissions, even if app has none
am: 36866c8e84

* commit '36866c8e84acd26e82b072f2d39106d0e58e6a84':
  Allow access to permissions, even if app has none
2015-10-21 01:43:06 +00:00
Jason Monk
36866c8e84 Allow access to permissions, even if app has none
Bug: 24026650
Change-Id: I171ab69ded27c1bf2c791f9673a14d56014471bb
2015-10-20 19:38:58 -04:00
Michael Wright
6e957d6b42 Merge "Always show pairing dialog for device-specific keyboard." into mnc-dr-dev
am: 66b6591d4c

* commit '66b6591d4c14400a18573a11880db16bb26ab80a':
  Always show pairing dialog for device-specific keyboard.
2015-10-20 17:35:19 +00:00
Jeff Sharkey
82839c8073 Merge "Hide empty data usage cycles." into mnc-dr-dev
am: 2fcbdb7bb6

* commit '2fcbdb7bb677ed06ca5e3fbe558aff77259c194c':
  Hide empty data usage cycles.
2015-10-20 17:33:50 +00:00
Jeff Sharkey
a8bd650e81 Merge "Clamp large data usage values." into mnc-dr-dev
am: 29b0ea2dbf

* commit '29b0ea2dbf8f0a31d02af8a4ce17753c9499b167':
  Clamp large data usage values.
2015-10-20 17:32:47 +00:00
Michael Wright
66b6591d4c Merge "Always show pairing dialog for device-specific keyboard." into mnc-dr-dev 2015-10-20 17:23:40 +00:00
Jeff Sharkey
2fcbdb7bb6 Merge "Hide empty data usage cycles." into mnc-dr-dev 2015-10-20 17:21:52 +00:00
Jeff Sharkey
29b0ea2dbf Merge "Clamp large data usage values." into mnc-dr-dev 2015-10-20 17:21:43 +00:00
Geoff Mendal
6bdaffa2af Import translations. DO NOT MERGE
am: 3a7368e9c3  -s ours

* commit '3a7368e9c32af8c3245c8effc98de9e75f90f27a':
  Import translations. DO NOT MERGE
2015-10-20 11:52:42 +00:00
Geoff Mendal
3a7368e9c3 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 25001286
Change-Id: Idc0260cd6aead133bb00dc3b62ddd21009a6315c
2015-10-19 21:22:01 -07:00
Jason Monk
2a90c111ee Hide SIM and IMEI for wifi only devices
am: 417a0500c3

* commit '417a0500c3d7e14013751dbe62791487b033ee72':
  Hide SIM and IMEI for wifi only devices
2015-10-20 02:05:14 +00:00
Jeff Sharkey
02551ecd2e Hide empty data usage cycles.
When building list of historical data usage cycles, omit cycles
that don't contain any data usage.  A bad NITZ or NTP fix may have
caused us to record some usage in 1970 or 2038, which would have
shown all the cycles in between.  Now we hide empty cycles to keep
things clean.

Bug: 18282691
Change-Id: Ib04c95d1411400ba9967d311b59402a26d39cfe3
2015-10-19 17:28:04 -07:00
Jason Monk
417a0500c3 Hide SIM and IMEI for wifi only devices
Bug: 24342670
Change-Id: Icfb7db0c1b5c6688c16248daa5e6c0443ff45392
2015-10-19 20:02:11 -04:00
Jeff Sharkey
3105ea30d4 Clamp large data usage values.
Without clamping, they can wrap around to negative values and cause
all sorts of havok.  1TB ought to be enough for anyone: that's 3Mbps
for a solid month.

Bug: 24555152
Change-Id: If92c87f9920c3f05cd3ff2cc6630b1bbb65335b8
2015-10-19 16:41:53 -07:00
Geoff Mendal
35e01bf70f Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
am: 84c62dde3d  -s ours

* commit '84c62dde3d737e0cc194a24e76dbdac9e8c75170':
  Import translations. DO NOT MERGE
2015-10-19 14:28:59 +00:00
Geoff Mendal
84c62dde3d Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-10-19 14:27:20 +00:00
Geoff Mendal
7f62f29b24 Import translations. DO NOT MERGE
Change-Id: I9068be1f0479a7025a7eacfce03046cd54e3d1a8
Auto-generated-cl: translation import
2015-10-19 07:25:38 -07:00
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
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
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
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
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
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
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
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
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
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