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

202613 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
John Reck
bfa719f448 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
 2016-05-19 22:21:46 +00:00
John Reck
5527fd1323 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
 2016-05-19 22:16:42 +00:00
John Reck
1b1fcbaab5 DO NOT MERGE Cherry pick libpng usage fixes 
am: 7c9f2b8aa2

* commit '7c9f2b8aa2bdbbd5ee9fc6ff52161d994a10b865':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: If3b1a86798e4f8064fc1ad912d91b1106b24739a
 2016-05-19 19:26:24 +00:00
John Reck
7c9f2b8aa2 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
 2016-05-17 20:29:52 +00:00
Chenjie Luo
e370b538eb Add null pointer check in removeConnection 
Bug: 28607777
Change-Id: I199ed75740796540d243ad9f507ab2511c9ed3c1
 2016-05-12 17:00:27 -07:00
Adam Powell
7ac638702d Backport ChooserTarget package source check from N am: 82b9565bd1 
am: 6d5f80d13b

* commit '6d5f80d13b06d439db08fcd5d25490edb322f923':
  Backport ChooserTarget package source check from N

Change-Id: Iec7902498e2cfe53ce16dc9faf2d91340f416799
 2016-05-02 21:21:11 +00:00
Adam Powell
6d5f80d13b Backport ChooserTarget package source check from N 
am: 82b9565bd1

* commit '82b9565bd13e2c5dac20b3221b7be28c5afe57ea':
  Backport ChooserTarget package source check from N

Change-Id: Ic7e4a8e80829ccb0b2f60c572eea15d18d6658ec
 2016-05-02 21:15:05 +00:00
Adam Powell
82b9565bd1 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
 2016-04-29 15:38:13 +00:00
Paul Jensen
08ec0e53b8 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
 2016-04-29 10:57:13 +00:00
Jim Miller
b5383455b6 Fix missing permission check when saving pattern/password 
Fixes bug 28163930

Change-Id: Ic98ef20933b352159b88fdef331e83e9ef6e1f20
 2016-04-20 16:54:18 -07:00
Christopher Tate
343600c3ec 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
 2016-04-20 21:43:17 +00:00
Christopher Tate
8c635e73c6 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
 2016-04-20 21:35:50 +00:00
Christopher Tate
825b713469 resolve merge conflicts of 44e07e0 to mnc-dev 
Change-Id: Ibc446c82a3d1446ccd81630743f82d1fd58fbd47
 2016-04-20 13:33:41 -07:00
Mitchell Wills
c441faa6de 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
 2016-04-20 18:53:58 +00:00
Christopher Tate
44e07e07a1 resolve merge conflicts of 5e380f0 to lmp-mr1-ub-dev 
Change-Id: Ie8d3c154f4c98bb1c2a1954ff1dabc8f5bc20b71
 2016-04-20 11:37:20 -07:00
Mitchell Wills
cf0875a9b6 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
 2016-04-20 10:34:24 -07:00
Christopher Tate
5e380f096c 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
 2016-04-20 00:05:54 +00:00
Christopher Tate
cebcde3b5a resolve merge conflicts of 7641889 to lmp-mr1-dev 
Change-Id: Ie162907d7388d0e388ab39bcf2471d19e2ce7020
 2016-04-19 15:51:37 -07:00
Christopher Tate
76418899e6 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
 2016-04-18 15:20:01 -07:00
Michael Wright
a8064c2a8b Merge "Add new, hidden MotionEvent flag for partially obscured windows." into mnc-dev am: 224582e 
am: c6629bd

* commit 'c6629bd5dff622a26683269f9201b8d7871c6ef1':
  Add new, hidden MotionEvent flag for partially obscured windows.

Change-Id: I0d602765de707548ede0b1c0a6a38790626e7da1
 2016-04-18 18:52:13 +00:00