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

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

TreeHugger Robot [Tue, 22 Aug 2017 20:20:19 +0000 (20:20 +0000)]

Merge changes from topic "Read dun APNs from apn db" am: f9390ce1fb
am: b87acf6837

Change-Id: I477a4d7bc1002f01c610f232778067e3beb9c9cf

commit | commitdiff | tree

TreeHugger Robot [Tue, 22 Aug 2017 20:03:24 +0000 (20:03 +0000)]

Merge changes from topic "Read dun APNs from apn db"
am: f9390ce1fb

Change-Id: I1dd0a753bb08f7db6f36a7162b9f7f81a1c0406c

commit | commitdiff | tree

Treehugger Robot [Tue, 22 Aug 2017 19:52:21 +0000 (19:52 +0000)]

Merge changes from topic "Read dun APNs from apn db"

* changes:
  Change empty apn type in user entered APN to non-read-only types.
  Check for null mReadOnlyApnTypes.
  Disallow adding/editing dun APNs unless allowed by carrier.

commit | commitdiff | tree

TreeHugger Robot [Mon, 19 Jun 2017 23:21:12 +0000 (23:21 +0000)]

Change empty apn type in user entered APN to non-read-only types.

Test: Manually added APN and verified read-only and non-wildcardable
types are not included
Bug: 38186417

Change-Id: I07bcf1c2a950a1257446f0a7beb602fed79423b3

commit | commitdiff | tree

Amit Mahajan [Thu, 1 Jun 2017 23:39:40 +0000 (16:39 -0700)]

Check for null mReadOnlyApnTypes.

Test: none
Bug: 62247121
Change-Id: I6866bf2df8d4cb46dd75b94ab88c1e62e65ddda7

commit | commitdiff | tree

Amit Mahajan [Wed, 10 May 2017 05:31:13 +0000 (22:31 -0700)]

Disallow adding/editing dun APNs unless allowed by carrier.

Test: WIP
Bug: 38186417
Change-Id: If1cc34ad979659a56a3886da2a02fdbf642739ac

commit | commitdiff | tree

Bill Yi [Fri, 18 Aug 2017 01:45:26 +0000 (01:45 +0000)]

Import translations. DO NOT MERGE
am: 4ced4787ce -s ours

Change-Id: Ie0c11be879fc1d31d8053de2b73f578143df7d7f

commit | commitdiff | tree

Bill Yi [Thu, 17 Aug 2017 23:57:35 +0000 (16:57 -0700)]

Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64086495
Change-Id: I4e5c4860eae1b41fea7a34a88b53630d86745e8e

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:39:42 +0000 (20:39 +0000)]

Disabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155ea -s ours am: 889036189b -s ours am: 9acf640efd -s ours am: 29c1777ca5 -s ours am: 694ab09ff3 -s ours am: a92a7e400f -s ours am: cf0caf8f22 -s ours am: 3ce6d3ee87 -s ours am: 202970aa92 -s ours am: 81ba0cc873 -s ours am: 82afc6c5fd -s ours am: 23e185adf8 -s ours am: 5d4a2bb844 -s ours
am: b4678ce1d2 -s ours

Change-Id: I350b04feb64b26fddbf366cd31d42d30ef0e02aa

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:38:24 +0000 (20:38 +0000)]

Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours am: 78a9d598f1 -s ours am: 0dba51f9f0 -s ours am: 7bd8e120cb -s ours am: d22de194f5 -s ours am: de8e1f4be5 -s ours am: b2f5566de5 -s ours am: 05fec2162a -s ours am: df39274478 -s ours am: a6b4e032c8 -s ours
am: 28f6dd01bc -s ours

Change-Id: Ia95e462a6e007f0e87cfddb75b13f8ee7a89971a

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:37:36 +0000 (20:37 +0000)]

Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours am: 2e6cf5dcde -s ours am: 817c35056c -s ours am: 6d7bb4c4d0 -s ours am: 3dd026d5dc -s ours am: 142433924f -s ours
am: 0e22588ed0 -s ours

Change-Id: I8025d40c5c1b3b6992d759a7f6a5355207236dff

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:25:12 +0000 (20:25 +0000)]

Disabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155ea -s ours am: 889036189b -s ours am: 9acf640efd -s ours am: 29c1777ca5 -s ours am: 694ab09ff3 -s ours am: a92a7e400f -s ours am: cf0caf8f22 -s ours am: 3ce6d3ee87 -s ours am: 202970aa92 -s ours am: 81ba0cc873 -s ours am: 82afc6c5fd -s ours am: 23e185adf8 -s ours
am: 5d4a2bb844 -s ours

Change-Id: I949bed4c34aeea91e85eae01ffbf812e486ac5d8

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:24:28 +0000 (20:24 +0000)]

Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours am: 78a9d598f1 -s ours am: 0dba51f9f0 -s ours am: 7bd8e120cb -s ours am: d22de194f5 -s ours am: de8e1f4be5 -s ours am: b2f5566de5 -s ours am: 05fec2162a -s ours am: df39274478 -s ours
am: a6b4e032c8 -s ours

Change-Id: I141ba4edaa9fa21b95d7f8d353764db26d9a5b6a

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:23:41 +0000 (20:23 +0000)]

Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours am: 2e6cf5dcde -s ours am: 817c35056c -s ours am: 6d7bb4c4d0 -s ours am: 3dd026d5dc -s ours
am: 142433924f -s ours

Change-Id: Id62e3af77aba546d3a83a8467dc60af88fbf6083

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:22:36 +0000 (20:22 +0000)]

Disabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155ea -s ours am: 889036189b -s ours am: 9acf640efd -s ours am: 29c1777ca5 -s ours am: 694ab09ff3 -s ours am: a92a7e400f -s ours am: cf0caf8f22 -s ours am: 3ce6d3ee87 -s ours am: 202970aa92 -s ours am: 81ba0cc873 -s ours am: 82afc6c5fd -s ours
am: 23e185adf8 -s ours

Change-Id: I28fb4049f4c3a51d163cc77b60358736d082604e

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:18:15 +0000 (20:18 +0000)]

Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours am: 78a9d598f1 -s ours am: 0dba51f9f0 -s ours am: 7bd8e120cb -s ours am: d22de194f5 -s ours am: de8e1f4be5 -s ours am: b2f5566de5 -s ours am: 05fec2162a -s ours
am: df39274478 -s ours

Change-Id: I487f45dcd45eecbc587af45bdc748c842d6414d6

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:17:34 +0000 (20:17 +0000)]

Disabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155ea -s ours am: 889036189b -s ours am: 9acf640efd -s ours am: 29c1777ca5 -s ours am: 694ab09ff3 -s ours am: a92a7e400f -s ours am: cf0caf8f22 -s ours am: 3ce6d3ee87 -s ours am: 202970aa92 -s ours am: 81ba0cc873 -s ours
am: 82afc6c5fd -s ours

Change-Id: If3e96fdcd076bfe522b32726d05bef5f5a605d6a

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:17:28 +0000 (20:17 +0000)]

Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours am: 2e6cf5dcde -s ours am: 817c35056c -s ours am: 6d7bb4c4d0 -s ours
am: 3dd026d5dc -s ours

Change-Id: I55000b3f1b300a833bb643816413a83d65ebedec

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:14:42 +0000 (20:14 +0000)]

Disabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155ea -s ours am: 889036189b -s ours am: 9acf640efd -s ours am: 29c1777ca5 -s ours am: 694ab09ff3 -s ours am: a92a7e400f -s ours am: cf0caf8f22 -s ours am: 3ce6d3ee87 -s ours am: 202970aa92 -s ours
am: 81ba0cc873 -s ours

Change-Id: I53467a6c6802c65bf458afa8fd800954bc91f99b

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:10:37 +0000 (20:10 +0000)]

Disabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155ea -s ours am: 889036189b -s ours am: 9acf640efd -s ours am: 29c1777ca5 -s ours am: 694ab09ff3 -s ours am: a92a7e400f -s ours am: cf0caf8f22 -s ours am: 3ce6d3ee87 -s ours
am: 202970aa92 -s ours

Change-Id: Ic1b3450cc4d3cf70cf95b6f80e0b5fd82ff61446

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:09:35 +0000 (20:09 +0000)]

Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours am: 78a9d598f1 -s ours am: 0dba51f9f0 -s ours am: 7bd8e120cb -s ours am: d22de194f5 -s ours am: de8e1f4be5 -s ours am: b2f5566de5 -s ours
am: 05fec2162a -s ours

Change-Id: I75623b15f15658930e459710fb46cc2f55d788e8

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:08:56 +0000 (20:08 +0000)]

Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours am: 2e6cf5dcde -s ours am: 817c35056c -s ours
am: 6d7bb4c4d0 -s ours

Change-Id: I3e042c60b170bf709b0848bc2746f0cba6afbbcf

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:06:04 +0000 (20:06 +0000)]

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:04:24 +0000 (20:04 +0000)]

Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours am: 78a9d598f1 -s ours am: 0dba51f9f0 -s ours am: 7bd8e120cb -s ours am: d22de194f5 -s ours am: de8e1f4be5 -s ours
am: b2f5566de5 -s ours

Change-Id: I12e7f9916aafaadb653e85c0af3de506b3a652a7

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:03:34 +0000 (20:03 +0000)]

Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours am: 2e6cf5dcde -s ours
am: 817c35056c -s ours

Change-Id: I6ab3c67db3726cd15ca3114b0edb41d0ae248a3f

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 20:02:33 +0000 (20:02 +0000)]

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:59:04 +0000 (19:59 +0000)]

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:59:04 +0000 (19:59 +0000)]

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:55:14 +0000 (19:55 +0000)]

Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621 am: 72beaddfd4 -s ours
am: 2e6cf5dcde -s ours

Change-Id: I490c9f78edd2a1d87ba3b669ea24ac962b91cb61

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:55:02 +0000 (19:55 +0000)]

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:55:01 +0000 (19:55 +0000)]

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:51:02 +0000 (19:51 +0000)]

Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours am: 78a9d598f1 -s ours am: 0dba51f9f0 -s ours
am: 7bd8e120cb -s ours

Change-Id: I2f06097aaaa7e312a0b066e2f92536968d31003f

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:49:08 +0000 (19:49 +0000)]

Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c41 am: 1370eb3d52 am: 616c84ccb0 -s ours
am: aedf7cdfdb -s ours

Change-Id: I0a6af74c670ecfde23b1d5217f67ebccb14c0080

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:48:32 +0000 (19:48 +0000)]

Disabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155ea -s ours am: 889036189b -s ours am: 9acf640efd -s ours
am: 29c1777ca5 -s ours

Change-Id: I31830a5e46544e1f939a05482f46a03970e4b197

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:47:06 +0000 (19:47 +0000)]

Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours am: 78a9d598f1 -s ours
am: 0dba51f9f0 -s ours

Change-Id: Ife5e67db0c3866b3bae77d1d0f476bc7f30bf389

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:46:49 +0000 (19:46 +0000)]

Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece am: ccad4a3621
am: 72beaddfd4 -s ours

Change-Id: I10ef6e273e8fb369d86d01d441c1ae419fe3a5b1

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:44:31 +0000 (19:44 +0000)]

Disabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155ea -s ours am: 889036189b -s ours
am: 9acf640efd -s ours

Change-Id: I3ad55685aaddb775a1991d5251fc01aa69c3a7f0

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:43:31 +0000 (19:43 +0000)]

Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7 am: 93a9e9f7f2 -s ours
am: 78a9d598f1 -s ours

Change-Id: Id94c32bb309dfe9808b30a19fbd42334f3f9f19b

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:40:32 +0000 (19:40 +0000)]

Disabling the activate button when paused am: de5df8b090 am: 779237e37f am: 24547155ea -s ours
am: 889036189b -s ours

Change-Id: I594f94b86435f6e5f1d4f487b276ac42fef4f994

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:40:30 +0000 (19:40 +0000)]

Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c41 am: 1370eb3d52
am: 616c84ccb0 -s ours

Change-Id: Ibb6e939c0511012a567baf5df3aafdb4da9198ef

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:39:49 +0000 (19:39 +0000)]

Disabling the activate button when paused am: af5d8b9b03 am: 26f4aceece
am: ccad4a3621

Change-Id: I3cfe350f7c6f3ded761681b8f4062e32e833d94f

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:38:35 +0000 (19:38 +0000)]

Disabling the activate button when paused am: 9ffee0d534 am: d27e28eab7
am: 93a9e9f7f2 -s ours

Change-Id: If5bfd68d2a899813edb2ab550d8a2c0ed2db8d63

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:37:01 +0000 (19:37 +0000)]

Disabling the activate button when paused am: de5df8b090 am: 779237e37f
am: 24547155ea -s ours

Change-Id: Ic61623b7affc9599126b915d5a0e2a1471a58ea2

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:34:24 +0000 (19:34 +0000)]

Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d am: 1e9af33c41
am: 1370eb3d52

Change-Id: Ifd670d7a6a673b49b2b0563b81a83fda20889126

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:33:34 +0000 (19:33 +0000)]

Disabling the activate button when paused am: af5d8b9b03
am: 26f4aceece

Change-Id: If2a4dfdbe01e5bf1f2cfc6b2a61afc95f6f2addd

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:33:30 +0000 (19:33 +0000)]

Disabling the activate button when paused am: 9ffee0d534
am: d27e28eab7

Change-Id: I975f6132333510ac6b40bf9683296885bdc54f05

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:32:31 +0000 (19:32 +0000)]

Disabling the activate button when paused am: de5df8b090
am: 779237e37f

Change-Id: I43d2f39fc179380a169fb1d04be8e473eedcadfb

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:30:03 +0000 (19:30 +0000)]

Disabling the activate button when paused am: 8e08a9bb71 am: 08207f457d
am: 1e9af33c41

Change-Id: Iea61138c41fdb00ee30e0fba0d06b1d59b9c6afa

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:27:40 +0000 (19:27 +0000)]

Disabling the activate button when paused
am: 9ffee0d534

Change-Id: I76f0f749ad159b50520e6f95d9bfaf2d8cca3429

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:26:00 +0000 (19:26 +0000)]

Disabling the activate button when paused
am: af5d8b9b03

Change-Id: Icf4cd1c4ff5a520a72f9deedf85c486e892da250

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:25:59 +0000 (19:25 +0000)]

Disabling the activate button when paused am: 8e08a9bb71
am: 08207f457d

Change-Id: I693fde0d9935e0b92fa8848b205db3a810a58b67

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:25:59 +0000 (19:25 +0000)]

Disabling the activate button when paused
am: de5df8b090

Change-Id: I7878f3f3addbb0f47f3c145a34977a9ebb62a055

commit | commitdiff | tree

Suprabh Shukla [Wed, 16 Aug 2017 19:22:01 +0000 (19:22 +0000)]

Disabling the activate button when paused
am: 8e08a9bb71

Change-Id: I9b9ccd0bd849d34343ff0a6d6b579274d02264c6

commit | commitdiff | tree

Nick Desaulniers [Wed, 16 Aug 2017 18:37:21 +0000 (18:37 +0000)]

Merge "DeviceInfoSettingsTest: test parsing llvm kernel" am: 33046b4ec2 -s ours
am: f25a418e24

Change-Id: I3e1b36b906f137b9960b25c8c6de61e31f751804

commit | commitdiff | tree

Nick Desaulniers [Wed, 16 Aug 2017 18:34:27 +0000 (18:34 +0000)]

Merge "DeviceInfoSettingsTest: test parsing llvm kernel"
am: 33046b4ec2 -s ours

Change-Id: I1f83d7375246e2b84bb3a0f911dfdc5980da76f9

commit | commitdiff | tree

Treehugger Robot [Wed, 16 Aug 2017 18:00:44 +0000 (18:00 +0000)]

Merge "DeviceInfoSettingsTest: test parsing llvm kernel"

commit | commitdiff | tree

Nick Desaulniers [Sun, 30 Oct 2016 21:48:08 +0000 (14:48 -0700)]

DeviceInfoSettingsTest: test parsing llvm kernel

Adds unit test for DeviceInfoUtils.formatKernelVersion to see if it can
parse a /proc/version string from a kernel compiled with Clang/LLVM.

Bug: 32455817
Change-Id: I25123bf44f67e038e01d8c76d6eab18d5616c7c2

commit | commitdiff | tree

Suprabh Shukla [Tue, 15 Aug 2017 02:22:17 +0000 (02:22 +0000)]

Disabling the activate button when paused

This revises the previous attempt to drop taps when another window is
obscuring the device admin details. Any system alert windows or toasts
are disabled when the activity is in focus, otherwise the button is
disabled so no floating activities can obscure it and delegate taps back
to the security sensitive "Activate" button.

Bug: 35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Merged-In: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b

commit | commitdiff | tree

Suprabh Shukla [Tue, 15 Aug 2017 02:11:26 +0000 (02:11 +0000)]

commit | commitdiff | tree

Suprabh Shukla [Tue, 15 Aug 2017 03:33:12 +0000 (03:33 +0000)]

Disabling the activate button when paused

This revises the previous attempt to drop taps when another window is
obscuring the device admin details. Any system alert windows or toasts
are disabled when the activity is in focus, otherwise the button is
disabled so no floating activities can obscure it and delegate taps back
to the security sensitive "Activate" button.

Test: CtsVerifier -> Device Administration -> Device Admin Tapjacking Test

Bug: 35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Merged-In: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b

commit | commitdiff | tree

Suprabh Shukla [Tue, 15 Aug 2017 02:34:05 +0000 (02:34 +0000)]

Disabling the activate button when paused

This revises the previous attempt to drop taps when another window is
obscuring the device admin details. Any system alert windows or toasts
are disabled when the activity is in focus, otherwise the button is
disabled so no floating activities can obscure it and delegate taps back
to the security sensitive "Activate" button.

Test: CtsVerifier -> Device Administration -> Device Admin Tapjacking Test

Bug: 35056974
Change-Id: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b
Merged-In: I292a44e713ea4a4b0305ca3b3b21f1c82fd73c2b

commit | commitdiff | tree

mingliang.x.lei [Wed, 9 Aug 2017 18:36:33 +0000 (18:36 +0000)]

Merge "Fix memory leak in Bluetooth settings" am: 5a652c0286
am: 8d3bb3e2ad

Change-Id: Iebccb788115a2be1fca3144199fc3e857a11556f

commit | commitdiff | tree

mingliang.x.lei [Wed, 9 Aug 2017 18:34:07 +0000 (18:34 +0000)]

Merge "Fix memory leak in Bluetooth settings"
am: 5a652c0286

Change-Id: Ica95ac1bed6dbbc305315a32c1c9a92bb83d4574

commit | commitdiff | tree

Treehugger Robot [Wed, 9 Aug 2017 18:27:43 +0000 (18:27 +0000)]

Merge "Fix memory leak in Bluetooth settings"

commit | commitdiff | tree

Maurice Lam [Tue, 8 Aug 2017 23:05:55 +0000 (23:05 +0000)]

Merge "Show help string when onEnrollmentHelp() is called" am: 5a926705ef
am: dbfde54fb6

Change-Id: Ie98fa2d24ebe48e868762cf85129139974ce845f

commit | commitdiff | tree

Maurice Lam [Tue, 8 Aug 2017 22:56:38 +0000 (22:56 +0000)]

Merge "Show help string when onEnrollmentHelp() is called"
am: 5a926705ef

Change-Id: I5af1cac8ee4018e40005484631b6f3f3434e03b9

commit | commitdiff | tree

Maurice Lam [Tue, 8 Aug 2017 22:02:20 +0000 (22:02 +0000)]

Merge "Show help string when onEnrollmentHelp() is called"

commit | commitdiff | tree

Bill Yi [Mon, 7 Aug 2017 05:50:24 +0000 (05:50 +0000)]

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

Change-Id: Ia21b29a071f07f37bb1d3d5b348a70dd2ec7f00a

commit | commitdiff | tree

Bill Yi [Sun, 6 Aug 2017 17:38:44 +0000 (10:38 -0700)]

Import translations. DO NOT MERGE

Change-Id: Iba61a113e9577a1afa3e18880e803c65352e1a73
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Jian Zhou [Thu, 27 Jul 2017 18:24:10 +0000 (18:24 +0000)]

Merge "Settings: Fix SparseArray null pointer issue in monkey issues" am: 41b4d908bb
am: 3aee5e1ad0

Change-Id: I2b3686a91254fd6f0a1050cf8be68304a70a03f5

commit | commitdiff | tree

Ryusuke Sawa [Thu, 27 Jul 2017 18:23:51 +0000 (18:23 +0000)]

Merge "Show Error dialog when WPS is interrupted" am: fd7dec5d4a
am: b0e008841f

Change-Id: I31f65d59a105db0fc49e73c4e3d7005d0102906d

commit | commitdiff | tree

Jian Zhou [Thu, 27 Jul 2017 18:22:21 +0000 (18:22 +0000)]

Merge "Settings: Fix SparseArray null pointer issue in monkey issues"
am: 41b4d908bb

Change-Id: If3c634811506bdc9f3de5501e60f6a662ac2873a

commit | commitdiff | tree

Ryusuke Sawa [Thu, 27 Jul 2017 18:21:19 +0000 (18:21 +0000)]

Merge "Show Error dialog when WPS is interrupted"
am: fd7dec5d4a

Change-Id: I5ff4247745eba606c22481466f2b9a49e1c604d3

commit | commitdiff | tree

Treehugger Robot [Thu, 27 Jul 2017 18:16:08 +0000 (18:16 +0000)]

Merge "Settings: Fix SparseArray null pointer issue in monkey issues"

commit | commitdiff | tree

Treehugger Robot [Thu, 27 Jul 2017 18:15:35 +0000 (18:15 +0000)]

Merge "Show Error dialog when WPS is interrupted"

commit | commitdiff | tree

Ryusuke Sawa [Fri, 19 Jul 2013 05:32:19 +0000 (14:32 +0900)]

Show Error dialog when WPS is interrupted

When WPS searching is interruptd by turning Wi-Fi off,
Error dialog should be displayed.

Bug: 29883134
Test: manual - tap WPS Push Button and turn Airplane mode on

Change-Id: Ie6667c6b7d09540af21b015e0d5b991d818d2c77

commit | commitdiff | tree

Bill Yi [Thu, 27 Jul 2017 00:55:32 +0000 (00:55 +0000)]

Import translations. DO NOT MERGE am: 05185952c8 -s ours
am: 64ce525c6a -s ours

Change-Id: Ided1154cb4002792a68ddfed98dd057d7f88e620

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 23:22:33 +0000 (23:22 +0000)]

Import translations. DO NOT MERGE
am: 05185952c8 -s ours

Change-Id: I2fcf9dbc20ad0600ac924d106e5a87d49752f379

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 17:27:31 +0000 (10:27 -0700)]

Import translations. DO NOT MERGE

Change-Id: I8f49a9c6acaa689f9269aaca9f22e8b4ab4a5ae0
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 08:06:13 +0000 (08:06 +0000)]

Import translations. DO NOT MERGE
am: 8a25fb603a -s ours

Change-Id: Ic9ca03e989bf73561c4884cf168a33f64c02973f

commit | commitdiff | tree

Bill Yi [Wed, 26 Jul 2017 04:25:48 +0000 (21:25 -0700)]

Import translations. DO NOT MERGE

Change-Id: Id4aa99e287f17df735e0998f3989b38bb9170cbf
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Bill Yi [Thu, 20 Jul 2017 19:58:46 +0000 (19:58 +0000)]

Import translations. DO NOT MERGE
am: 6cf2d99816 -s ours

Change-Id: Iad277ccc5f81d14255363128d400420ca70cd376

commit | commitdiff | tree

Bill Yi [Thu, 20 Jul 2017 17:53:14 +0000 (10:53 -0700)]

Import translations. DO NOT MERGE

Change-Id: If5c18c395a4293f6c084f9019fd37a17ddfd24d9
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

commit | commitdiff | tree

Phil Weaver [Wed, 19 Jul 2017 01:18:04 +0000 (01:18 +0000)]

Merge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92 am: 54e508ca63 am: 4fc6cbfa6a -s ours
am: b019e2c469

Change-Id: I936fd8c441ed20e6616f00c603d22c4551923f27

commit | commitdiff | tree

Phil Weaver [Wed, 19 Jul 2017 01:11:09 +0000 (01:11 +0000)]

Merge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92 am: 54e508ca63
am: 4fc6cbfa6a -s ours

Change-Id: Iaa96265da8e054b791e5d4b7852b91f4a4ace7b2

commit | commitdiff | tree

Phil Weaver [Wed, 19 Jul 2017 01:00:05 +0000 (01:00 +0000)]

Merge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92
am: 54e508ca63

Change-Id: I87608a5fc71634d99adaf2aecd1e1c1be297659f

commit | commitdiff | tree

Phil Weaver [Wed, 19 Jul 2017 00:53:20 +0000 (00:53 +0000)]

Merge "Back-port ag/2491664" into nyc-mr1-dev
am: 87c77fba92

Change-Id: Ie540995d5b499a0e87bc13c11e28c4b8adab93f3

commit | commitdiff | tree

Phil Weaver [Wed, 19 Jul 2017 00:46:36 +0000 (00:46 +0000)]

Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df am: 4f8be72b18 -s ours am: 2b8694c33d am: 533c1efbc7 am: f5675a9ab0 am: 00143e1a7a am: d68bd495ec
am: 1faf81da83

Change-Id: Ie2be7683a783e125a74b8d9383317fdf156d219c

commit | commitdiff | tree

Phil Weaver [Wed, 19 Jul 2017 00:46:35 +0000 (00:46 +0000)]

Merge "Back-port ag/2491664" into nyc-mr1-dev

commit | commitdiff | tree

Phil Weaver [Wed, 19 Jul 2017 00:40:56 +0000 (00:40 +0000)]

Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df am: 4f8be72b18 -s ours am: 2b8694c33d am: 533c1efbc7 am: f5675a9ab0 am: 00143e1a7a
am: d68bd495ec

Change-Id: Ib2b14e63463ea041575e6d884cc155972264ae91

commit | commitdiff | tree

Phil Weaver [Wed, 19 Jul 2017 00:31:13 +0000 (00:31 +0000)]

Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df am: 4f8be72b18 -s ours am: 2b8694c33d am: 533c1efbc7 am: f5675a9ab0
am: 00143e1a7a

Change-Id: I08371b60dbed3351a06f49bed71aaca1f46fb864

commit | commitdiff | tree

Phil Weaver [Wed, 19 Jul 2017 00:24:40 +0000 (00:24 +0000)]

Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df am: 4f8be72b18 -s ours am: 2b8694c33d am: 533c1efbc7
am: f5675a9ab0

Change-Id: Icbc5147a6050058c78ece104f1c169673b93a373

commit | commitdiff | tree

Phil Weaver [Wed, 19 Jul 2017 00:15:50 +0000 (00:15 +0000)]

Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df am: 4f8be72b18 -s ours am: 2b8694c33d
am: 533c1efbc7

Change-Id: Ib54143b47f6c1b09d2d3c5f73630aebcc1fcba33

commit | commitdiff | tree

Phil Weaver [Wed, 19 Jul 2017 00:05:08 +0000 (00:05 +0000)]

Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df am: 4f8be72b18 -s ours
am: 2b8694c33d

Change-Id: Icef5847bf3eaf4c9fdce6eaaff1d642828f89477

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 23:58:43 +0000 (23:58 +0000)]

Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec am: f9d05230df
am: 4f8be72b18 -s ours

Change-Id: I2b510d0b70eb303fb93a68a0eee0d32bf1226d76

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 23:41:33 +0000 (23:41 +0000)]

Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e am: a801d5e8ec
am: f9d05230df

Change-Id: I63ffb648e39d06390a7f72951ad41bed0cf5aac9

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 23:35:31 +0000 (23:35 +0000)]

Merge "Back-port ag/2491664" into mnc-dev am: 7b3ca9886e
am: a801d5e8ec

Change-Id: I26fad2824208aa46dbfac0bef585729e5424c24c

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 23:29:03 +0000 (23:29 +0000)]

Merge "Back-port ag/2491664" into mnc-dev
am: 7b3ca9886e

Change-Id: Id4c50a2c37096f91accd2b2b28470c230dd655db

commit | commitdiff | tree

Phil Weaver [Tue, 18 Jul 2017 23:21:17 +0000 (23:21 +0000)]

Merge "Back-port ag/2491664" into mnc-dev

commit | commitdiff | tree

Phil Weaver [Wed, 12 Jul 2017 21:07:07 +0000 (14:07 -0700)]

Back-port ag/2491664

Bug: 62196835
Test: Verify overlays disappear on a11y capabilities
dialog.

Change-Id: Ic675012dd9faa8e53d1d4b126b3ba68fecdab992

packages/apps/Settings

RSS Atom

About OSDN

Find Software

Develop Software

Help