OSDN Git Service
Sudheer Shanka [Tue, 21 Jun 2016 22:19:09 +0000 (22:19 +0000)]
Merge \\"Add pm operation to set user restrictions.\\" into mnc-dev am:
144b3a42cc
am:
f43aa2e837
Change-Id: Ic6c3cf2871105e5f81bbd30ee30311b5d5a535a6
Sudheer Shanka [Tue, 21 Jun 2016 22:19:05 +0000 (22:19 +0000)]
Merge \\"Reduce shell power over user management.\\" into mnc-dev am:
964500fd43
am:
9bfa0ad22f
Change-Id: I952f6a12be0c1edc6027ccce785d47d7f84757ef
Sudheer Shanka [Tue, 21 Jun 2016 22:11:47 +0000 (22:11 +0000)]
Merge \"Add pm operation to set user restrictions.\" into mnc-dev
am:
144b3a42cc
Change-Id: I1de4650ef53751654145a3ad1c40390711414341
Sudheer Shanka [Tue, 21 Jun 2016 22:11:44 +0000 (22:11 +0000)]
Merge \"Reduce shell power over user management.\" into mnc-dev
am:
964500fd43
Change-Id: I3531a208b4e2bd603bde2afcbee9589bf2f712d9
Sudheer Shanka [Tue, 21 Jun 2016 22:03:09 +0000 (22:03 +0000)]
Merge "Add pm operation to set user restrictions." into mnc-dev
Sudheer Shanka [Tue, 21 Jun 2016 22:03:04 +0000 (22:03 +0000)]
Merge "Reduce shell power over user management." into mnc-dev
Hall Liu [Mon, 20 Jun 2016 21:21:25 +0000 (21:21 +0000)]
Merge \\"DO NOT MERGE Disable app pinning when emergency call button pressed\\" into mnc-dev am:
fc32ec1aef
am:
aeba34533c
Change-Id: Id2da5c1dcf1477c5ee71e1ecb25ccfbc92aed7bc
Hall Liu [Mon, 20 Jun 2016 21:15:42 +0000 (21:15 +0000)]
Merge \"DO NOT MERGE Disable app pinning when emergency call button pressed\" into mnc-dev
am:
fc32ec1aef
Change-Id: I04ff0004a9112cfbe7e61b2fa6cb3fd4f037bbd0
Hall Liu [Mon, 20 Jun 2016 21:04:41 +0000 (21:04 +0000)]
Merge "DO NOT MERGE Disable app pinning when emergency call button pressed" into mnc-dev
Sudheer Shanka [Thu, 16 Jun 2016 15:58:00 +0000 (08:58 -0700)]
Add pm operation to set user restrictions.
Bug:
29189712
Change-Id: I6fdb3b68dfe3f51119e5ce8008880fc7d9c793df
Christopher Tate [Fri, 17 Jun 2016 00:31:08 +0000 (00:31 +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 am:
2149ebeadf -s ours am:
c61f35ed9a
am:
34fb87b519
Change-Id: If7444547d0bd82f43bb05439977e536a01589b3c
Christopher Tate [Fri, 17 Jun 2016 00:22:07 +0000 (00:22 +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 am:
2149ebeadf -s ours
am:
c61f35ed9a
Change-Id: Ied60b535ef69385c369110045ea755ebe9b0b94e
Christopher Tate [Fri, 17 Jun 2016 00:18:48 +0000 (00:18 +0000)]
resolve merge conflicts of
cffb19c to mnc-dev am:
3f9ea2d386
am:
d6c1126fab
Change-Id: I0414a137b1aab218fa57f291dbf2f7a1519bd973
Christopher Tate [Fri, 17 Jun 2016 00:15:14 +0000 (00:15 +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
am:
2149ebeadf -s ours
Change-Id: I42300992feac56eb94ab71e160da5fa8fc04929a
Christopher Tate [Fri, 17 Jun 2016 00:15:07 +0000 (00:15 +0000)]
resolve merge conflicts of
cffb19c to mnc-dev
am:
3f9ea2d386
Change-Id: Iadf90edb02bacf645896f7d074d011a2aca4b251
Christopher Tate [Thu, 16 Jun 2016 23:31:39 +0000 (16:31 -0700)]
resolve merge conflicts of
cffb19c to mnc-dev
Change-Id: I4dba574de2678d851e3d82961a07de27d61f5940
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
Sudheer Shanka [Thu, 9 Jun 2016 00:13:24 +0000 (17:13 -0700)]
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 [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
Kevin Gabayan [Thu, 9 Jun 2016 22:40:50 +0000 (15:40 -0700)]
Compute AnyMotionDetector angle using atan2.
Bug:
29232136
Change-Id: Ie57d0228eb42246c4ac1d7a01e2782a621b7e78f
(cherry picked from commit
b070577d35436ca0f5463e6ed19a28ae431cfbfb)
Erik Wolsheimer [Thu, 9 Jun 2016 03:25:42 +0000 (03:25 +0000)]
Merge "DO NOT MERGE ANYWHERE Fix NPE when UID has no packages." into cw-e-dev
fionaxu [Wed, 8 Jun 2016 18:33:22 +0000 (18:33 +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 am:
16dfcd7950 -s ours am:
2d03c0f956
am:
dc9a7c7b23
Change-Id: I0cccd4ba128987959aa0e9324c1f5ab5bb5bc455
fionaxu [Wed, 8 Jun 2016 18:22:46 +0000 (18:22 +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 am:
16dfcd7950 -s ours
am:
2d03c0f956
Change-Id: I9dfe9f73a3762ec0eed0659a7ac04f9980e715bb
fionaxu [Wed, 8 Jun 2016 18:11:09 +0000 (18:11 +0000)]
resolve merge conflicts of
2c53526 to lmp-mr1-dev am:
c196526f8e am:
1e8fe12f4e am:
965084dd0c am:
698e044717
am:
c95d552de0
Change-Id: I4db8cef9678c409b7f0610d98f161e0e048a0333
fionaxu [Wed, 8 Jun 2016 17:23:33 +0000 (17:23 +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
am:
16dfcd7950 -s ours
Change-Id: Ia5003c773216218c4ed2961587fb30f4536d89a7
fionaxu [Wed, 8 Jun 2016 17:23:27 +0000 (17:23 +0000)]
resolve merge conflicts of
2c53526 to lmp-mr1-dev am:
c196526f8e am:
1e8fe12f4e am:
965084dd0c
am:
698e044717
Change-Id: I5a00c0b206cae8a13f860783756ffa66c08db65d
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:11:49 +0000 (17:11 +0000)]
resolve merge conflicts of
2c53526 to lmp-mr1-dev am:
c196526f8e am:
1e8fe12f4e
am:
965084dd0c
Change-Id: I1db27bacdfc0c66ddc28c3d656f1f5cfb98894a8
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
Erik Wolsheimer [Mon, 6 Jun 2016 17:49:02 +0000 (10:49 -0700)]
DO NOT MERGE ANYWHERE Fix NPE when UID has no packages.
CP of
377ded0fce449f77cd7efae35f97722cdab52693
BUG:
25224723
BUG:
28815187
Change-Id: I248468f0d9ccd6aef36b2076bf7f90efb833efd2
Hall Liu [Thu, 2 Jun 2016 17:32:08 +0000 (10:32 -0700)]
DO NOT MERGE Disable app pinning when emergency call button pressed
Also disables app pinning when the "return to call" button is pressed
and brings up the in-call screen when app pinning is stopped if there is
an existing call.
Combination of ag/
1091397 and ag/
1085584 adapted for MNC.
Bug:
28558307
Bug:
28761672
Change-Id: I82ec4042bff387c845ce571b197a4a86e1dd5ec8
Paul Jensen [Thu, 26 May 2016 15:13:07 +0000 (15: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 am:
75095e6f02 am:
7c625e1938 am:
54a62d5feb
am:
a5a2c88fb3
* commit '
a5a2c88fb3ac43315575de94696c837cb6b88c35':
Don't pass URL path and username/password to PAC scripts
Change-Id: Ia33d40ae5d4b6ee0cd3cfcdc8587d6002603f128
Paul Jensen [Thu, 26 May 2016 15:02:46 +0000 (15:02 +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 am:
7c625e1938
am:
54a62d5feb
* commit '
54a62d5febc8771f65221db3dd5c6e08f3288eb8':
Don't pass URL path and username/password to PAC scripts
Change-Id: I1da24c02fbf85a7f0fd3ea7a86ad3a34389000e8
Paul Jensen [Thu, 26 May 2016 14:50:37 +0000 (14:50 +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
am:
7c625e1938
* commit '
7c625e1938f28cf2a455fb1f4ab71dca99341b3d':
Don't pass URL path and username/password to PAC scripts
Change-Id: If2e068e47e6efd4b8ad7abc7fb358860b188a380
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 [Thu, 26 May 2016 12:31:55 +0000 (12:31 +0000)]
DO NOT MERGE : backport of backup transport whitelist am:
647cb6a6d8 -s ours am:
077534b101 am:
4c559cdade am:
24ceca96af -s ours am:
88c9eae886
am:
1fa817c057
* commit '
1fa817c057c909d1ba4f5a356f6eb4b52a3bc628':
DO NOT MERGE : backport of backup transport whitelist
Change-Id: Ia409bff3b5db1ba686d884f81e45b242ec1ae38f
Christopher Tate [Thu, 26 May 2016 00:53:35 +0000 (00:53 +0000)]
DO NOT MERGE : backport of backup transport whitelist am:
647cb6a6d8 -s ours am:
077534b101 am:
4c559cdade am:
24ceca96af -s ours
am:
88c9eae886
* commit '
88c9eae886ff99d37da0f13af4b2e045e9332289':
DO NOT MERGE : backport of backup transport whitelist
Change-Id: I3e37d8e8e6064dc0f5640c38b9cc4a72bd028c19
Christopher Tate [Thu, 26 May 2016 00:12:37 +0000 (00:12 +0000)]
DO NOT MERGE : backport of backup transport whitelist am:
647cb6a6d8 -s ours am:
077534b101 am:
4c559cdade
am:
24ceca96af -s ours
* commit '
24ceca96af925ac19a1fa337afc0e739d9cb11ad':
DO NOT MERGE : backport of backup transport whitelist
Change-Id: I1c79f9a012981dc2be9c8342674780c85bbf6663
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
Chris Tate [Wed, 25 May 2016 23:06:54 +0000 (23:06 +0000)]
Merge "Backport of backup transport whitelist" into mnc-dev am:
2cfc6baa22
am:
600d4f61ca
* commit '
600d4f61ca15b375c9acef64d52913f0ab823deb':
Backport of backup transport whitelist
Change-Id: I308a0f0284990dc8e327c581cac49db899ad6cfa
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:49 +0000 (22:45 +0000)]
Merge "Backport of backup transport whitelist" into mnc-dev
am:
2cfc6baa22
* commit '
2cfc6baa2286a256585a7fb6295f9b66ff641726':
Backport of backup transport whitelist
Change-Id: I73dff5d354cd5f26a7f2e68e16f8dd798d610fd3
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
Chris Tate [Wed, 25 May 2016 22:30:56 +0000 (22:30 +0000)]
Merge "Backport of backup transport whitelist" into mnc-dev
Christopher Tate [Fri, 20 May 2016 22:29:31 +0000 (15:29 -0700)]
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: I9f90e324169a68720d608f74754d284a7e59cf87
Jim Miller [Tue, 24 May 2016 22:14:24 +0000 (22:14 +0000)]
Merge "Fix missing permission check when saving pattern/password" into mnc-dev am:
45c77d951a
am:
9bf8474c27
* commit '
9bf8474c27642f48aa27e2edf1bdd83b27d692c1':
Fix missing permission check when saving pattern/password
Change-Id: I4238a43dc30be54375b6db129b360cc7d0a90b0e
Jim Miller [Tue, 24 May 2016 22:08:16 +0000 (22:08 +0000)]
Merge "Fix missing permission check when saving pattern/password" into mnc-dev
am:
45c77d951a
* commit '
45c77d951ab5203b8e19c2ed2ce3a0816e42b118':
Fix missing permission check when saving pattern/password
Change-Id: I81947e95d5365bbf6a4927435f43c73dc4ac2bb0
Jim Miller [Tue, 24 May 2016 22:04:36 +0000 (22:04 +0000)]
Merge "Fix missing permission check when saving pattern/password" into mnc-dev
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:50:55 +0000 (22:50 +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 am:
8238207ce6 -s ours am:
a7895725f8
am:
0f59d9b80c
* commit '
0f59d9b80c9f5daa321b683525ba8732add007c2':
DO NOT MERGE Cherry pick libpng usage fixes
Change-Id: Ieab233f8cc5b9a0c3468c551b4cd023532c5eff6
John Reck [Thu, 19 May 2016 22:47:05 +0000 (22:47 +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 am:
8238207ce6 -s ours
am:
a7895725f8
* commit '
a7895725f8858465a404cbe4f6d5091e39423529':
DO NOT MERGE Cherry pick libpng usage fixes
Change-Id: Icc562bb47467e7d2d352b6c03498a471ec464e63
John Reck [Thu, 19 May 2016 22:43:14 +0000 (22:43 +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
am:
8238207ce6 -s ours
* commit '
8238207ce6268422bcdb50d44f03e6a220081294':
DO NOT MERGE Cherry pick libpng usage fixes
Change-Id: Ia73f713a2c6f52357877e00e71f511044bb9ca58
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
Chenjie Luo [Thu, 12 May 2016 23:59:43 +0000 (16:59 -0700)]
Add null pointer check in removeConnection
Bug:
28607777
Change-Id: I199ed75740796540d243ad9f507ab2511c9ed3c1
Adam Powell [Mon, 2 May 2016 21:21:11 +0000 (21:21 +0000)]
Backport ChooserTarget package source check from N am:
82b9565bd1
am:
6d5f80d13b
* commit '
6d5f80d13b06d439db08fcd5d25490edb322f923':
Backport ChooserTarget package source check from N
Change-Id: Iec7902498e2cfe53ce16dc9faf2d91340f416799
Adam Powell [Mon, 2 May 2016 21:15:05 +0000 (21:15 +0000)]
Backport ChooserTarget package source check from N
am:
82b9565bd1
* commit '
82b9565bd13e2c5dac20b3221b7be28c5afe57ea':
Backport ChooserTarget package source check from N
Change-Id: Ic7e4a8e80829ccb0b2f60c572eea15d18d6658ec
Adam Powell [Thu, 28 Apr 2016 23:32:18 +0000 (16:32 -0700)]
Backport ChooserTarget package source check from N
Fix a bug where a ChooserTargetService could supply a ChooserTarget
pointing at a non-exported activity outside of its own package and
have it launch.
Bug
28384423
Change-Id: I3f5854f91c5695ad9253d71055ef58224df47008
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
Jim Miller [Wed, 13 Apr 2016 23:35:36 +0000 (16:35 -0700)]
Fix missing permission check when saving pattern/password
Fixes bug
28163930
Change-Id: Ic98ef20933b352159b88fdef331e83e9ef6e1f20
Christopher Tate [Wed, 20 Apr 2016 21:43:17 +0000 (21:43 +0000)]
resolve merge conflicts of
44e07e0 to mnc-dev am:
825b713
am:
8c635e7
* commit '
8c635e73c698302ce6661f227c274164972f048e':
Kill the real/isolated uid group, not the ApplicationInfo uid
Change-Id: Iae6fe5af0a8e0f27e8b45a56aecc2d722d7c3bc3
Christopher Tate [Wed, 20 Apr 2016 21:35:50 +0000 (21:35 +0000)]
resolve merge conflicts of
44e07e0 to mnc-dev
am:
825b713
* commit '
825b7134699fbaaa16423c52b7b424d4a9afefb1':
Kill the real/isolated uid group, not the ApplicationInfo uid
Change-Id: I0c120c8dbf76857985ebea04eadca81fa6470cb2
Christopher Tate [Wed, 20 Apr 2016 20:33:41 +0000 (13:33 -0700)]
resolve merge conflicts of
44e07e0 to mnc-dev
Change-Id: Ibc446c82a3d1446ccd81630743f82d1fd58fbd47
Mitchell Wills [Wed, 20 Apr 2016 18:53:58 +0000 (18:53 +0000)]
Update scan and last network info in the WorkThread
am:
cf0875a
* commit '
cf0875a9b69da9da5e16563eca33609e775d9195':
Update scan and last network info in the WorkThread
Change-Id: I0b59f1eaa9bad27b300477f31fb88fb8e2eacb38
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
Mitchell Wills [Mon, 18 Apr 2016 21:54:53 +0000 (14:54 -0700)]
Update scan and last network info in the WorkThread
This prevents a race condition where mLastInfo is updated while
processing scan results causing a crash.
Change-Id: Ic5147f3851f218c0f697e4ebb324f1cb63d02665
Fixes:
27944510
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
OSDN Git Service
