drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
200,697 Commits 1 Branch 0 Tags
Commit Graph

200697 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Tate
34fb87b519 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
 2016-06-17 00:22:07 +00:00
Christopher Tate
c61f35ed9a 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
 2016-06-17 00:15:14 +00:00
Christopher Tate
d6c1126fab resolve merge conflicts of cffb19c to mnc-dev 
am: 3f9ea2d386

Change-Id: Iadf90edb02bacf645896f7d074d011a2aca4b251
 2016-06-17 00:15:07 +00:00
Christopher Tate
3f9ea2d386 resolve merge conflicts of cffb19c to mnc-dev 
Change-Id: I4dba574de2678d851e3d82961a07de27d61f5940
 2016-06-16 16:31:39 -07:00
Christopher Tate
2149ebeadf 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
 2016-06-16 22:53:29 +00:00
Christopher Tate
918fb5d453 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
 2016-06-16 22:50:23 +00:00
Christopher Tate
b1e31ad140 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
 2016-06-16 22:45:45 +00:00
Christopher Tate
41821a26a5 DO NOT MERGE: Don\\\'t trust callers to supply app info to bindBackupAgent() am: d85a4ed283 am: f615799ef2 
am: 6633a4fee4  -s ours

Change-Id: I2c10cc7ff790c84767167c76e028456ba4dcaeb3
 2016-06-16 22:39:05 +00:00
Christopher Tate
cffb19c812 Don\\\'t trust callers to supply app info to bindBackupAgent() am: c58054f25f am: cd777e95a7 
am: ec6c3f7a32

Change-Id: Idc2b6c712078493b4186edad750d8d5beab58adf
 2016-06-16 22:30:17 +00:00
Christopher Tate
6633a4fee4 DO NOT MERGE: Don\\'t trust callers to supply app info to bindBackupAgent() am: d85a4ed283 
am: f615799ef2

Change-Id: Ibc84666aa491986fe861b82400affde1675e632d
 2016-06-16 22:27:18 +00:00
Christopher Tate
ec6c3f7a32 Don\\'t trust callers to supply app info to bindBackupAgent() am: c58054f25f 
am: cd777e95a7

Change-Id: I199f1354df85fcda372002887eafc1e6fb9b19d8
 2016-06-16 22:27:04 +00:00
Christopher Tate
cd777e95a7 Don\'t trust callers to supply app info to bindBackupAgent() 
am: c58054f25f

Change-Id: I3b0bd91c38b5f13770f09f39c2eea78b63c29d7c
 2016-06-16 22:21:37 +00:00
Christopher Tate
f615799ef2 DO NOT MERGE: Don\'t trust callers to supply app info to bindBackupAgent() 
am: d85a4ed283

Change-Id: Ib1f01d4d10c82acb9f03aab4fe81d43d85d4a899
 2016-06-16 22:21:25 +00:00
Christopher Tate
c58054f25f 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
 2016-06-14 13:28:43 -07:00
Christopher Tate
d85a4ed283 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
 2016-06-14 13:28:33 -07:00
fionaxu
dc9a7c7b23 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
 2016-06-08 18:22:46 +00:00
fionaxu
2d03c0f956 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
 2016-06-08 17:23:33 +00:00
fionaxu
c95d552de0 resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e am: 965084dd0c 
am: 698e044717

Change-Id: I5a00c0b206cae8a13f860783756ffa66c08db65d
 2016-06-08 17:23:27 +00:00
fionaxu
16dfcd7950 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
 2016-06-08 17:15:39 +00:00
fionaxu
698e044717 resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e 
am: 965084dd0c

Change-Id: I1db27bacdfc0c66ddc28c3d656f1f5cfb98894a8
 2016-06-08 17:11:49 +00:00
fionaxu
eb53629bf7 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
 2016-06-08 17:10:02 +00:00
fionaxu
965084dd0c resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e 
am: 1e8fe12f4e

Change-Id: I3122c1d81dde1088990bcbd2aff7eea478ead4fc
 2016-06-08 17:04:09 +00:00
fionaxu
0e64d7411e DO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c am: 84f479f6b5 -s ours 
am: e1ca4cd074  -s ours

Change-Id: Icbb64c652c66c55fcc6e0cf1500af2cfb99fdbb3
 2016-06-08 16:58:26 +00:00
fionaxu
1e8fe12f4e resolve merge conflicts of 2c53526 to lmp-mr1-dev 
am: c196526f8e

Change-Id: Ic0f9fb749282b46d5c41fd36aaab42090ecbd0b9
 2016-06-08 16:58:13 +00:00
fionaxu
c196526f8e resolve merge conflicts of 2c53526 to lmp-mr1-dev 
Change-Id: I4fe45fae0a98934ac9b0f6f48c8cab8546392641
 2016-06-07 22:01:19 -07:00
fionaxu
e1ca4cd074 DO NOT MERGE fix build breakage on k am: 4e33c4f8b1 am: 07c994012c 
am: 84f479f6b5  -s ours

Change-Id: Ia2605d430a9f3fdc1de6a59bb5702f4f65ae3816
 2016-06-08 02:04:12 +00:00
fionaxu
84f479f6b5 DO NOT MERGE fix build breakage on k am: 4e33c4f8b1 
am: 07c994012c

Change-Id: Iba1b8547910292c33b9ce500fd395c95a6bc81e9
 2016-06-08 01:59:04 +00:00
fionaxu
07c994012c DO NOT MERGE fix build breakage on k 
am: 4e33c4f8b1

Change-Id: I0339ec14a342f6c4a8f77638ffc6d4873a368830
 2016-06-08 01:49:39 +00:00
fionaxu
4e33c4f8b1 DO NOT MERGE fix build breakage on k 
Bug: 28557603
Change-Id: I3beae9e8cb6315654d7681d484fbb861fa8b1889
 2016-06-07 17:55:27 -07:00
fionaxu
2c53526b4b Backport loadSafeLabel changes am: be2865a60a am: 4c50846519 
am: 9a825b0fd5

Change-Id: Ie3042058420fbd3018ae238dab4129de58ec69c8
 2016-06-07 23:23:10 +00:00
fionaxu
9a825b0fd5 Backport loadSafeLabel changes am: be2865a60a 
am: 4c50846519

Change-Id: Ia31592def4d88a3a9e92a7e0c9126691c64a5fc4
 2016-06-07 23:20:04 +00:00
fionaxu
4c50846519 Backport loadSafeLabel changes 
am: be2865a60a

Change-Id: Ifabe996449c534c5085245c4f07e2d865a23e126
 2016-06-07 23:13:08 +00:00
fionaxu
be2865a60a Backport loadSafeLabel changes 
Bug:23531798
Bug:28557603
Change-Id: Iee49f7c37d6a42fe74077bb15ed47919d351d172
 2016-06-07 22:51:28 +00:00
Paul Jensen
a5a2c88fb3 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
 2016-05-26 15:02:46 +00:00
Paul Jensen
54a62d5feb 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
 2016-05-26 14:50:37 +00:00
Paul Jensen
7c625e1938 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
 2016-05-26 14:35:08 +00:00
Paul Jensen
75095e6f02 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
 2016-05-26 14:13:16 +00:00
Paul Jensen
42a5983364 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
 2016-05-26 14:01:19 +00:00
Paul Jensen
6c35cf2434 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
 2016-05-26 13:44:37 +00:00
Paul Jensen
bb27626141 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
 2016-05-26 13:37:24 +00:00
Paul Jensen
8940d2b0ff 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
 2016-05-26 13:30:59 +00:00
Paul Jensen
af0b4466ff Merge "Don't pass URL path and username/password to PAC scripts" into klp-dev 2016-05-26 13:18:05 +00:00
Christopher Tate
1fa817c057 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
 2016-05-26 00:53:35 +00:00
Christopher Tate
88c9eae886 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
 2016-05-26 00:12:37 +00:00
Christopher Tate
24ceca96af 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
 2016-05-25 23:16:15 +00:00
Christopher Tate
4c559cdade 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
 2016-05-25 23:06:02 +00:00
Christopher Tate
600d4f61ca Merge "Backport of backup transport whitelist" into mnc-dev 
am: 2cfc6baa22

* commit '2cfc6baa2286a256585a7fb6295f9b66ff641726':
  Backport of backup transport whitelist

Change-Id: I73dff5d354cd5f26a7f2e68e16f8dd798d610fd3
 2016-05-25 22:45:49 +00:00
Christopher Tate
077534b101 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
 2016-05-25 22:45:22 +00:00
Chris Tate
2cfc6baa22 Merge "Backport of backup transport whitelist" into mnc-dev 2016-05-25 22:30:58 +00:00
Christopher Tate
2be3de1723 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
 2016-05-25 10:51:38 -07:00