115908 Commits

Author SHA1 Message Date
Paul Jensen
96c045807b Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev 2016-09-19 11:11:06 +00:00
Tadashi G. Takaoka
f71d2cddf1 DO NOT MERGE: Catch all exceptions when parsing IME meta data
Bug: 30568284
Change-Id: I0b613f8ce0f014320c5ac1bf445699ea2702a0a2
(manually cherry picked from 9b2997d22e6ce2a15065d8e7608dd77b316c2065)
2016-09-16 13:51:43 +09:00
Sungsoo
1bdd10a953 DO NOT MERGE) ExifInterface: Make saveAttributes throw an exception before change
ExifInterface object can be created with a unsupported file format.
If saveAttribute is called with an unsupported file format, ExifInterface
makes the file corrupted. This CL prevents those cases by throwing
an exception before making any change on the file.

Bug: 30936376
Change-Id: I915f56b00ec9422b53591ac5534e070a1d6798e6
2016-09-08 16:04:44 +09:00
Paul Jensen
7d2198b586 Avoid crashing when downloading MitM'd PAC that is too big
There's two pieces to this fix:
1. Move PAC loading off IoThread which isn't meant for
   blocking network fetches.  If the fetch takes more than
   60s Android reboots when the IoThread is used.
2. Limit PAC fetching to 20MB.  Any PAC bigger than that
   is likely evil.
MitM of PACs should only be possbile when a non-SSL PAC URL
is used.

Change-Id: Ie1658a1c705615dc85a7fc68053f0dad8d048294
Fixes: 30100884
2016-08-25 02:09:37 +00:00
Sudheer Shanka
de04301f9a Merge "DO NOT MERGE: Clean up when recycling a pid with a pending launch" into klp-dev 2016-08-19 17:07:06 +00:00
Narayan Kamath
6829cf28e2 Merge "Process: Fix communication with zygote." into klp-dev 2016-08-18 09:46:18 +00:00
Narayan Kamath
8e69dd2284 Process: Fix communication with zygote.
Don't write partial requests, and don't return (or throw) early after
partially reading a response.

bug: 30143607

(cherry-picked from commit 448be0a62209c977593d81617853a8a428d013df)

Change-Id: I5881fdd5e81023cd21fb4d23a471a5031987a1f1
2016-08-16 17:21:49 +01:00
Sudheer Shanka
a3af5c6207 DO NOT MERGE: Clean up when recycling a pid with a pending launch
Fix for accidental launch of a broadcast receiver in an
incorrect app instance.

Bug: 30202481
Change-Id: I84b74edc29ca3fb88048b44af682ecbeb176b774
2016-08-12 18:49:56 -07:00
David Christie
df7bd91dfa Merge "Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864" into klp-dev 2016-08-11 18:15:30 +00:00
Sungsoo Lim
df17644db7 DO NOT MERGE: Fix CTS regression
Bug: 30297223, Bug: 30437363
Change-Id: I7b18af40e4eac2713577204428fbfb96cc346582
2016-07-29 00:56:16 +00:00
David Christie
dde12c6923 Fix vulnerability where large GPS XTRA data can be injected.
-Can potentially crash system with OOM.
Bug: 29555864

Change-Id: I7157f48dddf148a9bcab029cf12e26a58d8054f4
2016-07-25 17:13:23 -07:00
Paul Stewart
77b5526229 Merge changes Id25696e4,I939a12a2 into klp-dev
* changes:
  Fix string equality comparison
  WifiEnterpriseConfiguration: Do not print credentials in toString
2016-07-19 23:59:00 +00:00
Sungsoo Lim
8dbf0b5558 DO NOT MERGE: Remove the use of JHEAD in ExifInterface
Bug: 29270469
Change-Id: Iecc3d22375f6a79a81512419cdde31f720cef07c
2016-07-15 16:24:10 +09:00
Paul Stewart
1033c6fdbc Fix string equality comparison
Don't use "==" to compare strings.

Bug: 25624963
Change-Id: Id25696e4fdcbcf4d48ec74e8ed65c1a33716b30c
2016-06-30 11:58:38 -07:00
Paul Stewart
cc00f4d646 WifiEnterpriseConfiguration: Do not print credentials in toString
BUG:25624963
Change-Id: I939a12a27d6b915d8a9cc8b142f645fba0ee42ec
2016-06-30 11:57:20 -07:00
fionaxu
f44c73abb2 DO NOT MERGE revert public api loadSafeLabel
Bug: 28557603
Change-Id: Ic9d9ae0b59fe86f70aaea311380cacf222ee3a0c
2016-06-27 23:52:19 -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
4e33c4f8b1 DO NOT MERGE fix build breakage on k
Bug: 28557603
Change-Id: I3beae9e8cb6315654d7681d484fbb861fa8b1889
2016-06-07 17:55:27 -07:00
fionaxu
be2865a60a Backport loadSafeLabel changes
Bug:23531798
Bug:28557603
Change-Id: Iee49f7c37d6a42fe74077bb15ed47919d351d172
2016-06-07 22:51:28 +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
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
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
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
Shreyas Basarge
a962d9eba7 NPE fix for SyncStorageEngine read authority
Add a null check after an authority is read
from disk.

Bug: 26513719
Change-Id: I18f01828141110e776cc96f3b3be3d80125e70c1
2016-02-19 23:38:33 +00:00
Matthew Williams
a5cafd2a93 DO NOT MERGE Redact Account info from getCurrentSyncs
BUG:26094635
If the caller to ContentResolver#getCurrentSyncs does not hold the
GET_ACCOUNTS permission, return a SyncInfo object that does not
contain any Account information.

Change-Id: I5628ebe1f56c8e3f784aaf1b3281e6b829d19314
(cherry picked from commit b63057e698a01dafcefc7ba09b397b0336bba43d)
2016-01-21 14:15:11 +00:00
Shreyas Basarge
2f137b7705 Sync extras bundle comparison can throw NPE
Bug: 23591205
Change-Id: I960dfcc1584c0a17685790d5d722eaf11b930e25
2015-11-12 15:32:44 +00:00
Zach Jang
bdf7f3583c DO NOT MERGE - Backport of ag/748165 to klp-dev
Security patch level in Settings

b/23946860

Change-Id: I610d4dedf18fe1825d7df5febf29e6f0c006490d
2015-09-17 01:17:58 +00:00
Sebastien Hertz
18089ceb71 Allow debugging only for apps forked from zygote DO NOT MERGE
When starting the runtime from app_process, we only pass JDWP options
if starting zygote. It prevents from opening a JDWP connection in
non-zygote programs while Android apps (forked from zygote) remain
debuggable.

Bug: 23050463

(cherry picked from commit 7a09b8322cab26d6e3da1362d3c74964ae66b5d4)

Change-Id: I2400ecc8aea7579c43300efccf288b69f70eef53
2015-08-19 17:12:34 +02:00
Wale Ogunwale
dc9cfca801 Merge "Prevent system uid component from running in an app process" into klp-dev 2015-07-01 16:06:34 +00:00
Amit Mahajan
9edf7ad563 DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Bug: 21697171
Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b
2015-06-26 17:33:32 +00:00
Wale Ogunwale
78a22fd273 Prevent system uid component from running in an app process
Bug: 21669445
Change-Id: I792c6e676d4b6d54a51228d264130b8125075d98
2015-06-25 09:29:58 -07:00
Leon Scroggins III
0d2081734c DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
bug: 20883006
Change-Id: I4f109667fb210a80fbddddf5f1bfb7ef3a02b6ce
2015-05-29 16:13:11 -04:00
Leon Scroggins III
18d7926709 Check that the parcel contained the expected amount of region data. DO NOT MERGE
bug:20883006
Change-Id: Ib47a8ec8696dbc37e958b8dbceb43fcbabf6605b
2015-05-26 17:05:22 -04:00
Leon Scroggins III
69b8e962e1 Make Bitmap_createFromParcel check the color count. DO NOT MERGE
When reading from the parcel, if the number of colors is invalid, early
exit.

Add two more checks: setInfo must return true, and Parcel::readInplace
must return non-NULL. The former ensures that the previously read values
(width, height, etc) were valid, and the latter checks that the Parcel
had enough data even if the number of colors was reasonable.

Also use an auto-deleter to handle deletion of the SkBitmap.

Cherry pick from change-Id: Icbd562d6d1f131a723724883fd31822d337cf5a6

BUG=19666945

Change-Id: I9490d90244e051a4019d6266b2a1cb375a65198f
2015-04-15 08:16:29 -04:00
Jon Larimer
9a425aa71c am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '159aa73574804967aded45d06b70df5a8dd64a58':
  Fix build breakage in older branches by avoiding <> notation
2015-01-30 21:44:17 +00:00
Jon Larimer
159aa73574 am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit 'd403180997898c98f0be15b810c4c9dd9002f92c':
  Fix build breakage in older branches by avoiding <> notation
2015-01-30 21:28:59 +00:00
Jon Larimer
d403180997 am 48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '48c95c4370533bf27e537cbca1e64d060a016c5f':
  Fix build breakage in older branches by avoiding <> notation
2015-01-30 19:30:57 +00:00
Jon Larimer
48c95c4370 Fix build breakage in older branches by avoiding <> notation
Change-Id: I5e3d523dac1f364f52f0d2cab479c1705d667e5a
2015-01-29 15:54:43 -05:00
Jon Larimer
a5ccca2427 am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
* commit '2982d64802ed0d5b59130680c43485e9d7862e50':
  Fix ParceledListSlice to enforce the same concrete types among its elements.
2015-01-29 18:25:28 +00:00
Jon Larimer
6813f29e32 am 76cdbb04: (-s ours) am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
* commit '76cdbb0475fe881c8e7320c277e5ea4848be5bff':
  DO NOT MERGE Restore calling identity before checking permission
2015-01-29 18:25:24 +00:00
Jon Larimer
2982d64802 am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
* commit 'de9a76ed997c300a6c5f2f82c517719503af9045':
  Fix ParceledListSlice to enforce the same concrete types among its elements.
2015-01-29 18:12:01 +00:00
Jon Larimer
76cdbb0475 am d0318a63: am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
* commit 'd0318a63e51107d5589d8970b079c27d8f788c5a':
  DO NOT MERGE Restore calling identity before checking permission
2015-01-29 18:11:57 +00:00
Jon Larimer
de9a76ed99 am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
* commit 'fc731e6e40f6f449b8e7ac72c2cd36a57c04a32b':
  Fix ParceledListSlice to enforce the same concrete types among its elements.
2015-01-29 18:00:58 +00:00
Jon Larimer
d0318a63e5 am 7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
* commit '7dd12d7633663c7f5802bdaaf8e7232a48aba811':
  DO NOT MERGE Restore calling identity before checking permission
2015-01-29 18:00:55 +00:00
Jon Larimer
fc731e6e40 Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev 2015-01-29 17:48:58 +00:00
Jon Larimer
2f4ad45d60 Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev 2015-01-29 17:48:24 +00:00
Jon Larimer
7dd12d7633 Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev 2015-01-29 17:48:20 +00:00
Adam Lesinski
f741c37273 Fix ParceledListSlice to enforce the same concrete types among its elements.
Bug:17671747
Change-Id: I896f75738e5b464ccb6c03290f139cc2fa72f966
(cherry picked from commit 3df1c38ee098872352086e03d6f1adb16796ee29)
2015-01-28 10:47:54 +00:00
Leon Scroggins III
6106f6a490 am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data.
* commit '9352296810926eae663477526545a55e1b1f7a27':
  Handle bad ninepatch data.
2015-01-27 22:31:47 +00:00
Leon Scroggins III
9352296810 am 01287549: am 9a6143fa: Handle bad ninepatch data.
* commit '01287549ad415c51377683696eb37c362d43061a':
  Handle bad ninepatch data.
2015-01-27 22:17:11 +00:00