OSDN Git Service
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Sudheer Shanka [Tue, 12 Jul 2016 19:20:38 +0000 (19:20 +0000)]
Merge \\"DO NOT MERGE: Add pm operation to set user restrictions.\\" into lmp-mr1-dev am:
d327d73edf
am:
cb7e0643c9
Change-Id: I42d732fcc3ed8745dcc35e433e066ee8babe3e42
Sudheer Shanka [Tue, 12 Jul 2016 19:20:34 +0000 (19:20 +0000)]
Merge \\"DO NOT MERGE: Reduce shell power over user management.\\" into lmp-mr1-dev am:
f1d9152f9f
am:
177422c91e
Change-Id: I7de2c4181d5b42e505310b4639eb82719ae42c16
Sudheer Shanka [Tue, 12 Jul 2016 19:11:37 +0000 (19:11 +0000)]
Merge \"DO NOT MERGE: Add pm operation to set user restrictions.\" into lmp-mr1-dev
am:
d327d73edf
Change-Id: I131a01fb8d4ccd440a7727df2fde0ce433bc30d1
Sudheer Shanka [Tue, 12 Jul 2016 19:11:35 +0000 (19:11 +0000)]
Merge \"DO NOT MERGE: Reduce shell power over user management.\" into lmp-mr1-dev
am:
f1d9152f9f
Change-Id: I61633ebe7944d54f3da36eedaf4bab7308ff3c96
Sudheer Shanka [Tue, 12 Jul 2016 19:03:18 +0000 (19:03 +0000)]
Merge "DO NOT MERGE: Add pm operation to set user restrictions." into lmp-mr1-dev
Sudheer Shanka [Tue, 12 Jul 2016 19:03:12 +0000 (19:03 +0000)]
Merge "DO NOT MERGE: Reduce shell power over user management." into lmp-mr1-dev
Sudheer Shanka [Thu, 9 Jun 2016 00:13:24 +0000 (17:13 -0700)]
DO NOT MERGE: Reduce shell power over user management.
Remove MANAGE_USERS permission from shell and whitelist it for
some specific functionality.
Bug:
29189712
Change-Id: Ifb37448c091af91991964511e3efb1bb4dea1ff3
Sudheer Shanka [Thu, 16 Jun 2016 15:58:00 +0000 (08:58 -0700)]
DO NOT MERGE: Add pm operation to set user restrictions.
Bug:
29189712
Change-Id: I6fdb3b68dfe3f51119e5ce8008880fc7d9c793df
fionaxu [Thu, 7 Jul 2016 01:13:47 +0000 (01:13 +0000)]
DO NOT MERGE revert system api loadSafeLabel am:
863ac471cf
am:
92b8cbd472
Change-Id: Ie23b6f96b4d624469f842c8822dc78f83c2d9714
fionaxu [Thu, 7 Jul 2016 01:07:43 +0000 (01:07 +0000)]
DO NOT MERGE revert system api loadSafeLabel
am:
863ac471cf
Change-Id: I9230b78b2e1ac29cfd76db00be0c31e690566ac7
fionaxu [Thu, 30 Jun 2016 22:59:55 +0000 (15:59 -0700)]
DO NOT MERGE revert system api loadSafeLabel
Bug:
28557603
Change-Id: Ib2dd0fc19217655a4d6b49cdf49ce36dfd6577d5
fionaxu [Fri, 1 Jul 2016 22:16:10 +0000 (22:16 +0000)]
Merge \\\"DO NOT MERGE revert public api loadSafeLabel\\\" into lmp-dev am:
521efcd1e3 -s ours am:
7bd0eea999
am:
0828455ca9
Change-Id: Ie1d5e38af7c3c49eb69f61e379096b17dd004961
Chen Xu [Fri, 1 Jul 2016 22:09:39 +0000 (22:09 +0000)]
Merge \\"DO NOT MERGE revert public api loadSafeLabel\\" into lmp-dev am:
521efcd1e3 -s ours
am:
7bd0eea999
Change-Id: I4ae23825fcef45856aa8551725c38fba0dd4892a
fionaxu [Fri, 1 Jul 2016 21:59:03 +0000 (21:59 +0000)]
Merge \"DO NOT MERGE revert public api loadSafeLabel\" into lmp-dev
am:
521efcd1e3 -s ours
Change-Id: I278455eb32488b221de93acd52b64956149cad54
Chen Xu [Fri, 1 Jul 2016 21:44:05 +0000 (21:44 +0000)]
Merge "DO NOT MERGE revert public api loadSafeLabel" into lmp-dev
fionaxu [Thu, 30 Jun 2016 22:57:27 +0000 (22:57 +0000)]
DO NOT MERGE revert public api loadSafeLabel am:
f44c73abb2 am:
a0263a9909 am:
a3b851d352 -s ours am:
f52501d2d4 -s ours am:
cbb7b8c7a4
am:
c666ebef33
Change-Id: I8b40b7fbf1c6b2e9fa556c6fc31d81b98e291fdf
fionaxu [Thu, 30 Jun 2016 22:51:55 +0000 (22:51 +0000)]
DO NOT MERGE revert public api loadSafeLabel am:
f44c73abb2 am:
a0263a9909 am:
a3b851d352 -s ours am:
f52501d2d4 -s ours
am:
cbb7b8c7a4
Change-Id: Iad9b7ca53c003319a89dc3b7091bbbafb94a95dd
fionaxu [Thu, 30 Jun 2016 22:43:10 +0000 (22:43 +0000)]
DO NOT MERGE revert public api loadSafeLabel am:
f44c73abb2 am:
a0263a9909 am:
a3b851d352 -s ours
am:
f52501d2d4 -s ours
Change-Id: Ibc5076680df923f5edf2a09e4331b75604bd863f
fionaxu [Thu, 30 Jun 2016 22:37:24 +0000 (22:37 +0000)]
DO NOT MERGE revert public api loadSafeLabel am:
f44c73abb2 am:
a0263a9909
am:
a3b851d352 -s ours
Change-Id: I914f9b17db4d515a8d962abb876a2847d2fab6b3
fionaxu [Thu, 30 Jun 2016 22:31:52 +0000 (22:31 +0000)]
DO NOT MERGE revert public api loadSafeLabel am:
f44c73abb2
am:
a0263a9909
Change-Id: Iff18193574eeac7e9d0033025a4fff791ba9ccaa
fionaxu [Thu, 30 Jun 2016 22:25:47 +0000 (22:25 +0000)]
DO NOT MERGE revert public api loadSafeLabel
am:
f44c73abb2
Change-Id: If7d00ce5ba4955b3511e6bb46670c45927f9e5d2
fionaxu [Tue, 28 Jun 2016 07:43:35 +0000 (00:43 -0700)]
DO NOT MERGE revert public api loadSafeLabel
Bug:
28557603
Change-Id: I61f4939864228fb50112502044da599b9cec2430
fionaxu [Tue, 28 Jun 2016 05:52:56 +0000 (22:52 -0700)]
DO NOT MERGE revert public api loadSafeLabel
Bug:
28557603
Change-Id: Ic9d9ae0b59fe86f70aaea311380cacf222ee3a0c
Sudheer Shanka [Tue, 21 Jun 2016 22:31:11 +0000 (22:31 +0000)]
Merge \\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\" into lmp-dev am:
b43fe62933 -s ours am:
96676a2d41
am:
a9b937b29d
Change-Id: Ib0923227e223a7b3a94e4d443e6e5c308977e65b
Sudheer Shanka [Tue, 21 Jun 2016 22:31:09 +0000 (22:31 +0000)]
Merge \\\"DO NOT MERGE: Reduce shell power over user management.\\\" into lmp-dev am:
e64034a27d -s ours am:
db7e70c2f0
am:
e0cc5e20ae
Change-Id: Ia32fa9009d31f280b7f71fd8ed472913c4aa30b6
Sudheer Shanka [Tue, 21 Jun 2016 22:25:34 +0000 (22:25 +0000)]
Merge \\"DO NOT MERGE: Add pm operation to set user restrictions.\\" into lmp-dev am:
b43fe62933 -s ours
am:
96676a2d41
Change-Id: I7a4cdbe7c6ed9abd51e0b172a24b69370edcc1b1
Sudheer Shanka [Tue, 21 Jun 2016 22:25:31 +0000 (22:25 +0000)]
Merge \\"DO NOT MERGE: Reduce shell power over user management.\\" into lmp-dev am:
e64034a27d -s ours
am:
db7e70c2f0
Change-Id: I8ebc5346b9a8a38efa16f7bbd23ddaa97f3780e0
Sudheer Shanka [Tue, 21 Jun 2016 22:12:17 +0000 (22:12 +0000)]
Merge \"DO NOT MERGE: Add pm operation to set user restrictions.\" into lmp-dev
am:
b43fe62933 -s ours
Change-Id: Iad1cc5368a6617b648866cde91e51e5c0b8d68f5
Sudheer Shanka [Tue, 21 Jun 2016 22:12:15 +0000 (22:12 +0000)]
Merge \"DO NOT MERGE: Reduce shell power over user management.\" into lmp-dev
am:
e64034a27d -s ours
Change-Id: I1f1d3ae381040bf37bf23a40e6fdc17f842a13a1
Sudheer Shanka [Tue, 21 Jun 2016 22:03:14 +0000 (22:03 +0000)]
Merge "DO NOT MERGE: Add pm operation to set user restrictions." into lmp-dev
Sudheer Shanka [Tue, 21 Jun 2016 22:03:08 +0000 (22:03 +0000)]
Merge "DO NOT MERGE: Reduce shell power over user management." into lmp-dev
Sudheer Shanka [Thu, 16 Jun 2016 15:58:00 +0000 (08:58 -0700)]
DO NOT MERGE: Add pm operation to set user restrictions.
Bug:
29189712
Change-Id: I6fdb3b68dfe3f51119e5ce8008880fc7d9c793df
Sudheer Shanka [Thu, 9 Jun 2016 00:13:24 +0000 (17:13 -0700)]
DO NOT MERGE: Reduce shell power over user management.
Remove MANAGE_USERS permission from shell and whitelist it for
some specific functionality.
Bug:
29189712
Change-Id: Ifb37448c091af91991964511e3efb1bb4dea1ff3
Christopher Tate [Thu, 16 Jun 2016 22:53:29 +0000 (22:53 +0000)]
DO NOT MERGE: Don\\\\\\'t trust callers to supply app info to bindBackupAgent() am:
d85a4ed283 am:
f615799ef2 am:
6633a4fee4 -s ours am:
41821a26a5 -s ours am:
b1e31ad140
am:
918fb5d453
Change-Id: I660124fada1a86288a9bfb10308cec0e1503f62e
Christopher Tate [Thu, 16 Jun 2016 22:50:23 +0000 (22:50 +0000)]
DO NOT MERGE: Don\\\\\'t trust callers to supply app info to bindBackupAgent() am:
d85a4ed283 am:
f615799ef2 am:
6633a4fee4 -s ours am:
41821a26a5 -s ours
am:
b1e31ad140
Change-Id: I3668160c863e8fe34ca6d233d63113069fec8e5a
Christopher Tate [Thu, 16 Jun 2016 22:45:45 +0000 (22:45 +0000)]
DO NOT MERGE: Don\\\\'t trust callers to supply app info to bindBackupAgent() am:
d85a4ed283 am:
f615799ef2 am:
6633a4fee4 -s ours
am:
41821a26a5 -s ours
Change-Id: I028d0714c52079b71645197ac70a321285928fec
Christopher Tate [Thu, 16 Jun 2016 22:39:05 +0000 (22:39 +0000)]
DO NOT MERGE: Don\\\'t trust callers to supply app info to bindBackupAgent() am:
d85a4ed283 am:
f615799ef2
am:
6633a4fee4 -s ours
Change-Id: I2c10cc7ff790c84767167c76e028456ba4dcaeb3
Christopher Tate [Thu, 16 Jun 2016 22:30:17 +0000 (22:30 +0000)]
Don\\\'t trust callers to supply app info to bindBackupAgent() am:
c58054f25f am:
cd777e95a7
am:
ec6c3f7a32
Change-Id: Idc2b6c712078493b4186edad750d8d5beab58adf
Christopher Tate [Thu, 16 Jun 2016 22:27:18 +0000 (22:27 +0000)]
DO NOT MERGE: Don\\'t trust callers to supply app info to bindBackupAgent() am:
d85a4ed283
am:
f615799ef2
Change-Id: Ibc84666aa491986fe861b82400affde1675e632d
Christopher Tate [Thu, 16 Jun 2016 22:27:04 +0000 (22:27 +0000)]
Don\\'t trust callers to supply app info to bindBackupAgent() am:
c58054f25f
am:
cd777e95a7
Change-Id: I199f1354df85fcda372002887eafc1e6fb9b19d8
Christopher Tate [Thu, 16 Jun 2016 22:21:37 +0000 (22:21 +0000)]
Don\'t trust callers to supply app info to bindBackupAgent()
am:
c58054f25f
Change-Id: I3b0bd91c38b5f13770f09f39c2eea78b63c29d7c
Christopher Tate [Thu, 16 Jun 2016 22:21:25 +0000 (22:21 +0000)]
DO NOT MERGE: Don\'t trust callers to supply app info to bindBackupAgent()
am:
d85a4ed283
Change-Id: Ib1f01d4d10c82acb9f03aab4fe81d43d85d4a899
Christopher Tate [Mon, 13 Jun 2016 22:17:54 +0000 (15:17 -0700)]
Don't trust callers to supply app info to bindBackupAgent()
Get the canonical identity and metadata about the package from the
Package Manager at time of usage rather than rely on the caller to
have gotten things right, even when the caller has the system uid.
Bug
28795098
Change-Id: I215786bc894dedf7ca28e9c80cefabd0e40ca877
Christopher Tate [Sat, 11 Jun 2016 00:59:44 +0000 (17:59 -0700)]
DO NOT MERGE: Don't trust callers to supply app info to bindBackupAgent()
Get the canonical identity and metadata about the package from the
Package Manager at time of usage rather than rely on the caller to
have gotten things right, even when the caller has the system uid.
Bug
28795098
Change-Id: I62710b15bb601fdfedd68e32349168c10725eb45
fionaxu [Wed, 8 Jun 2016 17:15:39 +0000 (17:15 +0000)]
DO NOT MERGE fix build breakage on k am:
4e33c4f8b1 am:
07c994012c am:
84f479f6b5 -s ours am:
e1ca4cd074 -s ours am:
0e64d7411e
am:
eb53629bf7
Change-Id: Ie99251c23087ebe648a3450aa2a9fe881cb3c1f8
fionaxu [Wed, 8 Jun 2016 17:10:02 +0000 (17:10 +0000)]
DO NOT MERGE fix build breakage on k am:
4e33c4f8b1 am:
07c994012c am:
84f479f6b5 -s ours am:
e1ca4cd074 -s ours
am:
0e64d7411e
Change-Id: I856719a3bec69549b83507fefcd662ce54104eaf
fionaxu [Wed, 8 Jun 2016 17:04:09 +0000 (17:04 +0000)]
resolve merge conflicts of
2c53526 to lmp-mr1-dev am:
c196526f8e
am:
1e8fe12f4e
Change-Id: I3122c1d81dde1088990bcbd2aff7eea478ead4fc
fionaxu [Wed, 8 Jun 2016 16:58:26 +0000 (16:58 +0000)]
DO NOT MERGE fix build breakage on k am:
4e33c4f8b1 am:
07c994012c am:
84f479f6b5 -s ours
am:
e1ca4cd074 -s ours
Change-Id: Icbb64c652c66c55fcc6e0cf1500af2cfb99fdbb3
fionaxu [Wed, 8 Jun 2016 16:58:13 +0000 (16:58 +0000)]
resolve merge conflicts of
2c53526 to lmp-mr1-dev
am:
c196526f8e
Change-Id: Ic0f9fb749282b46d5c41fd36aaab42090ecbd0b9
fionaxu [Wed, 8 Jun 2016 01:57:12 +0000 (18:57 -0700)]
resolve merge conflicts of
2c53526 to lmp-mr1-dev
Change-Id: I4fe45fae0a98934ac9b0f6f48c8cab8546392641
fionaxu [Wed, 8 Jun 2016 02:04:12 +0000 (02:04 +0000)]
DO NOT MERGE fix build breakage on k am:
4e33c4f8b1 am:
07c994012c
am:
84f479f6b5 -s ours
Change-Id: Ia2605d430a9f3fdc1de6a59bb5702f4f65ae3816
fionaxu [Wed, 8 Jun 2016 01:59:04 +0000 (01:59 +0000)]
DO NOT MERGE fix build breakage on k am:
4e33c4f8b1
am:
07c994012c
Change-Id: Iba1b8547910292c33b9ce500fd395c95a6bc81e9
fionaxu [Wed, 8 Jun 2016 01:49:39 +0000 (01:49 +0000)]
DO NOT MERGE fix build breakage on k
am:
4e33c4f8b1
Change-Id: I0339ec14a342f6c4a8f77638ffc6d4873a368830
fionaxu [Wed, 8 Jun 2016 00:28:39 +0000 (17:28 -0700)]
DO NOT MERGE fix build breakage on k
Bug:
28557603
Change-Id: I3beae9e8cb6315654d7681d484fbb861fa8b1889
fionaxu [Tue, 7 Jun 2016 23:23:10 +0000 (23:23 +0000)]
Backport loadSafeLabel changes am:
be2865a60a am:
4c50846519
am:
9a825b0fd5
Change-Id: Ie3042058420fbd3018ae238dab4129de58ec69c8
fionaxu [Tue, 7 Jun 2016 23:20:04 +0000 (23:20 +0000)]
Backport loadSafeLabel changes am:
be2865a60a
am:
4c50846519
Change-Id: Ia31592def4d88a3a9e92a7e0c9126691c64a5fc4
fionaxu [Tue, 7 Jun 2016 23:13:08 +0000 (23:13 +0000)]
Backport loadSafeLabel changes
am:
be2865a60a
Change-Id: Ifabe996449c534c5085245c4f07e2d865a23e126
fionaxu [Fri, 3 Jun 2016 01:49:01 +0000 (18:49 -0700)]
Backport loadSafeLabel changes
Bug:
23531798
Bug:
28557603
Change-Id: Iee49f7c37d6a42fe74077bb15ed47919d351d172
Paul Jensen [Thu, 26 May 2016 14:35:08 +0000 (14:35 +0000)]
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am:
af0b4466ff am:
8940d2b0ff am:
bb27626141 am:
6c35cf2434 am:
42a5983364
am:
75095e6f02
* commit '
75095e6f02b13d070bb74b019ab6392f0f7b1105':
Don't pass URL path and username/password to PAC scripts
Change-Id: I0da4c878a1bd78837abc40a3ab332c6a1e781d3e
Paul Jensen [Thu, 26 May 2016 14:13:16 +0000 (14:13 +0000)]
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am:
af0b4466ff am:
8940d2b0ff am:
bb27626141 am:
6c35cf2434
am:
42a5983364
* commit '
42a59833648243a8ac3aec7adf7f4ca0d3babdd1':
Don't pass URL path and username/password to PAC scripts
Change-Id: Id92ff5deed707c029fc6d5806aff2a324961c2ec
Paul Jensen [Thu, 26 May 2016 14:01:19 +0000 (14:01 +0000)]
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am:
af0b4466ff am:
8940d2b0ff am:
bb27626141
am:
6c35cf2434
* commit '
6c35cf2434ca373196b16620455f8f234b63d594':
Don't pass URL path and username/password to PAC scripts
Change-Id: I9bbca312129011822fc5ea95682bac5ca4258ced
Paul Jensen [Thu, 26 May 2016 13:44:37 +0000 (13:44 +0000)]
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am:
af0b4466ff am:
8940d2b0ff
am:
bb27626141
* commit '
bb2762614181a0ee03554a96c070ea1006d7263c':
Don't pass URL path and username/password to PAC scripts
Change-Id: I9e4d3282765dec1554955b9f72484e9d7e2d6594
Paul Jensen [Thu, 26 May 2016 13:37:24 +0000 (13:37 +0000)]
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am:
af0b4466ff
am:
8940d2b0ff
* commit '
8940d2b0ff2fb5a9cc9e12be8a7959670e4390ac':
Don't pass URL path and username/password to PAC scripts
Change-Id: I03d6273d7ddaecac071ab3d1207d3d684e80159e
Paul Jensen [Thu, 26 May 2016 13:30:59 +0000 (13:30 +0000)]
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev
am:
af0b4466ff
* commit '
af0b4466ffe2ed09b288014d1d3a9ed308fe3c76':
Don't pass URL path and username/password to PAC scripts
Change-Id: I8a49a29ed1999ab811d3306dc46769d83c05244e
Paul Jensen [Thu, 26 May 2016 13:18:04 +0000 (13:18 +0000)]
Merge "Don't pass URL path and username/password to PAC scripts" into klp-dev
Christopher Tate [Wed, 25 May 2016 23:16:15 +0000 (23:16 +0000)]
DO NOT MERGE : backport of backup transport whitelist am:
647cb6a6d8 -s ours am:
077534b101
am:
4c559cdade
* commit '
4c559cdadea4b74262b40cbefe4a76a0e22ccc68':
DO NOT MERGE : backport of backup transport whitelist
Change-Id: Iff8942e506b14cb2d0e64623daea3bdc3cee2142
Christopher Tate [Wed, 25 May 2016 23:06:02 +0000 (23:06 +0000)]
DO NOT MERGE : backport of backup transport whitelist am:
647cb6a6d8 -s ours
am:
077534b101
* commit '
077534b1015762d445f505fc2f440beaa2ba974a':
DO NOT MERGE : backport of backup transport whitelist
Change-Id: I04041486cfa35b534915a25cd1d84442a59ed7bf
Christopher Tate [Wed, 25 May 2016 22:45:22 +0000 (22:45 +0000)]
DO NOT MERGE : backport of backup transport whitelist
am:
647cb6a6d8 -s ours
* commit '
647cb6a6d82e3bb22eca0e5a27810e99084e2d5b':
DO NOT MERGE : backport of backup transport whitelist
Change-Id: I08b62dc7639ecc874d4c61d737b2b4cca27da241
Christopher Tate [Fri, 20 May 2016 22:29:31 +0000 (15:29 -0700)]
DO NOT MERGE : backport of backup transport whitelist
Sysconfig define a whitelist of permitted backup transports
Previously any apk bundled in priv-app could insert a backup transport.
Reduce risk surface by giving the OEM explicit control over who is
allowed to handle backup data.
Bug
28406080
Backport of
494df791728f4d42d67e935c327910975993ad29 from N
Change-Id: I405b49daee8c576584575c3e46877cc97632d8c6
John Reck [Thu, 19 May 2016 22:37:04 +0000 (22:37 +0000)]
DO NOT MERGE Cherry pick libpng usage fixes am:
7c9f2b8aa2 am:
1b1fcbaab5 am:
5527fd1323 -s ours am:
bfa719f448 -s ours am:
1fae3b370d
am:
1da8c9baa2
* commit '
1da8c9baa2d2da49e14224d34995337c4709b1ad':
DO NOT MERGE Cherry pick libpng usage fixes
Change-Id: Ibff7c25c48909cb77ee498f0fb3030d22a3eb381
John Reck [Thu, 19 May 2016 22:32:47 +0000 (22:32 +0000)]
DO NOT MERGE Cherry pick libpng usage fixes am:
7c9f2b8aa2 am:
1b1fcbaab5 am:
5527fd1323 -s ours am:
bfa719f448 -s ours
am:
1fae3b370d
* commit '
1fae3b370dfd9536da166ef561df630cdff02b83':
DO NOT MERGE Cherry pick libpng usage fixes
Change-Id: I5015ea3a7926caf4cf2cf27feff0653507063ac3
John Reck [Thu, 19 May 2016 22:28:23 +0000 (22:28 +0000)]
DO NOT MERGE Cherry pick libpng usage fixes am:
7c9f2b8aa2 am:
1b1fcbaab5 am:
5527fd1323 -s ours
am:
bfa719f448 -s ours
* commit '
bfa719f448ab4d90368a3cdc556e515253528e17':
DO NOT MERGE Cherry pick libpng usage fixes
Change-Id: I6597a3a69b8037af401000ab0123ea6d050f58ed
John Reck [Thu, 19 May 2016 22:21:46 +0000 (22:21 +0000)]
DO NOT MERGE Cherry pick libpng usage fixes am:
7c9f2b8aa2 am:
1b1fcbaab5
am:
5527fd1323 -s ours
* commit '
5527fd1323cc1d6470576386c8298f45c3895d75':
DO NOT MERGE Cherry pick libpng usage fixes
Change-Id: I14fe8c28299ba6bb94cd51d1bc9c637be7766cbd
John Reck [Thu, 19 May 2016 22:16:42 +0000 (22:16 +0000)]
DO NOT MERGE Cherry pick libpng usage fixes am:
7c9f2b8aa2
am:
1b1fcbaab5
* commit '
1b1fcbaab5169f824e803bcd97aa848e27dbcafb':
DO NOT MERGE Cherry pick libpng usage fixes
Change-Id: I40b173cbfd5fbec21a2b194b573a246af534c315
John Reck [Thu, 19 May 2016 19:26:24 +0000 (19:26 +0000)]
DO NOT MERGE Cherry pick libpng usage fixes
am:
7c9f2b8aa2
* commit '
7c9f2b8aa2bdbbd5ee9fc6ff52161d994a10b865':
DO NOT MERGE Cherry pick libpng usage fixes
Change-Id: If3b1a86798e4f8064fc1ad912d91b1106b24739a
John Reck [Mon, 26 Aug 2013 23:53:40 +0000 (16:53 -0700)]
DO NOT MERGE Cherry pick libpng usage fixes
------------------------------------------
This is a combination of 2 commits.
The first commit's message is:
Forward compatibility fixes
Change-Id: Iaf387a10c387e5e157bb16d120a1e033b3d1a6e8
-------------------------------------------
This is the 2nd commit message:
libpng usage tweaks
Bug:
10447005
Call png_set_interlace_handling explicitly instead of relying on
implicit handling that logs warnings
Include filename when printing warnings
Change-Id: Ia343427f5522dc8ab1010f8d7017e86f389caf99
-------------------------------------------
BUG:
23265085
Paul Jensen [Fri, 15 Apr 2016 14:41:13 +0000 (10:41 -0400)]
Don't pass URL path and username/password to PAC scripts
The URL path could contain credentials that apps don't want exposed
to a potentially malicious PAC script.
Bug:
27593919
Change-Id: I4bb0362fc91f70ad47c4c7453d77d6f9a1e8eeed
Christopher Tate [Wed, 20 Apr 2016 18:37:20 +0000 (11:37 -0700)]
resolve merge conflicts of
5e380f0 to lmp-mr1-ub-dev
Change-Id: Ie8d3c154f4c98bb1c2a1954ff1dabc8f5bc20b71
Christopher Tate [Wed, 20 Apr 2016 00:05:54 +0000 (00:05 +0000)]
resolve merge conflicts of
7641889 to lmp-mr1-dev
am:
cebcde3b5a
* commit '
cebcde3b5a1e406d953629d5b4c87347921a17de':
Kill the real/isolated uid group, not the ApplicationInfo uid
Change-Id: I6e3c41c59dfe4105780ad7d6d20f9096aabd575a
Christopher Tate [Tue, 19 Apr 2016 22:51:37 +0000 (15:51 -0700)]
resolve merge conflicts of
7641889 to lmp-mr1-dev
Change-Id: Ie162907d7388d0e388ab39bcf2471d19e2ce7020
Christopher Tate [Mon, 18 Apr 2016 22:16:31 +0000 (15:16 -0700)]
Kill the real/isolated uid group, not the ApplicationInfo uid
This is a direct reimplementation in L of fixes applied to N in
these two commits:
8dc8d37c1d7d694016f1ec2b3cea5fb723567be8
e8741d23d2dd05c4cb3fed5ee6a4040ee96a60e3
Bug
19285814
Change-Id: I59bcc8f1d41c426e9da635bea9ad1d7c6756d5aa
Todd Kennedy [Mon, 11 Apr 2016 22:27:50 +0000 (22:27 +0000)]
DO NOT MERGE Fix intent filter priorities am:
60351d3 am:
3dfc6d9 am:
ca13384 -s ours am:
c2cc804 -s ours am:
620a4ed
am:
be58fe0
* commit '
be58fe035e8a852c903c3c1c397eaa980670d8f9':
DO NOT MERGE Fix intent filter priorities
Change-Id: I7cd88d627c03199ee8252862c73f88d0b6507dd9
Todd Kennedy [Mon, 11 Apr 2016 22:22:35 +0000 (22:22 +0000)]
DO NOT MERGE Fix intent filter priorities am:
60351d3 am:
3dfc6d9 am:
ca13384 -s ours am:
c2cc804 -s ours
am:
620a4ed
* commit '
620a4ed031d807c6945d531d1a98374eba369449':
DO NOT MERGE Fix intent filter priorities
Change-Id: I33b683fabecb18a08e10bfd68b9c3ec6abe35f0f
Todd Kennedy [Mon, 11 Apr 2016 22:17:20 +0000 (22:17 +0000)]
DO NOT MERGE Fix intent filter priorities am:
60351d3 am:
3dfc6d9 am:
ca13384 -s ours
am:
c2cc804 -s ours
* commit '
c2cc804407212d3431419cded89de1fd6269eaa2':
DO NOT MERGE Fix intent filter priorities
Change-Id: I60eb783f06f0eb0c09c21ea6ec0fc10340ff63c6
Todd Kennedy [Mon, 11 Apr 2016 22:12:19 +0000 (22:12 +0000)]
DO NOT MERGE Fix intent filter priorities am:
60351d3 am:
3dfc6d9
am:
ca13384 -s ours
* commit '
ca133845ef815d7cc1f036b1355130a8a867a98c':
DO NOT MERGE Fix intent filter priorities
Change-Id: I88811d2bce66e53998360909612003873e9407af
Todd Kennedy [Mon, 11 Apr 2016 22:12:09 +0000 (22:12 +0000)]
DO NOT MERGE Fix intent filter priorities am:
d6174e7 -s ours am:
ebb136c
am:
6e0aff3
* commit '
6e0aff30cfe571c117a8f20b15c3b27f3aecc7fa':
DO NOT MERGE Fix intent filter priorities
Change-Id: Icc23a9c2a4dafad3ecbf91e27647318c33b39d6a
OSDN Git Service
