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

202433 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fionaxu
e892848035 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
 2016-06-08 18:33:22 +00: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
c10e4fae05 resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e am: 965084dd0c am: 698e044717 
am: c95d552de0

Change-Id: I4db8cef9678c409b7f0610d98f161e0e048a0333
 2016-06-08 18:11:09 +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
7ff57eaff9 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
 2016-05-26 15:13:07 +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
040cf14047 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
 2016-05-26 12:31:55 +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
Chris Tate
c69aa838a8 Merge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22 
am: 600d4f61ca

* commit '600d4f61ca15b375c9acef64d52913f0ab823deb':
  Backport of backup transport whitelist

Change-Id: I308a0f0284990dc8e327c581cac49db899ad6cfa
 2016-05-25 23:06:54 +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
Jim Miller
89e3f2ba98 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
 2016-05-24 22:14:24 +00:00
Jim Miller
9bf8474c27 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
 2016-05-24 22:08:16 +00:00
Jim Miller
45c77d951a Merge "Fix missing permission check when saving pattern/password" into mnc-dev 2016-05-24 22:04:37 +00:00
Christopher Tate
647cb6a6d8 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
 2016-05-23 15:37:57 -07:00
John Reck
08a4808197 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
 2016-05-19 22:50:55 +00:00
John Reck
0f59d9b80c 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
 2016-05-19 22:47:05 +00:00
John Reck
a7895725f8 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
 2016-05-19 22:43:14 +00:00
John Reck
8238207ce6 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
 2016-05-19 22:37:04 +00:00
John Reck
1da8c9baa2 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
 2016-05-19 22:32:47 +00:00
John Reck
1fae3b370d 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
 2016-05-19 22:28:23 +00:00