git.osdn.net Git - android-x86/frameworks-base.git/log

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 18:38:07 +0000 (18:38 +0000)]

DO NOT MERGE: Fix CTS regression
am: 7a92dc9d99

Change-Id: I13605f366810c158d380b11a814da8eac3e4e213

commit | commitdiff | tree

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

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 18:32:49 +0000 (18:32 +0000)]

DO NOT MERGE: Fix CTS regression
am: 90be39c7bb

Change-Id: Ie32ddd18c9342b36b8d989ab4d715b30ff608949

commit | commitdiff | tree

Sungsoo Lim [Fri, 29 Jul 2016 18:31:07 +0000 (18:31 +0000)]

DO NOT MERGE: Fix CTS regression
am: df17644db7

Change-Id: Id9bed3c68661176a72bcb606e0fc0a026173ac22

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Paul Stewart [Wed, 20 Jul 2016 01:12:15 +0000 (01:12 +0000)]

Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am: 58555ee891 am: 2e85e2ef26 am: c92e93c47b am: bb7439d8a1
am: 0f9a968c0e

Change-Id: I5ef9b70287cd8b0beaa169f194e7011b8c354454

commit | commitdiff | tree

Paul Stewart [Wed, 20 Jul 2016 01:12:11 +0000 (01:12 +0000)]

Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f010a5b am: 700c72d01d am: 5d60d2f772
am: 6245774994

Change-Id: Ib82209c5c6b71f3c47feaa17c346f853288b0131

commit | commitdiff | tree

Paul Stewart [Wed, 20 Jul 2016 01:11:49 +0000 (01:11 +0000)]

WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 am: df93deccf9 am: 141477b103 am: e2a03026c4 am: e41e0064ee am: 701a6c1ed6
am: d78a14531e

Change-Id: Id37927594f47a5a32b05b15c8e09df0fa4ea9569

commit | commitdiff | tree

Paul Stewart [Wed, 20 Jul 2016 01:01:15 +0000 (01:01 +0000)]

WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 am: df93deccf9 am: 141477b103 am: e2a03026c4 am: e41e0064ee
am: 701a6c1ed6

Change-Id: I34acfe2e2ab1da2615f5a7107a9879e7491b0857

commit | commitdiff | tree

Paul Stewart [Wed, 20 Jul 2016 00:54:33 +0000 (00:54 +0000)]

Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am: 58555ee891 am: 2e85e2ef26 am: c92e93c47b
am: bb7439d8a1

Change-Id: I0aa11cbba826189e7e5e4e9196654c4f43157de0

commit | commitdiff | tree

Paul Stewart [Wed, 20 Jul 2016 00:54:27 +0000 (00:54 +0000)]

Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f010a5b am: 700c72d01d
am: 5d60d2f772

Change-Id: I1a0651d22571a4dec3b4b6ca97f6b62b930f1cc7

commit | commitdiff | tree

Paul Stewart [Wed, 20 Jul 2016 00:54:20 +0000 (00:54 +0000)]

WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 am: df93deccf9 am: 141477b103 am: e2a03026c4
am: e41e0064ee

Change-Id: I9582c9327b859c981cb75d6aad52bb5dd1fafe20

commit | commitdiff | tree

Paul Stewart [Wed, 20 Jul 2016 00:45:09 +0000 (00:45 +0000)]

Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am: 58555ee891 am: 2e85e2ef26
am: c92e93c47b

Change-Id: I50ca54dc65b61cb2dbb550eb964bd50938595168

commit | commitdiff | tree

Paul Stewart [Wed, 20 Jul 2016 00:45:07 +0000 (00:45 +0000)]

Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4 am: bf4f010a5b
am: 700c72d01d

Change-Id: I6fc08163a75790e15d05ab952ad4e706a1391916

commit | commitdiff | tree

Paul Stewart [Wed, 20 Jul 2016 00:45:04 +0000 (00:45 +0000)]

WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 am: df93deccf9 am: 141477b103
am: e2a03026c4

Change-Id: Iba16c43199d5ab238ce129d37519f9c5a7ba2005

commit | commitdiff | tree

Paul Stewart [Wed, 20 Jul 2016 00:37:53 +0000 (00:37 +0000)]

Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28 am: 58555ee891
am: 2e85e2ef26

Change-Id: If8a2f4e1fcbb4adf6e2ddef438781fb83de04cc3

commit | commitdiff | tree

Paul Stewart [Wed, 20 Jul 2016 00:37:50 +0000 (00:37 +0000)]

Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf am: 3fbe9280a4
am: bf4f010a5b

Change-Id: I7e57c484be20197748c40c80acd987802b43a734

commit | commitdiff | tree

Paul Stewart [Wed, 20 Jul 2016 00:37:44 +0000 (00:37 +0000)]

WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6 am: df93deccf9
am: 141477b103

Change-Id: Ie4c9d06d225a2b99ebb4411e4282ea792c67d26b

commit | commitdiff | tree

Paul Stewart [Wed, 20 Jul 2016 00:31:29 +0000 (00:31 +0000)]

Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 am: 2169197e28
am: 58555ee891

Change-Id: I1032efe65d45995a79572f669cddc5a4cf6131d9

commit | commitdiff | tree

Paul Stewart [Wed, 20 Jul 2016 00:31:22 +0000 (00:31 +0000)]

Fix string equality comparison am: 1033c6fdbc am: fdd4fe53cf
am: 3fbe9280a4

Change-Id: Ib3bea7489d319bb94a41f3c8cb0d8ec7e40b14b7

commit | commitdiff | tree

Paul Stewart [Wed, 20 Jul 2016 00:31:15 +0000 (00:31 +0000)]

WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 am: fa4bbf4ad6
am: df93deccf9

Change-Id: Iaeae846189a8f5fa38c5da988eec7879300f8ab5

commit | commitdiff | tree

Paul Stewart [Wed, 20 Jul 2016 00:25:20 +0000 (00:25 +0000)]

Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229
am: 2169197e28

Change-Id: I24f2c9f59336454aa071acca44d6aca5b44fda4a

commit | commitdiff | tree

Paul Stewart [Wed, 20 Jul 2016 00:25:17 +0000 (00:25 +0000)]

Fix string equality comparison am: 1033c6fdbc
am: fdd4fe53cf

Change-Id: Id179c734fc503abea1216e7c6057d4903a17f340

commit | commitdiff | tree

Paul Stewart [Wed, 20 Jul 2016 00:25:14 +0000 (00:25 +0000)]

WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646
am: fa4bbf4ad6

Change-Id: I3ec1ff70fdfc2fd2aabf22ad1b7b3dad27ad4674

commit | commitdiff | tree

Paul Stewart [Wed, 20 Jul 2016 00:17:49 +0000 (00:17 +0000)]

Merge changes Id25696e4,I939a12a2 into klp-dev
am: 77b5526229

Change-Id: I07fc88a342c3c6d1594832d0a05dd0734eb48424

commit | commitdiff | tree

Paul Stewart [Wed, 20 Jul 2016 00:17:47 +0000 (00:17 +0000)]

Fix string equality comparison
am: 1033c6fdbc

Change-Id: I6503cb15fdc0741b6c6c2da9ee14057265f87545

commit | commitdiff | tree

Paul Stewart [Wed, 20 Jul 2016 00:17:43 +0000 (00:17 +0000)]

WifiEnterpriseConfiguration: Do not print credentials in toString
am: cc00f4d646

Change-Id: Iece2fd19363a3524746b01cf388566363d678431

commit | commitdiff | tree

Paul Stewart [Tue, 19 Jul 2016 23:58:59 +0000 (23:58 +0000)]

Merge changes Id25696e4,I939a12a2 into klp-dev

* changes:
Fix string equality comparison
WifiEnterpriseConfiguration: Do not print credentials in toString

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 01:26:16 +0000 (01:26 +0000)]

DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6 am: 710605dccf -s ours am: 3900104379 -s ours am: 6e0cedcaf6 am: aa0ad336b6 am: 407bb6ad53 -s ours am: 3e4c8a96fa
am: a1f106b558

Change-Id: I8b67e9f8958f99adb0e07d4ad857ad8e388dfb54

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 01:18:25 +0000 (01:18 +0000)]

DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6 am: 710605dccf -s ours am: 3900104379 -s ours am: 6e0cedcaf6 am: aa0ad336b6 am: 407bb6ad53 -s ours
am: 3e4c8a96fa

Change-Id: Ieab0b4aa107ce1471d601ab65051d9ed0ec18e8a

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 01:13:53 +0000 (01:13 +0000)]

DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 9fffc56cb1 -s ours am: 1ae841f508 am: 82a7ad2b09 am: 4e192f9a04 -s ours am: d1b350ce7d
am: d8f381af5a

Change-Id: I80023836cc9fc1bda49c65d0f1cb819310fc1df3

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 01:12:12 +0000 (01:12 +0000)]

DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6 am: 710605dccf -s ours am: 3900104379 -s ours am: 6e0cedcaf6 am: aa0ad336b6
am: 407bb6ad53 -s ours

Change-Id: I461f779db4fdb5c5f9170c6bb3941c5269d980f2

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 01:08:17 +0000 (01:08 +0000)]

DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 9fffc56cb1 -s ours am: 1ae841f508 am: 82a7ad2b09 am: 4e192f9a04 -s ours
am: d1b350ce7d

Change-Id: I2dfbdb7f5b716d2795f883b333c1339c4fd6c0a3

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 01:08:02 +0000 (01:08 +0000)]

DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6 am: 710605dccf -s ours am: 3900104379 -s ours am: 6e0cedcaf6
am: aa0ad336b6

Change-Id: I58f0e3ddfb4b5e5289e0d79602747de1dfd0106b

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 01:03:18 +0000 (01:03 +0000)]

DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 3261c5f7b3 am: 57aaad8161 am: d35b114a35 -s ours am: a2044118a5
am: e8a7640503

Change-Id: I0e9a8731a75135d91103e1f3067aba2b1c90e79d

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 00:53:31 +0000 (00:53 +0000)]

DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 9fffc56cb1 -s ours am: 1ae841f508 am: 82a7ad2b09
am: 4e192f9a04 -s ours

Change-Id: I074d9e6bf5d08b760fd428eca04d4812899555b0

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 00:53:30 +0000 (00:53 +0000)]

DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6 am: 710605dccf -s ours am: 3900104379 -s ours
am: 6e0cedcaf6

Change-Id: Icd142cfe2b224c2f1c5c56175b955d9c65fbe195

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 00:53:14 +0000 (00:53 +0000)]

DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 3261c5f7b3 am: 57aaad8161 am: d35b114a35 -s ours
am: a2044118a5

Change-Id: Iacf1a129eded02dcfe14a13bbcc0b324b462ec4c

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 00:47:11 +0000 (00:47 +0000)]

DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 9fffc56cb1 -s ours am: 1ae841f508
am: 82a7ad2b09

Change-Id: Ifb48dfec4944dfcdcbb1a7d5d36a30732fa058e6

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 00:46:25 +0000 (00:46 +0000)]

DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 3261c5f7b3 am: 57aaad8161
am: d35b114a35 -s ours

Change-Id: I33b922f13d4e9cfb6fdf2764f8e202eb38162e58

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 00:45:32 +0000 (00:45 +0000)]

DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6 am: 710605dccf -s ours
am: 3900104379 -s ours

Change-Id: I552387a6fa24b4c5d913b15990bd22b117a2f0d6

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 00:40:46 +0000 (00:40 +0000)]

DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 3261c5f7b3
am: 57aaad8161

Change-Id: I18e439f3f3bcea922ecbde678a24f926a9834698

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 00:40:42 +0000 (00:40 +0000)]

DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 9fffc56cb1 -s ours
am: 1ae841f508

Change-Id: I29059c5695717a1074ac068e613cce11ad78e9ad

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 00:38:54 +0000 (00:38 +0000)]

Merge \\"DO NOT MERGE: Remove the use of JHEAD in ExifInterface\\" into mnc-dev am: f4710c174f
am: aa85bf99ee

Change-Id: Id8919b1b3375f3a760800dbb45567a6023f4f611

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 00:38:08 +0000 (00:38 +0000)]

DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 am: 3c979c6aa6
am: 710605dccf -s ours

Change-Id: I6db9dc2b6da0505dacfcb84f6370d0b2903a3737

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 00:32:38 +0000 (00:32 +0000)]

DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558
am: 3c979c6aa6

Change-Id: I1c11953ad5b8f3c14b77f1af12e572f04457a06b

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 00:32:25 +0000 (00:32 +0000)]

DO NOT MERGE: Remove the use of JHEAD in ExifInterface
am: 9fffc56cb1 -s ours

Change-Id: I97b8ce62b29aa41c0eee2a9dc7a1bb9985525c96

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 00:32:24 +0000 (00:32 +0000)]

Merge \"DO NOT MERGE: Remove the use of JHEAD in ExifInterface\" into mnc-dev
am: f4710c174f

Change-Id: Ia8168af573a5aae66b75c11a2c18fd56e8addae3

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 00:32:10 +0000 (00:32 +0000)]

DO NOT MERGE: Remove the use of JHEAD in ExifInterface
am: 3261c5f7b3

Change-Id: If30d5ca6ebdc2e81ea2206c321940a32998b5d78

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 00:23:32 +0000 (00:23 +0000)]

DO NOT MERGE: Remove the use of JHEAD in ExifInterface
am: 8dbf0b5558

Change-Id: I451adfa75a6a95decbc4e16f50319fea50edbbed

commit | commitdiff | tree

Sungsoo Lim [Tue, 19 Jul 2016 00:21:51 +0000 (00:21 +0000)]

Merge "DO NOT MERGE: Remove the use of JHEAD in ExifInterface" into mnc-dev

commit | commitdiff | tree

Sungsoo Lim [Wed, 13 Jul 2016 00:31:16 +0000 (09:31 +0900)]

DO NOT MERGE: Remove the use of JHEAD in ExifInterface

Bug: 29270469
Change-Id: I6a6c8aeab2a842ff1646316363d614851625e78f

commit | commitdiff | tree

Julia Reynolds [Fri, 15 Jul 2016 14:12:23 +0000 (14:12 +0000)]

Merge \\"Check caller\\'s uid before allowing notification policy access.\\" into mnc-dev am: 234e1c25e4
am: 8e8bb6633c

Change-Id: Ic36dbb69f0eeddd85b17579b2fc90f75349e4ca3

commit | commitdiff | tree

Julia Reynolds [Fri, 15 Jul 2016 14:06:49 +0000 (14:06 +0000)]

Merge \"Check caller\'s uid before allowing notification policy access.\" into mnc-dev
am: 234e1c25e4

Change-Id: I6724832d28362a76cd2f65432d6e805738f335fa

commit | commitdiff | tree

Julia Reynolds [Fri, 15 Jul 2016 13:59:04 +0000 (13:59 +0000)]

Merge "Check caller's uid before allowing notification policy access." into mnc-dev

commit | commitdiff | tree

Sungsoo Lim [Thu, 14 Jul 2016 07:20:07 +0000 (16:20 +0900)]

DO NOT MERGE: Remove the use of JHEAD in ExifInterface

Bug: 29270469
Change-Id: Iecc3d22375f6a79a81512419cdde31f720cef07c

commit | commitdiff | tree

Sungsoo Lim [Thu, 14 Jul 2016 07:20:07 +0000 (16:20 +0900)]

DO NOT MERGE: Remove the use of JHEAD in ExifInterface

Bug: 29270469
Change-Id: Iecc3d22375f6a79a81512419cdde31f720cef07c

commit | commitdiff | tree

Sungsoo Lim [Thu, 14 Jul 2016 07:20:07 +0000 (16:20 +0900)]

DO NOT MERGE: Remove the use of JHEAD in ExifInterface

Bug: 29270469
Change-Id: Iecc3d22375f6a79a81512419cdde31f720cef07c

commit | commitdiff | tree

Sergio Giro [Thu, 14 Jul 2016 18:15:33 +0000 (18:15 +0000)]

Add bound checks to utf16_to_utf8 am: bce11021b2
am: 008120497b

Change-Id: Ib3135f8f186b10b773592d2bcbeae398cfd2fee1

commit | commitdiff | tree

Sergio Giro [Thu, 14 Jul 2016 18:07:23 +0000 (18:07 +0000)]

Add bound checks to utf16_to_utf8
am: bce11021b2

Change-Id: Ic4995dee3763290f75b3ef623f257c71748d9d51