OSDN Git Service
Jim Miller [Fri, 19 Aug 2016 20:16:37 +0000 (20:16 +0000)]
Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev am:
02e9affa42
am:
ddf70b9195
Change-Id: I8308733be4ac586377b0545057dbf982875e4da5
Jim Miller [Fri, 19 Aug 2016 20:16:34 +0000 (20:16 +0000)]
Bind fingerprint when we start authentication - DO NOT MERGE am:
b6f4b48df2
am:
9f04985991
Change-Id: Iff24a78b5a4b4de9b866105fbce2a181125b771e
Jim Miller [Fri, 19 Aug 2016 20:09:43 +0000 (20:09 +0000)]
Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev
am:
02e9affa42
Change-Id: I2da2738345bc63e1f40f8f9d6e8215b770cc93b4
Jim Miller [Fri, 19 Aug 2016 20:09:41 +0000 (20:09 +0000)]
Bind fingerprint when we start authentication - DO NOT MERGE
am:
b6f4b48df2
Change-Id: Ib70a6f9f82eef19724f6dd83fdefec59a29d0cab
TreeHugger Robot [Fri, 19 Aug 2016 20:03:46 +0000 (20:03 +0000)]
Merge "Bind fingerprint when we start authentication - DO NOT MERGE" into mnc-dr-dev
Sudheer Shanka [Fri, 19 Aug 2016 17:54:21 +0000 (17:54 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am:
b51e98becb am:
7e890c8eb5
am:
08eb52f9f9
Change-Id: Ica347f4059b4fbe8f822a963b47df0cbe7c646ba
Amith Yamasani [Fri, 19 Aug 2016 17:54:19 +0000 (17:54 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
d1eeb5b7b4 am:
29ae7b1a27
am:
39c7879365
Change-Id: I36e3a9a580c73dc61b5de35740bc4d7206a6e0b7
Sudheer Shanka [Fri, 19 Aug 2016 17:32:47 +0000 (17:32 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev am:
b51e98becb
am:
7e890c8eb5
Change-Id: I53be9e220d21f4322f930f3ee9095d8fa43ef2d6
Amith Yamasani [Fri, 19 Aug 2016 17:32:44 +0000 (17:32 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch am:
d1eeb5b7b4
am:
29ae7b1a27
Change-Id: Ia37f8295ee5843412cf4045764b469ee48608f07
Sudheer Shanka [Fri, 19 Aug 2016 17:22:29 +0000 (17:22 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev
am:
b51e98becb
Change-Id: I16fab19d30345e14076fda71d1d821539ceb70d2
Amith Yamasani [Fri, 19 Aug 2016 17:22:25 +0000 (17:22 +0000)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch
am:
d1eeb5b7b4
Change-Id: I2d4df3c6f766c38b78af5598bbd15e40a88381ff
Sudheer Shanka [Fri, 19 Aug 2016 17:06:53 +0000 (17:06 +0000)]
Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into mnc-dev
Jim Miller [Fri, 19 Aug 2016 03:22:33 +0000 (20:22 -0700)]
Bind fingerprint when we start authentication - DO NOT MERGE
This fixes a bug where it was possible to authenticate the wrong user.
We now bind the userId when we start authentication and confirm it when
authentication completes.
Fixes bug
30744668
Change-Id: I346d92c301414ed81e11fa9c171584c7ae4341c2
Jim Miller [Wed, 17 Aug 2016 23:15:43 +0000 (23:15 +0000)]
Fix vulnerability in LockSettings service am:
2d71384a13 am:
485fbda04c
am:
229de7088e
Change-Id: I8e9d946f96933c1338261d8adf80156cb67d3ba1
Jim Miller [Wed, 17 Aug 2016 23:07:46 +0000 (23:07 +0000)]
Fix vulnerability in LockSettings service am:
2d71384a13
am:
485fbda04c
Change-Id: I07def32199ecdbbb32aa6ecaca20724cfc81265c
Jim Miller [Wed, 17 Aug 2016 22:59:27 +0000 (22:59 +0000)]
Fix vulnerability in LockSettings service
am:
2d71384a13
Change-Id: I62ca5fb150022fe0971329294b1063957f397248
Jim Miller [Wed, 10 Aug 2016 22:43:17 +0000 (15:43 -0700)]
Fix vulnerability in LockSettings service
Fixes bug
30003944
Change-Id: I8700d4424c6186c8d5e71d2fdede0223ad86904d
Julius D'souza [Mon, 15 Aug 2016 19:25:33 +0000 (19:25 +0000)]
DO NOT MERGE ANYWHERE: Make slow brightness display ramp rate configurable.
am:
13edf0a70b -s ours
Change-Id: I7c02cea3ea0008f3f112063b6a06d08049c4998b
Julius D'souza [Fri, 5 Aug 2016 21:34:38 +0000 (14:34 -0700)]
DO NOT MERGE ANYWHERE: Make slow brightness display ramp rate configurable.
Add overlay setting with current default value.
Bug:
30085530
Change-Id: Ib5d2448b88cfb66a97febcdf06e2118c84b16cd0
Amith Yamasani [Fri, 5 Aug 2016 22:25:03 +0000 (15:25 -0700)]
DO NOT MERGE: Clean up when recycling a pid with a pending launch
Fix for accidental launch of a broadcast receiver in an
incorrect app instance.
Bug:
30202481
Change-Id: I8ec8f19c633f3aec8da084dab5fd5b312443336f
Chris Tate [Wed, 10 Aug 2016 17:44:52 +0000 (17:44 +0000)]
Merge "DO NOT MERGE: Backport N backup/restore stability work to M" into mnc-dr-dev am:
72933c623c
am:
a8e21860af
Change-Id: I20921b9aa611838bc88fcabe1dc619de0bd9f6c1
Christopher Tate [Wed, 10 Aug 2016 17:44:50 +0000 (17:44 +0000)]
DO NOT MERGE: Backport N backup/restore stability work to M am:
d6f3a11107
am:
aac7d0442c
Change-Id: Ida93e1782221df18b2e7abcaa9da319e5ed28325
Chris Tate [Wed, 10 Aug 2016 17:28:30 +0000 (17:28 +0000)]
Merge "DO NOT MERGE: Backport N backup/restore stability work to M" into mnc-dr-dev
am:
72933c623c
Change-Id: I2efd8b43c279c4cbd92130a08df6e3eafcb20b2c
Christopher Tate [Wed, 10 Aug 2016 17:28:28 +0000 (17:28 +0000)]
DO NOT MERGE: Backport N backup/restore stability work to M
am:
d6f3a11107
Change-Id: Ibd6e1be57f129d9ea89c8a44332da830944cf2b1
Chris Tate [Wed, 10 Aug 2016 17:15:26 +0000 (17:15 +0000)]
Merge "DO NOT MERGE: Backport N backup/restore stability work to M" into mnc-dr-dev
Christopher Tate [Fri, 29 Jul 2016 23:01:31 +0000 (16:01 -0700)]
DO NOT MERGE: Backport N backup/restore stability work to M
This is a squashed rollup of backup/restore infrastructural work in
the N release. It intentionally omits semantic/API changes such
as the introduction of the onQuotaExceeded() callback.
This patchset should not be merged beyond M maintenance releases.
Bug
29617908
Bug
29848715
Change-Id: I1eb25ad07f3bbf1132198d8a233722c41f1ac4cc
Prashant Malani [Wed, 3 Aug 2016 23:01:50 +0000 (23:01 +0000)]
DO NOT MERGE ANYWHERE: Make display brightness ramp rate fast configurable
am:
61038ddb61 -s ours
Change-Id: Id9a09514011ddf7c15106e22e06d24079e3cdb31
Prashant Malani [Tue, 29 Mar 2016 23:32:37 +0000 (16:32 -0700)]
DO NOT MERGE ANYWHERE: Make display brightness ramp rate fast configurable
Add an overlay setting, and keep the default to its existing value of
200.
Bug:
26552257
Change-Id: Ifd29d80e28e57c5cfc640d519a62144ab5e963fa
Sungsoo Lim [Sat, 30 Jul 2016 08:11:04 +0000 (08:11 +0000)]
Merge \\\\\\\"DO NOT MERGE: Fix CTS regression\\\\\\\" into lmp-dev am:
124cc534f8 -s ours am:
3d58e326d9 am:
8ef8e2b648 am:
ec986ac944 -s ours am:
cc154342aa am:
ee0c3b013a
am:
0d05028ba8
Change-Id: Ia66f61ac4d53b2908b6a468375346c21c61c2d5a
Sungsoo Lim [Sat, 30 Jul 2016 07:42:35 +0000 (07:42 +0000)]
Merge \\\\\\"DO NOT MERGE: Fix CTS regression\\\\\\" into lmp-dev am:
124cc534f8 -s ours am:
3d58e326d9 am:
8ef8e2b648 am:
ec986ac944 -s ours am:
cc154342aa
am:
ee0c3b013a
Change-Id: Ic5f0abe33b51bd085a990c1d48d5c7c9eb5af8fe
Sungsoo Lim [Sat, 30 Jul 2016 07:23:37 +0000 (07:23 +0000)]
DO NOT MERGE: Fix CTS regression am:
edc9238514 -s ours am:
0fb1075d95 am:
f928b8062c am:
1fcc472b3e -s ours am:
1559998d08 am:
c3485668ad
am:
174f17bc19
Change-Id: Id47b0c1771b9fb85b874b9d7b8892d31506a842b
Sungsoo Lim [Sat, 30 Jul 2016 07:14:33 +0000 (07:14 +0000)]
Merge \\\\\"DO NOT MERGE: Fix CTS regression\\\\\" into lmp-dev am:
124cc534f8 -s ours am:
3d58e326d9 am:
8ef8e2b648 am:
ec986ac944 -s ours
am:
cc154342aa
Change-Id: Ic1bc071d11c42771d46ad1b2da9e9264299d5e7b
Sungsoo Lim [Sat, 30 Jul 2016 07:13:57 +0000 (07:13 +0000)]
DO NOT MERGE: Fix CTS regression am:
edc9238514 -s ours am:
0fb1075d95 am:
f928b8062c am:
1fcc472b3e -s ours am:
1559998d08
am:
c3485668ad
Change-Id: Ieaf58a651f3bd15ee49d81fea3f118331e908cd7
Sungsoo Lim [Sat, 30 Jul 2016 06:55:41 +0000 (06:55 +0000)]
DO NOT MERGE: Fix CTS regression am:
edc9238514 -s ours am:
0fb1075d95 am:
f928b8062c am:
1fcc472b3e -s ours
am:
1559998d08
Change-Id: Iececea055821da36f2aa7870e1c2fc04ac58e22c
Sudheer Shanka [Sat, 30 Jul 2016 06:43:27 +0000 (06:43 +0000)]
Merge \\\\\\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\\\\\\" into lmp-mr1-dev am:
dbbdb6d089 am:
9ed6bd83ff am:
28acd0fae9 -s ours am:
98ae56902e am:
382f9aadcd
am:
9457779aa4
Change-Id: Ib123df6f044bb7a5323235a4aafe69b04865acfa
Sudheer Shanka [Sat, 30 Jul 2016 06:43:25 +0000 (06:43 +0000)]
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am:
7ef684713e am:
9f6bd40108 am:
f01ee1c291 -s ours am:
373492b076 am:
c2178ed1d9
am:
32f4f1a697
Change-Id: I89358f925d063a311f208c92ae7b34f9dcffad8b
Sungsoo Lim [Sat, 30 Jul 2016 06:41:37 +0000 (06:41 +0000)]
Merge \\\\"DO NOT MERGE: Fix CTS regression\\\\" into lmp-dev am:
124cc534f8 -s ours am:
3d58e326d9 am:
8ef8e2b648
am:
ec986ac944 -s ours
Change-Id: I66ddeab0f0f2fa3d3f3fff71a20cd0b842c2f9d6
Sungsoo Lim [Sat, 30 Jul 2016 06:41:33 +0000 (06:41 +0000)]
DO NOT MERGE: Fix CTS regression am:
edc9238514 -s ours am:
0fb1075d95 am:
f928b8062c
am:
1fcc472b3e -s ours
Change-Id: Icf6055101947c23621ed320469c475dd105dd60f
Sudheer Shanka [Sat, 30 Jul 2016 06:31:19 +0000 (06:31 +0000)]
Merge \\\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\\\" into mnc-dev am:
e140322bde am:
088e081ac1
am:
72f9d1ff97
Change-Id: I71b12632934b7ac1284929e276a6a462509ab969
Sudheer Shanka [Sat, 30 Jul 2016 06:31:16 +0000 (06:31 +0000)]
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am:
8a8d7e7962 am:
2349d0dea5
am:
7559673a6d
Change-Id: I874a78978c631ed3060fcac1547b261537045d8c
Sudheer Shanka [Sat, 30 Jul 2016 06:30:14 +0000 (06:30 +0000)]
Merge \\\\\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\\\\\" into lmp-mr1-dev am:
dbbdb6d089 am:
9ed6bd83ff am:
28acd0fae9 -s ours am:
98ae56902e
am:
382f9aadcd
Change-Id: I8a40d4f562110009f0e155c370e09daea6cafe79
Sudheer Shanka [Sat, 30 Jul 2016 06:30:10 +0000 (06:30 +0000)]
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am:
7ef684713e am:
9f6bd40108 am:
f01ee1c291 -s ours am:
373492b076
am:
c2178ed1d9
Change-Id: Ibcbf12ee9bb11c76c46a3d0db5aad81e8462a9f6
Sudheer Shanka [Sat, 30 Jul 2016 06:21:06 +0000 (06:21 +0000)]
Merge \\\\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\\\\" into lmp-mr1-dev am:
dbbdb6d089 am:
9ed6bd83ff am:
28acd0fae9 -s ours
am:
98ae56902e
Change-Id: I5fb6decba8be97f68a0b24d6caa5d718929ea4d3
Sudheer Shanka [Sat, 30 Jul 2016 06:21:04 +0000 (06:21 +0000)]
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am:
7ef684713e am:
9f6bd40108 am:
f01ee1c291 -s ours
am:
373492b076
Change-Id: Ibfc86e4b13fcc88c09b7ac74a7b0ddc4bd42dda7
Sudheer Shanka [Sat, 30 Jul 2016 06:19:25 +0000 (06:19 +0000)]
Merge \\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\\" into mnc-dev am:
e140322bde
am:
088e081ac1
Change-Id: Ia0621eda31e392aa381f401bf05782201a4037a0
Sudheer Shanka [Sat, 30 Jul 2016 06:19:20 +0000 (06:19 +0000)]
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am:
8a8d7e7962
am:
2349d0dea5
Change-Id: Id099c53df0a4a7c6996e546dfe6017b375f6d34e
Sungsoo Lim [Sat, 30 Jul 2016 05:57:16 +0000 (05:57 +0000)]
Merge \\\"DO NOT MERGE: Fix CTS regression\\\" into lmp-dev am:
124cc534f8 -s ours am:
3d58e326d9
am:
8ef8e2b648
Change-Id: I245e257deb8febb49f2abd7322eb3a24db564b31
Sungsoo Lim [Sat, 30 Jul 2016 05:57:09 +0000 (05:57 +0000)]
DO NOT MERGE: Fix CTS regression am:
edc9238514 -s ours am:
0fb1075d95
am:
f928b8062c
Change-Id: I92c4e992dc23f43851a9fab8479db408a89f5e89
Sungsoo Lim [Sat, 30 Jul 2016 05:40:55 +0000 (05:40 +0000)]
Merge \\"DO NOT MERGE: Fix CTS regression\\" into lmp-dev am:
124cc534f8 -s ours
am:
3d58e326d9
Change-Id: Ic642286098aeeafe379c7f71b6a98da61fb31a21
Sungsoo Lim [Sat, 30 Jul 2016 05:40:52 +0000 (05:40 +0000)]
DO NOT MERGE: Fix CTS regression am:
edc9238514 -s ours
am:
0fb1075d95
Change-Id: I1a019156b580ec594afbb866bb7aec342de8e636
Sudheer Shanka [Sat, 30 Jul 2016 05:26:52 +0000 (05:26 +0000)]
Merge \"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\" into mnc-dev
am:
e140322bde
Change-Id: Idc3caa0c20f5d069ad6166f69d858ce8f6c99302
Sudheer Shanka [Sat, 30 Jul 2016 05:26:51 +0000 (05:26 +0000)]
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.
am:
8a8d7e7962
Change-Id: Id3a971b538618801f97abe0bd1d03d11d2b8118c
Sudheer Shanka [Sat, 30 Jul 2016 05:19:02 +0000 (05:19 +0000)]
Merge \\\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\\\" into lmp-mr1-dev am:
dbbdb6d089 am:
9ed6bd83ff
am:
28acd0fae9 -s ours
Change-Id: Ifc5732a29b101a9b85a4fd14ff6d0a59d778217c
Sudheer Shanka [Sat, 30 Jul 2016 05:18:59 +0000 (05:18 +0000)]
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am:
7ef684713e am:
9f6bd40108
am:
f01ee1c291 -s ours
Change-Id: I9bf603d8e6315552d8d00036aa67dc96e9ba678a
Sudheer Shanka [Sat, 30 Jul 2016 05:08:39 +0000 (05:08 +0000)]
Merge \\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\\" into lmp-mr1-dev am:
dbbdb6d089
am:
9ed6bd83ff
Change-Id: I4f3bac4ecfc819dcca55a5bc725060b63c1b80ea
Sudheer Shanka [Sat, 30 Jul 2016 05:08:35 +0000 (05:08 +0000)]
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles. am:
7ef684713e
am:
9f6bd40108
Change-Id: Id8afe281abcf8e9b07d7a92daacf922952273573
Sudheer Shanka [Sat, 30 Jul 2016 04:54:27 +0000 (04:54 +0000)]
Merge \"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\" into lmp-mr1-dev
am:
dbbdb6d089
Change-Id: I53e854c96f9bf68855ea949a640c4701e0b2ba5e
Sudheer Shanka [Sat, 30 Jul 2016 04:54:25 +0000 (04:54 +0000)]
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.
am:
7ef684713e
Change-Id: I0a9fa6126709e9cf3d3be7653f48503613d10f27
Sungsoo Lim [Sat, 30 Jul 2016 04:44:18 +0000 (04:44 +0000)]
Merge \"DO NOT MERGE: Fix CTS regression\" into lmp-dev
am:
124cc534f8 -s ours
Change-Id: I960e31d55b6c47df345457afbd505c50afeebcfa
Sungsoo Lim [Sat, 30 Jul 2016 04:44:16 +0000 (04:44 +0000)]
DO NOT MERGE: Fix CTS regression
am:
edc9238514 -s ours
Change-Id: If11ad6b402e48aebcce8afc6d5f6093bde539a6e
Sungsoo Lim [Fri, 29 Jul 2016 23:18:51 +0000 (23:18 +0000)]
Merge "DO NOT MERGE: Fix CTS regression" into lmp-dev
Sudheer Shanka [Fri, 29 Jul 2016 21:50:37 +0000 (21:50 +0000)]
Merge "DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles." into mnc-dev
Sudheer Shanka [Fri, 29 Jul 2016 21:50:32 +0000 (21:50 +0000)]
Merge "DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles." into lmp-mr1-dev
Sungsoo Lim [Fri, 29 Jul 2016 20:10:28 +0000 (20:10 +0000)]
DO NOT MERGE: Fix CTS regression am:
df17644db7 am:
057b548171 am:
f645010092 -s ours am:
6489d870d7 -s ours am:
2dbb64594a am:
b6a3e8ce8e am:
b8d3dd2472 -s ours am:
e0316fc7a8 am:
bfdf9592d0
am:
59cb7ab7b8
Change-Id: I166f91e72d1da65610d0f7d697dd70ddb9cfe96a
Sungsoo Lim [Fri, 29 Jul 2016 19:52:34 +0000 (19:52 +0000)]
DO NOT MERGE: Fix CTS regression am:
df17644db7 am:
057b548171 am:
f645010092 -s ours am:
6489d870d7 -s ours am:
2dbb64594a am:
b6a3e8ce8e am:
b8d3dd2472 -s ours am:
e0316fc7a8
am:
bfdf9592d0
Change-Id: I2ceb67ac584b8fe681ffcb812ebff2f8d7ae721e
Sungsoo Lim [Fri, 29 Jul 2016 19:48:00 +0000 (19:48 +0000)]
DO NOT MERGE: Fix CTS regression am:
df17644db7 am:
057b548171 am:
f645010092 -s ours am:
6489d870d7 -s ours am:
2dbb64594a am:
b6a3e8ce8e am:
b8d3dd2472 -s ours
am:
e0316fc7a8
Change-Id: I0047256a9e88bedc24389de46c0e9f92430fe607
Sungsoo Lim [Fri, 29 Jul 2016 19:46:13 +0000 (19:46 +0000)]
DO NOT MERGE: Fix CTS regression am:
7a92dc9d99 am:
14abf736c8 am:
2df9864b54 -s ours am:
0bbdc37b60 am:
25782fae9b
am:
dd2ec80035
Change-Id: I27b22faf8d6ad4bba039a1eca699bd4163c2ad6a
Sungsoo Lim [Fri, 29 Jul 2016 19:35:54 +0000 (19:35 +0000)]
DO NOT MERGE: Fix CTS regression am:
df17644db7 am:
057b548171 am:
f645010092 -s ours am:
6489d870d7 -s ours am:
2dbb64594a am:
b6a3e8ce8e
am:
b8d3dd2472 -s ours
Change-Id: I3875a28849df618a392a88480271bf1ac8ef776e
Sungsoo Lim [Fri, 29 Jul 2016 19:24:37 +0000 (19:24 +0000)]
DO NOT MERGE: Fix CTS regression am:
7a92dc9d99 am:
14abf736c8 am:
2df9864b54 -s ours am:
0bbdc37b60
am:
25782fae9b
Change-Id: I9fe008924b75ac7d348e0aa8c478f859a4ed743b
Sungsoo Lim [Fri, 29 Jul 2016 19:14:02 +0000 (19:14 +0000)]
DO NOT MERGE: Fix CTS regression am:
df17644db7 am:
057b548171 am:
f645010092 -s ours am:
6489d870d7 -s ours am:
2dbb64594a
am:
b6a3e8ce8e
Change-Id: I51997dc68fc55e523050b4e642cdc4a22cd60f09
Sungsoo Lim [Fri, 29 Jul 2016 19:03:14 +0000 (19:03 +0000)]
DO NOT MERGE: Fix CTS regression am:
df17644db7 am:
057b548171 am:
f645010092 -s ours am:
6489d870d7 -s ours
am:
2dbb64594a
Change-Id: I04df61df1a926dbfe42d22127bdd4baabe7235d4
Sungsoo Lim [Fri, 29 Jul 2016 19:02:55 +0000 (19:02 +0000)]
DO NOT MERGE: Fix CTS regression am:
7a92dc9d99 am:
14abf736c8 am:
2df9864b54 -s ours
am:
0bbdc37b60
Change-Id: If4f25ea9d5a921fb264d67137fc0af05d84e614e
Sungsoo Lim [Fri, 29 Jul 2016 19:02:43 +0000 (19:02 +0000)]
DO NOT MERGE: Fix CTS regression am:
90be39c7bb am:
db9f504522
am:
b04c428935
Change-Id: I5781e7822d050426288bbd42faafff31f098aa99
Sungsoo Lim [Fri, 29 Jul 2016 18:56:25 +0000 (18:56 +0000)]
DO NOT MERGE: Fix CTS regression am:
7a92dc9d99 am:
14abf736c8
am:
2df9864b54 -s ours
Change-Id: Ie0bc2aab0856dc6fae328571f5bc5938b43f9f49
Sungsoo Lim [Fri, 29 Jul 2016 18:56:07 +0000 (18:56 +0000)]
DO NOT MERGE: Fix CTS regression am:
df17644db7 am:
057b548171 am:
f645010092 -s ours
am:
6489d870d7 -s ours
Change-Id: I2631c56fbb3d7130b5389ed232c1a2fe0859b053
Sungsoo Lim [Fri, 29 Jul 2016 18:50:29 +0000 (18:50 +0000)]
DO NOT MERGE: Fix CTS regression am:
90be39c7bb
am:
db9f504522
Change-Id: I83a02495ec4116d2bc2001325037f5864bb92c9a
Sungsoo Lim [Fri, 29 Jul 2016 18:50:25 +0000 (18:50 +0000)]
DO NOT MERGE: Fix CTS regression am:
7a92dc9d99
am:
14abf736c8
Change-Id: I2a35f4853aa450ccc68862c166b6139ce67a1aad
Sungsoo Lim [Fri, 29 Jul 2016 18:45:45 +0000 (18:45 +0000)]
DO NOT MERGE: Fix CTS regression am:
df17644db7 am:
057b548171
am:
f645010092 -s ours
Change-Id: Iad2f1d1a445e4891892f03294fed028b71f94368
Sungsoo Lim [Fri, 29 Jul 2016 18:38:07 +0000 (18:38 +0000)]
DO NOT MERGE: Fix CTS regression
am:
7a92dc9d99
Change-Id: I13605f366810c158d380b11a814da8eac3e4e213
Sungsoo Lim [Fri, 29 Jul 2016 18:38:06 +0000 (18:38 +0000)]
DO NOT MERGE: Fix CTS regression am:
df17644db7
am:
057b548171
Change-Id: I0ac1fec4b64a09dc8ee12986d8d91b39e511d989
Sungsoo Lim [Fri, 29 Jul 2016 18:32:49 +0000 (18:32 +0000)]
DO NOT MERGE: Fix CTS regression
am:
90be39c7bb
Change-Id: Ie32ddd18c9342b36b8d989ab4d715b30ff608949
Sungsoo Lim [Fri, 29 Jul 2016 18:31:07 +0000 (18:31 +0000)]
DO NOT MERGE: Fix CTS regression
am:
df17644db7
Change-Id: Id9bed3c68661176a72bcb606e0fc0a026173ac22
Sudheer Shanka [Fri, 29 Jul 2016 17:50:10 +0000 (10:50 -0700)]
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.
Bug:
29189712
Bug:
30317026
Bug:
30235113
Change-Id: Icced9805a56675e86f894c458c4a5a0048fd54c0
Sudheer Shanka [Fri, 29 Jul 2016 17:50:10 +0000 (10:50 -0700)]
DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.
Bug:
29189712
Bug:
30317026
Bug:
30235113
Change-Id: Icced9805a56675e86f894c458c4a5a0048fd54c0
Sungsoo Lim [Mon, 25 Jul 2016 02:53:13 +0000 (11:53 +0900)]
DO NOT MERGE: Fix CTS regression
Bug:
30297223, Bug:
30437363
Change-Id: I7b18af40e4eac2713577204428fbfb96cc346582
Sungsoo Lim [Mon, 25 Jul 2016 02:53:13 +0000 (11:53 +0900)]
DO NOT MERGE: Fix CTS regression
Bug:
30297223, Bug:
30437363
Change-Id: I7b18af40e4eac2713577204428fbfb96cc346582
Sungsoo Lim [Mon, 25 Jul 2016 02:53:13 +0000 (11:53 +0900)]
DO NOT MERGE: Fix CTS regression
Bug:
30297223, Bug:
30437363
Change-Id: I7b18af40e4eac2713577204428fbfb96cc346582
Sungsoo Lim [Mon, 25 Jul 2016 02:53:13 +0000 (11:53 +0900)]
DO NOT MERGE: Fix CTS regression
Bug:
30297223, Bug:
30437363
Change-Id: I7b18af40e4eac2713577204428fbfb96cc346582
Benjamin Franz [Thu, 21 Jul 2016 10:14:59 +0000 (10:14 +0000)]
Merge \\\"DO NOT MERGE Block the user from entering safe boot mode\\\" into mnc-dev am:
3e582390b3 am:
7abd7ba093
am:
87534f4ac9
Change-Id: I05e37f474e496b41c39b7a160418d9f48a265fa3
Benjamin Franz [Thu, 21 Jul 2016 10:10:03 +0000 (10:10 +0000)]
Merge \\"DO NOT MERGE Block the user from entering safe boot mode\\" into mnc-dev am:
3e582390b3
am:
7abd7ba093
Change-Id: I8dd5c0934f135cd567ae6bf2f4edf759ed757dfe
Benjamin Franz [Thu, 21 Jul 2016 10:05:33 +0000 (10:05 +0000)]
Merge \"DO NOT MERGE Block the user from entering safe boot mode\" into mnc-dev
am:
3e582390b3
Change-Id: Ibb90e151746d405e1cc8a1eb889ffa91aca35bc8
Benjamin Franz [Thu, 21 Jul 2016 09:59:41 +0000 (09:59 +0000)]
Merge "DO NOT MERGE Block the user from entering safe boot mode" into mnc-dev
Paul Stewart [Wed, 20 Jul 2016 01:35:14 +0000 (01:35 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28 am:
58555ee891 am:
2e85e2ef26 am:
c92e93c47b am:
bb7439d8a1 am:
0f9a968c0e am:
1e9889d5ac am:
a09b6ee165
am:
2331eefef7
Change-Id: Ia0cccdca5f4e44ad4caf75240240eec73757e22b
Paul Stewart [Wed, 20 Jul 2016 01:35:10 +0000 (01:35 +0000)]
Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf am:
3fbe9280a4 am:
bf4f010a5b am:
700c72d01d am:
5d60d2f772 am:
6245774994 am:
f8d4c187a3 am:
b3ff6b4437
am:
537535c14a
Change-Id: I0f9c27f32518f9c7bb1d3735741843178fc1dc02
Paul Stewart [Wed, 20 Jul 2016 01:28:54 +0000 (01:28 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28 am:
58555ee891 am:
2e85e2ef26 am:
c92e93c47b am:
bb7439d8a1 am:
0f9a968c0e am:
1e9889d5ac
am:
a09b6ee165
Change-Id: I63a60f729f95f273bf1918689626ac83771c73ac
Paul Stewart [Wed, 20 Jul 2016 01:28:52 +0000 (01:28 +0000)]
Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf am:
3fbe9280a4 am:
bf4f010a5b am:
700c72d01d am:
5d60d2f772 am:
6245774994 am:
f8d4c187a3
am:
b3ff6b4437
Change-Id: I51e07e2ab6b3bee89dada0b6bf1ce1bf52f78d2f
Paul Stewart [Wed, 20 Jul 2016 01:28:32 +0000 (01:28 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646 am:
fa4bbf4ad6 am:
df93deccf9 am:
141477b103 am:
e2a03026c4 am:
e41e0064ee am:
701a6c1ed6 am:
d78a14531e am:
c77f18b2a3
am:
eef477c8b9
Change-Id: I38649e47184a6b34a923037922fb6743f14fb6e1
Paul Stewart [Wed, 20 Jul 2016 01:20:08 +0000 (01:20 +0000)]
WifiEnterpriseConfiguration: Do not print credentials in toString am:
cc00f4d646 am:
fa4bbf4ad6 am:
df93deccf9 am:
141477b103 am:
e2a03026c4 am:
e41e0064ee am:
701a6c1ed6 am:
d78a14531e
am:
c77f18b2a3
Change-Id: Id93c8ac53a78931c8fdba21b7c168e38a7ad7fe4
Paul Stewart [Wed, 20 Jul 2016 01:19:50 +0000 (01:19 +0000)]
Merge changes Id25696e4,I939a12a2 into klp-dev am:
77b5526229 am:
2169197e28 am:
58555ee891 am:
2e85e2ef26 am:
c92e93c47b am:
bb7439d8a1 am:
0f9a968c0e
am:
1e9889d5ac
Change-Id: Ie0bfc4653bfe90335952110b38be2eeee418f98f
Paul Stewart [Wed, 20 Jul 2016 01:19:46 +0000 (01:19 +0000)]
Fix string equality comparison am:
1033c6fdbc am:
fdd4fe53cf am:
3fbe9280a4 am:
bf4f010a5b am:
700c72d01d am:
5d60d2f772 am:
6245774994
am:
f8d4c187a3
Change-Id: If6d30364da0246233415bc15a1dda7c297f7bf6b