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
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
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
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
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
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
c6629bd5df Merge "Add new, hidden MotionEvent flag for partially obscured windows." into mnc-dev 
am: 224582e

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

Change-Id: I24f2bf328c91bbc05f1b76ed464d962c71e92245
 2016-04-18 18:46:44 +00:00
Michael Wright
224582e040 Merge "Add new, hidden MotionEvent flag for partially obscured windows." into mnc-dev 2016-04-18 18:40:19 +00:00
Todd Kennedy
b7575756c4 DO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9 am: ca13384 -s ours am: c2cc804 -s ours am: 620a4ed am: be58fe0 am: e265f35 -s ours 
am: 3bdb89b

* commit '3bdb89bd1c6fa2656061efd095cb794619d0ab06':
  DO NOT MERGE Fix intent filter priorities

Change-Id: Id1a5e903e838b9118cc4bbd37879b5e840f8b3b6
 2016-04-11 22:37:51 +00:00
Todd Kennedy
3bdb89bd1c DO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9 am: ca13384 -s ours am: c2cc804 -s ours am: 620a4ed am: be58fe0 
am: e265f35  -s ours

* commit 'e265f35caa276035535f7546f01a91b4e072de0c':
  DO NOT MERGE Fix intent filter priorities

Change-Id: Ide1b16d642573c37bced4d293d91bf043bb0a78d
 2016-04-11 22:32:47 +00:00
Todd Kennedy
e265f35caa 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
 2016-04-11 22:27:50 +00:00
Todd Kennedy
be58fe035e 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
 2016-04-11 22:22:35 +00:00
Todd Kennedy
e0481f0ee6 DO NOT MERGE Fix intent filter priorities am: d6174e7 -s ours am: ebb136c am: 6e0aff3 am: a73fa08 -s ours 
am: d73c865

* commit 'd73c865385e2177055962d1015530c48556fd9f8':
  DO NOT MERGE Fix intent filter priorities

Change-Id: Ied6935ae9e523f7f824b45ab3057cab1717296d6
 2016-04-11 22:22:30 +00:00
Todd Kennedy
620a4ed031 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
 2016-04-11 22:17:20 +00:00
Todd Kennedy
d73c865385 DO NOT MERGE Fix intent filter priorities am: d6174e7 -s ours am: ebb136c am: 6e0aff3 
am: a73fa08  -s ours

* commit 'a73fa08457827b17a3db15ccaf52cb65a693d5db':
  DO NOT MERGE Fix intent filter priorities

Change-Id: Ie5c2a26cf1c6cc8f363845fb1be187fffc1a88fe
 2016-04-11 22:17:19 +00:00
Todd Kennedy
c2cc804407 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
 2016-04-11 22:12:19 +00:00
Todd Kennedy
a73fa08457 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
 2016-04-11 22:12:09 +00:00
Todd Kennedy
ca133845ef DO NOT MERGE Fix intent filter priorities am: 60351d3 
am: 3dfc6d9

* commit '3dfc6d986f6142b1e0020c9970f626c7c435711e':
  DO NOT MERGE Fix intent filter priorities

Change-Id: Id396cca79db8f830a513746f387fb866c773c778
 2016-04-11 22:06:38 +00:00
Todd Kennedy
6e0aff30cf DO NOT MERGE Fix intent filter priorities am: d6174e7 -s ours 
am: ebb136c

* commit 'ebb136cbda0ba1caff3c482e00aff416edc5117f':
  DO NOT MERGE Fix intent filter priorities

Change-Id: I20536d7bca605aadb8cec8bee5383e1aef9742c9
 2016-04-11 22:06:35 +00:00
Todd Kennedy
ebb136cbda DO NOT MERGE Fix intent filter priorities 
am: d6174e7  -s ours

* commit 'd6174e74020aaec97db5780837a3edcd787018bf':
  DO NOT MERGE Fix intent filter priorities

Change-Id: I9d089bfaf20baee25c1999d24020956dcbc2509e
 2016-04-11 22:00:31 +00:00
Todd Kennedy
3dfc6d986f DO NOT MERGE Fix intent filter priorities 
am: 60351d3

* commit '60351d3be29977dfe0b422de797a0429edf500b7':
  DO NOT MERGE Fix intent filter priorities

Change-Id: Ieca2ee83f22e5d4083f895f52d42a2f697920be7
 2016-04-11 22:00:27 +00:00
Todd Kennedy
cd24c4ebc0 DO NOT MERGE Fix intent filter priorities 
am: eeb970a

* commit 'eeb970ada10d37495ad7a8a4b14ad0506b640eea':
  DO NOT MERGE Fix intent filter priorities

Change-Id: I22cfcc61e9ec37242e0e47ef732c9364bdb8a886
 2016-04-11 22:00:26 +00:00
Todd Kennedy
60351d3be2 DO NOT MERGE Fix intent filter priorities 
Since this is a backport, there is only one rule that guards intent
filter priorities:
1) Updates will NOT be granted a priority greater than the priority
   defined on the system image.

NOTE: I had to bring in pieces of ag/526831 so intent filters could
be collected and matched

Bug: 27450489
Change-Id: Ifcec4d7a59e684331399abc41eea1bd6876155a4
 2016-04-07 16:40:18 -07:00
Todd Kennedy
eeb970ada1 DO NOT MERGE Fix intent filter priorities 
Since this is a backport, there is only one rule that guards intent
filter priorities:
1) Updates will NOT be granted a priority greater than the priority
   defined on the system image.

Bug: 27450489
Change-Id: Ifcec4d7a59e684331399abc41eea1bd6876155a4
 2016-04-05 13:56:59 -07:00
Todd Kennedy
d6174e7402 DO NOT MERGE Fix intent filter priorities 
Since this is a backport, there is only one rule that guards intent
filter priorities:
1) Updates will NOT be granted a priority greater than the priority
   defined on the system image.

Bug: 27450489
Change-Id: Ifcec4d7a59e684331399abc41eea1bd6876155a4
 2016-04-05 10:20:41 -07:00
Michael Wright
0625e11b37 Add new, hidden MotionEvent flag for partially obscured windows. 
Bug: 26677796
Change-Id: Ic4219b883bb760495e6172ef61e84e9725876ef6
 2016-03-31 15:53:44 -07:00
Samuel Tan
1d508decac [DO NOT MERGE] Disallow guest user from changing Wifi settings am: d385a6d -s ours am: c2712ab am: 3253022 am: f4fd201 -s ours 
am: 1450b69

* commit '1450b69182fd9b360d9dd4ec54d431560eb775e6':
  [DO NOT MERGE] Disallow guest user from changing Wifi settings
 2016-03-23 21:53:57 +00:00
Samuel Tan
1450b69182 [DO NOT MERGE] Disallow guest user from changing Wifi settings am: d385a6d -s ours am: c2712ab am: 3253022 
am: f4fd201  -s ours

* commit 'f4fd20168fdf1ee19da63cc82c0893a288d8b759':
  [DO NOT MERGE] Disallow guest user from changing Wifi settings
 2016-03-23 21:49:16 +00:00
Samuel Tan
f4fd20168f [DO NOT MERGE] Disallow guest user from changing Wifi settings am: d385a6d -s ours am: c2712ab 
am: 3253022

* commit '325302206a0129bdf16a486232d5864d71e62a44':
  [DO NOT MERGE] Disallow guest user from changing Wifi settings
 2016-03-23 21:45:25 +00:00
Samuel Tan
325302206a [DO NOT MERGE] Disallow guest user from changing Wifi settings am: d385a6d -s ours 
am: c2712ab

* commit 'c2712ab7bd3bdeaf8945bc80154f402e1cf727bc':
  [DO NOT MERGE] Disallow guest user from changing Wifi settings
 2016-03-23 21:40:45 +00:00
Samuel Tan
c2712ab7bd [DO NOT MERGE] Disallow guest user from changing Wifi settings 
am: d385a6d  -s ours

* commit 'd385a6d95fc830ecc8d55937e9f46b14165d4b34':
  [DO NOT MERGE] Disallow guest user from changing Wifi settings
 2016-03-23 21:35:32 +00:00
Samuel Tan
542bb7307b [DO NOT MERGE] Disallow guest user from changing Wifi settings 
am: d8c3ca4

* commit 'd8c3ca43163427a75c8b70114096238177f97af0':
  [DO NOT MERGE] Disallow guest user from changing Wifi settings
 2016-03-23 21:35:30 +00:00
Samuel Tan
d385a6d95f [DO NOT MERGE] Disallow guest user from changing Wifi settings 
Disallow existing and newly created guest users from
changing Wifi settings.

BUG: 27411179
TEST: Flashed device, switched to existing guest user, and verified
      that Wifi settings are disabled.
TEST: Flashed device, created new guest user, and verified that Wifi
      settings are disabled.

Change-Id: Ia1bf4cce0369017b62f69d317c7ab2e30e3949b3
 2016-03-18 14:25:41 -07:00