git.osdn.net Git - android-x86/packages-apps-Settings.git/log

(root) / android-x86 / packages-apps-Settings.git / log

Jason Monk [Thu, 22 Oct 2015 23:42:14 +0000 (23:42 +0000)]

Fix crash in Settings from uninstall am: 6e2e8e17cf am: 34d6ea560d
am: eccc9b3962

* commit 'eccc9b39626c525763e5590728f413e4d7ff8cf5':
Fix crash in Settings from uninstall

commit | commitdiff | tree

Jason Monk [Thu, 22 Oct 2015 23:37:48 +0000 (23:37 +0000)]

Fix crash in Settings from uninstall am: 6e2e8e17cf
am: 34d6ea560d

* commit '34d6ea560d3935eef6e53e93d5bb7ba1a8148965':
Fix crash in Settings from uninstall

commit | commitdiff | tree

Jason Monk [Thu, 22 Oct 2015 23:12:02 +0000 (23:12 +0000)]

Fix crash in Settings from uninstall
am: 6e2e8e17cf

* commit '6e2e8e17cfea09548067baa8b361dbc31dce385c':
Fix crash in Settings from uninstall

commit | commitdiff | tree

Jason Monk [Thu, 22 Oct 2015 22:32:08 +0000 (15:32 -0700)]

Fix crash in Settings from uninstall

Bug: 25171390
Change-Id: Idd0319a5c003ba2183264684806d2b0aaffa1d7e

commit | commitdiff | tree

Geoff Mendal [Wed, 21 Oct 2015 16:47:13 +0000 (16:47 +0000)]

Import translations. DO NOT MERGE am: a489856def  -s ours am: f3ad526200  -s ours
am: 79e81bca9c  -s ours

* commit '79e81bca9c11b35bbc4522fbe8117dc0b425ccc7':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 21 Oct 2015 14:59:01 +0000 (14:59 +0000)]

Import translations. DO NOT MERGE am: a489856def  -s ours
am: f3ad526200  -s ours

* commit 'f3ad5262003947120243736851ff5dce7ae7635a':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 21 Oct 2015 14:48:15 +0000 (14:48 +0000)]

Import translations. DO NOT MERGE
am: a489856def -s ours

* commit 'a489856def386e52f3507370f5b504841bab7a61':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 21 Oct 2015 14:05:23 +0000 (07:05 -0700)]

Import translations. DO NOT MERGE

Change-Id: Iaa4f7f7ae9707b8eccf00b17816d3f995234c8f9
Auto-generated-cl: translation import

commit | commitdiff | tree

Jason Monk [Wed, 21 Oct 2015 02:20:21 +0000 (02:20 +0000)]

Allow access to permissions, even if app has none am: 36866c8e84 am: 6fde534148
am: 47db2ba628

* commit '47db2ba62840135894cf139886c68e63a4497626':
Allow access to permissions, even if app has none

commit | commitdiff | tree

Jason Monk [Wed, 21 Oct 2015 01:46:11 +0000 (01:46 +0000)]

Allow access to permissions, even if app has none am: 36866c8e84
am: 6fde534148

* commit '6fde534148c3f93b6362d4927270f81048a6bef3':
Allow access to permissions, even if app has none

commit | commitdiff | tree

Jason Monk [Wed, 21 Oct 2015 01:43:06 +0000 (01:43 +0000)]

Allow access to permissions, even if app has none
am: 36866c8e84

* commit '36866c8e84acd26e82b072f2d39106d0e58e6a84':
Allow access to permissions, even if app has none

commit | commitdiff | tree

Jason Monk [Tue, 20 Oct 2015 23:38:58 +0000 (19:38 -0400)]

Allow access to permissions, even if app has none

Bug: 24026650
Change-Id: I171ab69ded27c1bf2c791f9673a14d56014471bb

commit | commitdiff | tree

Jeff Sharkey [Tue, 20 Oct 2015 18:34:46 +0000 (18:34 +0000)]

Merge branch 'mnc-dr-dev-plus-aosp' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Settings into mnc-dr-dev-plus-aosp

commit | commitdiff | tree

Jeff Sharkey [Tue, 20 Oct 2015 18:34:40 +0000 (18:34 +0000)]

Merge "Hide empty data usage cycles." into mnc-dr-dev am: 2fcbdb7bb6 am: 82839c8073
am: 0b07ce50a7

* commit '0b07ce50a7e3069be81214559652ad2bf2191378':
Hide empty data usage cycles.

commit | commitdiff | tree

Michael Wright [Tue, 20 Oct 2015 18:34:24 +0000 (18:34 +0000)]

Merge branch \'mnc-ub-dev\' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Settings into mnc-ub-dev
am: 98ec49dd6c

* commit '98ec49dd6c3105e342cf8e6c4fb5eb6168924b13':

commit | commitdiff | tree

Michael Wright [Tue, 20 Oct 2015 18:34:11 +0000 (18:34 +0000)]

Merge "Always show pairing dialog for device-specific keyboard." into mnc-dr-dev am: 66b6591d4c am: 6e957d6b42
am: 94a5587ed6

* commit '94a5587ed664fa2e3996534d9ccf41394a1f131e':
Always show pairing dialog for device-specific keyboard.

commit | commitdiff | tree

Jeff Sharkey [Tue, 20 Oct 2015 18:32:34 +0000 (18:32 +0000)]

Merge "Hide empty data usage cycles." into mnc-dr-dev am: 2fcbdb7bb6 am: 82839c8073
am: 0b07ce50a7

* commit '0b07ce50a7e3069be81214559652ad2bf2191378':
Hide empty data usage cycles.

commit | commitdiff | tree

Jeff Sharkey [Tue, 20 Oct 2015 18:30:09 +0000 (18:30 +0000)]

Merge "Clamp large data usage values." into mnc-dr-dev am: 29b0ea2dbf am: a8bd650e81
am: 10338550c4

* commit '10338550c42421595896377f68545df1f8a93644':
Clamp large data usage values.

commit | commitdiff | tree

Michael Wright [Tue, 20 Oct 2015 17:54:53 +0000 (17:54 +0000)]

Merge branch 'mnc-ub-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Settings into mnc-ub-dev

commit | commitdiff | tree

Michael Wright [Tue, 20 Oct 2015 17:54:46 +0000 (17:54 +0000)]

Merge "Always show pairing dialog for device-specific keyboard." into mnc-dr-dev am: 66b6591d4c
am: 6e957d6b42

* commit '6e957d6b42f8cc13e93d0ee7cfb97dea4f0c2b76':
Always show pairing dialog for device-specific keyboard.

commit | commitdiff | tree

Michael Wright [Tue, 20 Oct 2015 17:54:29 +0000 (17:54 +0000)]

commit | commitdiff | tree

Jeff Sharkey [Tue, 20 Oct 2015 17:49:25 +0000 (17:49 +0000)]

Merge "Hide empty data usage cycles." into mnc-dr-dev am: 2fcbdb7bb6
am: 82839c8073

* commit '82839c8073ff358e036c7ae54e52041e4a51738e':
Hide empty data usage cycles.

commit | commitdiff | tree

Jeff Sharkey [Tue, 20 Oct 2015 17:48:14 +0000 (17:48 +0000)]

Merge "Clamp large data usage values." into mnc-dr-dev am: 29b0ea2dbf
am: a8bd650e81

* commit 'a8bd650e810178358251e3099f949af8422d5a24':
Clamp large data usage values.

commit | commitdiff | tree

Michael Wright [Tue, 20 Oct 2015 17:35:19 +0000 (17:35 +0000)]

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.

commit | commitdiff | tree

Jeff Sharkey [Tue, 20 Oct 2015 17:33:50 +0000 (17:33 +0000)]

Merge "Hide empty data usage cycles." into mnc-dr-dev
am: 2fcbdb7bb6

* commit '2fcbdb7bb677ed06ca5e3fbe558aff77259c194c':
Hide empty data usage cycles.

commit | commitdiff | tree

Jeff Sharkey [Tue, 20 Oct 2015 17:32:47 +0000 (17:32 +0000)]

Merge "Clamp large data usage values." into mnc-dr-dev
am: 29b0ea2dbf

* commit '29b0ea2dbf8f0a31d02af8a4ce17753c9499b167':
Clamp large data usage values.

commit | commitdiff | tree

Michael Wright [Tue, 20 Oct 2015 17:23:40 +0000 (17:23 +0000)]

Merge "Always show pairing dialog for device-specific keyboard." into mnc-dr-dev

commit | commitdiff | tree

Jeff Sharkey [Tue, 20 Oct 2015 17:21:52 +0000 (17:21 +0000)]

Merge "Hide empty data usage cycles." into mnc-dr-dev

commit | commitdiff | tree

Jeff Sharkey [Tue, 20 Oct 2015 17:21:43 +0000 (17:21 +0000)]

Merge "Clamp large data usage values." into mnc-dr-dev

commit | commitdiff | tree

Geoff Mendal [Tue, 20 Oct 2015 11:59:56 +0000 (11:59 +0000)]

Import translations. DO NOT MERGE am: 3a7368e9c3  -s ours am: 6bdaffa2af  -s ours
am: 275a235437  -s ours

* commit '275a235437c3dfe4824cd1ca36aff38c81fa46fb':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Tue, 20 Oct 2015 11:56:07 +0000 (11:56 +0000)]

Import translations. DO NOT MERGE am: 3a7368e9c3  -s ours
am: 6bdaffa2af  -s ours

* commit '6bdaffa2af987725f54cae246b5ed694720213bb':
  Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Tue, 20 Oct 2015 11:52:42 +0000 (11:52 +0000)]

Import translations. DO NOT MERGE
am: 3a7368e9c3 -s ours

* commit '3a7368e9c32af8c3245c8effc98de9e75f90f27a':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Tue, 20 Oct 2015 04:22:01 +0000 (21:22 -0700)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 25001286
Change-Id: Idc0260cd6aead133bb00dc3b62ddd21009a6315c

commit | commitdiff | tree

Jason Monk [Tue, 20 Oct 2015 03:00:11 +0000 (03:00 +0000)]

Hide SIM and IMEI for wifi only devices am: 417a0500c3 am: 2a90c111ee
am: 554c3aef41

* commit '554c3aef41c089d2baf6f2f6894de14e576f6d45':
Hide SIM and IMEI for wifi only devices

commit | commitdiff | tree

Jason Monk [Tue, 20 Oct 2015 02:22:55 +0000 (02:22 +0000)]

Hide SIM and IMEI for wifi only devices am: 417a0500c3
am: 2a90c111ee

* commit '2a90c111ee994a0b8d95039b102ab280d6ce9d6b':
Hide SIM and IMEI for wifi only devices

commit | commitdiff | tree

Jason Monk [Tue, 20 Oct 2015 02:05:14 +0000 (02:05 +0000)]

Hide SIM and IMEI for wifi only devices
am: 417a0500c3

* commit '417a0500c3d7e14013751dbe62791487b033ee72':
Hide SIM and IMEI for wifi only devices

commit | commitdiff | tree

Jeff Sharkey [Tue, 20 Oct 2015 00:22:05 +0000 (17:22 -0700)]

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

commit | commitdiff | tree

Jason Monk [Mon, 19 Oct 2015 23:48:15 +0000 (19:48 -0400)]

Hide SIM and IMEI for wifi only devices

Bug: 24342670
Change-Id: Icfb7db0c1b5c6688c16248daa5e6c0443ff45392

commit | commitdiff | tree

Jeff Sharkey [Mon, 19 Oct 2015 23:41:53 +0000 (16:41 -0700)]

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

commit | commitdiff | tree

Geoff Mendal [Mon, 19 Oct 2015 14:38:55 +0000 (14:38 +0000)]

am b2568ed0: (-s ours) am 35e01bf7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 84c62dde3d -s ours

* commit 'b2568ed0d1ae4cdaabcb061b2a503fece4aaa22a':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 19 Oct 2015 14:33:34 +0000 (14:33 +0000)]

am 35e01bf7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev am: 84c62dde3d -s ours

* commit '35e01bf70f560c3651ae34968cd1082cb2dd8536':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 19 Oct 2015 14:28:59 +0000 (14:28 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
am: 84c62dde3d -s ours

* commit '84c62dde3d737e0cc194a24e76dbdac9e8c75170':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 19 Oct 2015 14:27:20 +0000 (14:27 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

commit | commitdiff | tree

Geoff Mendal [Mon, 19 Oct 2015 14:25:38 +0000 (07:25 -0700)]

Import translations. DO NOT MERGE

Change-Id: I9068be1f0479a7025a7eacfce03046cd54e3d1a8
Auto-generated-cl: translation import

commit | commitdiff | tree

Geoff Mendal [Mon, 19 Oct 2015 13:17:46 +0000 (13:17 +0000)]

am ca059bfb: (-s ours) am 51b43e12: (-s ours) am 99131cf6: (-s ours) am f191953c: (-s ours) Import translations. DO NOT MERGE am: 862568de0d -s ours

* commit 'ca059bfb439df9db2c4ee2f7d860e8a29bf0a91f':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 19 Oct 2015 13:13:08 +0000 (13:13 +0000)]

am 51b43e12: (-s ours) am 99131cf6: (-s ours) am f191953c: (-s ours) Import translations. DO NOT MERGE am: 862568de0d -s ours

* commit '51b43e1236fa70711d914d0bc117a1ac745f0172':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 19 Oct 2015 13:09:13 +0000 (13:09 +0000)]

am 99131cf6: (-s ours) am f191953c: (-s ours) Import translations. DO NOT MERGE
am: 862568de0d -s ours

* commit '862568de0d722af6f47e02b8c6fbf8efb9d6b6cc':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 19 Oct 2015 13:04:28 +0000 (13:04 +0000)]

am 99131cf6: (-s ours) am f191953c: (-s ours) Import translations. DO NOT MERGE

* commit '99131cf64253cf997d8ee6e356843e376a141846':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 19 Oct 2015 13:01:28 +0000 (13:01 +0000)]

am f191953c: (-s ours) Import translations. DO NOT MERGE

* commit 'f191953c77af3c5b78e576a430577aaf050aa5f1':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 19 Oct 2015 12:21:10 +0000 (05:21 -0700)]

Import translations. DO NOT MERGE

Change-Id: Id2b08418cad5acba5716761650814489a2a94234
Auto-generated-cl: translation import

commit | commitdiff | tree

Jason Monk [Fri, 16 Oct 2015 16:49:38 +0000 (16:49 +0000)]

am d2975f9d: am d9774c9f: am cdcba9ce: Merge "Fix crashes in Settings" into mnc-dr-dev

* commit 'd2975f9d0c12b46978c2a108961617293eeaba85':
Fix crashes in Settings

commit | commitdiff | tree

Jason Monk [Fri, 16 Oct 2015 16:45:11 +0000 (16:45 +0000)]

am d9774c9f: am cdcba9ce: Merge "Fix crashes in Settings" into mnc-dr-dev

* commit 'd9774c9f5b4b5e0c51c03795cdc1658d1388ec87':
Fix crashes in Settings

commit | commitdiff | tree

Jason Monk [Fri, 16 Oct 2015 16:41:22 +0000 (16:41 +0000)]

am cdcba9ce: Merge "Fix crashes in Settings" into mnc-dr-dev

* commit 'cdcba9ce5f44cf4cad9e308919272db4e15e9717':
Fix crashes in Settings

commit | commitdiff | tree

Jason Monk [Fri, 16 Oct 2015 16:33:56 +0000 (16:33 +0000)]

Merge "Fix crashes in Settings" into mnc-dr-dev

commit | commitdiff | tree

Jeff Sharkey [Fri, 16 Oct 2015 16:29:54 +0000 (16:29 +0000)]

am 31e2ce0e: am d36edb9f: am de005547: Merge "Bail if activity was destroyed." into mnc-dr-dev

* commit '31e2ce0ea617bfe07a5c20d3c2b0433f14531678':
Bail if activity was destroyed.

commit | commitdiff | tree

Jeff Sharkey [Fri, 16 Oct 2015 16:24:30 +0000 (16:24 +0000)]

am d36edb9f: am de005547: Merge "Bail if activity was destroyed." into mnc-dr-dev

* commit 'd36edb9f462ee430d53515e02534e20d92e7a5d0':
Bail if activity was destroyed.

commit | commitdiff | tree

Jeff Sharkey [Fri, 16 Oct 2015 16:18:41 +0000 (16:18 +0000)]

am de005547: Merge "Bail if activity was destroyed." into mnc-dr-dev

* commit 'de005547bae3799265fdad8f61720a82241f4b07':
Bail if activity was destroyed.

commit | commitdiff | tree

Jeff Sharkey [Fri, 16 Oct 2015 16:14:47 +0000 (16:14 +0000)]

Merge "Bail if activity was destroyed." into mnc-dr-dev

commit | commitdiff | tree

Jason Monk [Fri, 16 Oct 2015 14:13:53 +0000 (10:13 -0400)]

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

commit | commitdiff | tree

Amit Mahajan [Wed, 14 Oct 2015 23:49:08 +0000 (23:49 +0000)]

am f20d51f3: am 6d042a69: am 1704ca96: Merge "Change to add user_visible field to Carriers table." into mnc-dr-dev

* commit 'f20d51f3b02fafb6001e91de8b3d5a15e6222099':
Change to add user_visible field to Carriers table.

commit | commitdiff | tree

Amit Mahajan [Wed, 14 Oct 2015 23:42:33 +0000 (23:42 +0000)]

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.

commit | commitdiff | tree

Amit Mahajan [Wed, 14 Oct 2015 23:37:32 +0000 (23:37 +0000)]

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.

commit | commitdiff | tree

Amit Mahajan [Wed, 14 Oct 2015 23:33:01 +0000 (23:33 +0000)]

Merge "Change to add user_visible field to Carriers table." into mnc-dr-dev

commit | commitdiff | tree

Jeff Sharkey [Wed, 14 Oct 2015 21:45:52 +0000 (14:45 -0700)]

Bail if activity was destroyed.

Bug: 24172045
Change-Id: I723951b3478459fc70e29d25386f8d7197964e3d

commit | commitdiff | tree

Erik Kline [Wed, 14 Oct 2015 17:55:18 +0000 (17:55 +0000)]

am 453d52b6: am 51d71aa2: am 583deb52: Merge "Unconfigure the lockdown VPN if the user forgets its profile." into mnc-dr-dev

* commit '453d52b6575ebd97c7b4c962bd3a687c1c163968':
Unconfigure the lockdown VPN if the user forgets its profile.

commit | commitdiff | tree

Erik Kline [Wed, 14 Oct 2015 17:48:50 +0000 (17:48 +0000)]

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.

commit | commitdiff | tree

Erik Kline [Wed, 14 Oct 2015 17:42:15 +0000 (17:42 +0000)]

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.

commit | commitdiff | tree

Erik Kline [Wed, 14 Oct 2015 17:37:52 +0000 (17:37 +0000)]

Merge "Unconfigure the lockdown VPN if the user forgets its profile." into mnc-dr-dev

commit | commitdiff | tree

Geoff Mendal [Wed, 14 Oct 2015 14:48:36 +0000 (14:48 +0000)]

am fbcbe2a9: (-s ours) am edbd1cd2: (-s ours) am 74d90b3e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit 'fbcbe2a97acb490616955f00b9ac295d6eff0360':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 14 Oct 2015 14:43:38 +0000 (14:43 +0000)]

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

commit | commitdiff | tree

Geoff Mendal [Wed, 14 Oct 2015 14:39:30 +0000 (14:39 +0000)]

am 74d90b3e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '74d90b3e4ed301f910b8e85616e5509822b00c14':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 14 Oct 2015 14:35:49 +0000 (14:35 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

commit | commitdiff | tree

Geoff Mendal [Wed, 14 Oct 2015 14:34:20 +0000 (07:34 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ia691930a9cc7c1c69292023b397077faa42494f5
Auto-generated-cl: translation import

commit | commitdiff | tree

Geoff Mendal [Wed, 14 Oct 2015 13:12:54 +0000 (13:12 +0000)]

am 9535c47b: (-s ours) 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 '9535c47beae13a0b4e9738ab84c6f7ff649ca76d':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 14 Oct 2015 13:09:26 +0000 (13:09 +0000)]

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

commit | commitdiff | tree

Geoff Mendal [Wed, 14 Oct 2015 13:04:12 +0000 (13:04 +0000)]

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

commit | commitdiff | tree

Geoff Mendal [Wed, 14 Oct 2015 12:59:54 +0000 (12:59 +0000)]

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

commit | commitdiff | tree

Geoff Mendal [Wed, 14 Oct 2015 12:53:54 +0000 (12:53 +0000)]

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

commit | commitdiff | tree

Geoff Mendal [Wed, 14 Oct 2015 12:49:34 +0000 (12:49 +0000)]

am cec2a65a: (-s ours) am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE

* commit 'cec2a65a98161c6c69e373647f03745c59246097':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 14 Oct 2015 12:45:51 +0000 (12:45 +0000)]

am 26bb544f: (-s ours) am 46eb1857: (-s ours) Import translations. DO NOT MERGE

* commit '26bb544ff277020444b79543302b015160ead18a':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 14 Oct 2015 12:43:15 +0000 (12:43 +0000)]

am e3e4bd7f: (-s ours) am 54158bc7: (-s ours) am d1ba8f73: (-s ours) am c6d5ac0f: (-s ours) am 974dfc1f: (-s ours) Import translations. DO NOT MERGE

* commit 'e3e4bd7f32c30fa131fb84142a9c1cd05771750e':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 14 Oct 2015 12:40:45 +0000 (12:40 +0000)]

am 46eb1857: (-s ours) Import translations. DO NOT MERGE

* commit '46eb1857b6ba487d3b6e4fb449ca18b8656a51d7':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 14 Oct 2015 12:38:52 +0000 (12:38 +0000)]

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

commit | commitdiff | tree

Geoff Mendal [Wed, 14 Oct 2015 12:34:05 +0000 (12:34 +0000)]

am d1ba8f73: (-s ours) am c6d5ac0f: (-s ours) am 974dfc1f: (-s ours) Import translations. DO NOT MERGE

* commit 'd1ba8f73cebeedf4da291db868afddd34ba94092':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 14 Oct 2015 12:30:54 +0000 (05:30 -0700)]

Import translations. DO NOT MERGE

Change-Id: I8e182bafdc9327ed8097cc26294de58783112d62
Auto-generated-cl: translation import

commit | commitdiff | tree

Geoff Mendal [Wed, 14 Oct 2015 12:30:14 +0000 (12:30 +0000)]

am c6d5ac0f: (-s ours) am 974dfc1f: (-s ours) Import translations. DO NOT MERGE

* commit 'c6d5ac0fb71fdeefb5eaee8dbd83f9e34e84ba91':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 14 Oct 2015 12:23:45 +0000 (12:23 +0000)]

am 974dfc1f: (-s ours) Import translations. DO NOT MERGE

* commit '974dfc1fbd8cedae3c3ff48c35082ee7efa90a3a':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 14 Oct 2015 12:17:15 +0000 (05:17 -0700)]

Import translations. DO NOT MERGE

Change-Id: I01aed0db8e7a6e11ba4b2bd204d42bee53ccf586
Auto-generated-cl: translation import

commit | commitdiff | tree

Lorenzo Colitti [Tue, 13 Oct 2015 06:23:38 +0000 (15:23 +0900)]

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

commit | commitdiff | tree

Geoff Mendal [Tue, 13 Oct 2015 00:19:23 +0000 (00:19 +0000)]

am 56b7a690: (-s ours) am 14bd3435: (-s ours) am c16b10ea: (-s ours) Import translations. DO NOT MERGE

* commit '56b7a690d1e4ca8bf50347b72f6dc2222d326db2':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 12 Oct 2015 19:42:31 +0000 (19:42 +0000)]

am 14bd3435: (-s ours) am c16b10ea: (-s ours) Import translations. DO NOT MERGE

* commit '14bd3435f306d0ece1715c8bd32e843d0f836fdd':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 12 Oct 2015 19:36:14 +0000 (19:36 +0000)]

am c16b10ea: (-s ours) Import translations. DO NOT MERGE

* commit 'c16b10ea6bc544c3707adfada28b68c98aea5bb4':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 12 Oct 2015 19:24:07 +0000 (12:24 -0700)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Change-Id: I324bc1847519b9058a6951a6ef63e5668e9746ba

commit | commitdiff | tree

Geoff Mendal [Mon, 12 Oct 2015 14:58:21 +0000 (14:58 +0000)]

am 93c6f4fc: (-s ours) am 20625ebc: (-s ours) am 49848a63: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '93c6f4fc3a0459bad43efd02097c3f133cc0679b':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 12 Oct 2015 14:54:45 +0000 (14:54 +0000)]

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

commit | commitdiff | tree

Geoff Mendal [Mon, 12 Oct 2015 14:49:06 +0000 (14:49 +0000)]

am 49848a63: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

* commit '49848a637a341d64317b0fcb371ca695919a8cd1':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 12 Oct 2015 14:43:57 +0000 (14:43 +0000)]

Merge "Import translations. DO NOT MERGE" into mnc-dr-dev

commit | commitdiff | tree

Geoff Mendal [Mon, 12 Oct 2015 14:43:01 +0000 (07:43 -0700)]

Import translations. DO NOT MERGE

Change-Id: Ib419916b4455d3b42a8a8b2395c14dba9afcc8a3
Auto-generated-cl: translation import

commit | commitdiff | tree

Geoff Mendal [Mon, 12 Oct 2015 13:27:09 +0000 (13:27 +0000)]

am 7f15902c: (-s ours) 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 '7f15902c4bfaf2c74f7702cb68af03e9f9d08008':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Mon, 12 Oct 2015 13:22:50 +0000 (13:22 +0000)]

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

packages/apps/Settings

RSS Atom

About OSDN

Find Software

Develop Software

Help