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

123078 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Narayan Kamath
b56f4f53e1 Process: Fix communication with zygote. am: 8e69dd2284 
am: b85e9e9108

Change-Id: Ie4874c088e05f4f5bc2073661010d413e60b3f7b
 2016-08-18 09:56:24 +00:00
Narayan Kamath
b85e9e9108 Process: Fix communication with zygote. 
am: 8e69dd2284

Change-Id: I3860d3f66e256a6446df5d8ce20f752d1c002e0f
 2016-08-18 09:50:52 +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
David Christie
5a6b11114a Merge "Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864" into klp-dev am: df7bd91dfa 
am: b9fe170c6a

Change-Id: I3e320844622617d9ae63fea4cc3a34f9f0e1e93a
 2016-08-11 18:33:18 +00:00
David Christie
b4a5615416 Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864 am: dde12c6923 
am: 3462e52676

Change-Id: I45779f683b417fe2d3cd4f7702d07a9cd13bd6f0
 2016-08-11 18:33:15 +00:00
David Christie
b9fe170c6a Merge "Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864" into klp-dev 
am: df7bd91dfa

Change-Id: Idec27e5beca07ace75b08de5ce0b6ee8bf1ab7f7
 2016-08-11 18:27:26 +00:00
David Christie
3462e52676 Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864 
am: dde12c6923

Change-Id: I772d5b997df579d3611eafc7542aeee2d690f946
 2016-08-11 18:27:22 +00: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
f645010092 DO NOT MERGE: Fix CTS regression am: df17644db7 
am: 057b548171

Change-Id: I0ac1fec4b64a09dc8ee12986d8d91b39e511d989
 2016-07-29 18:38:06 +00:00
Sungsoo Lim
057b548171 DO NOT MERGE: Fix CTS regression 
am: df17644db7

Change-Id: Id9bed3c68661176a72bcb606e0fc0a026173ac22
 2016-07-29 18:31:07 +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
58555ee891 Merge changes Id25696e4,I939a12a2 into klp-dev am: 77b5526229 
am: 2169197e28

Change-Id: I24f2c9f59336454aa071acca44d6aca5b44fda4a
 2016-07-20 00:25:20 +00:00
Paul Stewart
3fbe9280a4 Fix string equality comparison am: 1033c6fdbc 
am: fdd4fe53cf

Change-Id: Id179c734fc503abea1216e7c6057d4903a17f340
 2016-07-20 00:25:17 +00:00
Paul Stewart
df93deccf9 WifiEnterpriseConfiguration: Do not print credentials in toString am: cc00f4d646 
am: fa4bbf4ad6

Change-Id: I3ec1ff70fdfc2fd2aabf22ad1b7b3dad27ad4674
 2016-07-20 00:25:14 +00:00
Paul Stewart
2169197e28 Merge changes Id25696e4,I939a12a2 into klp-dev 
am: 77b5526229

Change-Id: I07fc88a342c3c6d1594832d0a05dd0734eb48424
 2016-07-20 00:17:49 +00:00
Paul Stewart
fdd4fe53cf Fix string equality comparison 
am: 1033c6fdbc

Change-Id: I6503cb15fdc0741b6c6c2da9ee14057265f87545
 2016-07-20 00:17:47 +00:00
Paul Stewart
fa4bbf4ad6 WifiEnterpriseConfiguration: Do not print credentials in toString 
am: cc00f4d646

Change-Id: Iece2fd19363a3524746b01cf388566363d678431
 2016-07-20 00:17:43 +00: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
710605dccf DO NOT MERGE: Remove the use of JHEAD in ExifInterface am: 8dbf0b5558 
am: 3c979c6aa6

Change-Id: I1c11953ad5b8f3c14b77f1af12e572f04457a06b
 2016-07-19 00:32:38 +00:00
Sungsoo Lim
3c979c6aa6 DO NOT MERGE: Remove the use of JHEAD in ExifInterface 
am: 8dbf0b5558

Change-Id: I451adfa75a6a95decbc4e16f50319fea50edbbed
 2016-07-19 00:23:32 +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
fionaxu
a3b851d352 DO NOT MERGE revert public api loadSafeLabel am: f44c73abb2 
am: a0263a9909

Change-Id: Iff18193574eeac7e9d0033025a4fff791ba9ccaa
 2016-06-30 22:31:52 +00:00
fionaxu
a0263a9909 DO NOT MERGE revert public api loadSafeLabel 
am: f44c73abb2

Change-Id: If7d00ce5ba4955b3511e6bb46670c45927f9e5d2
 2016-06-30 22:25:47 +00: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
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
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
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
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
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
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
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
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
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
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
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
58048c1f17 NPE fix for SyncStorageEngine read authority am: a962d9eba7 
am: 339c4f2b05

* commit '339c4f2b055d40acea280a2d4b6c83c17f86a8b5':
  NPE fix for SyncStorageEngine read authority
 2016-02-20 00:47:41 +00:00
Shreyas Basarge
339c4f2b05 NPE fix for SyncStorageEngine read authority 
am: a962d9eba7

* commit 'a962d9eba7a8f741ed149964126fb08fe4fd7128':
  NPE fix for SyncStorageEngine read authority
 2016-02-20 00:41:03 +00: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
5fc753acaf DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 
am: 06ef7dfdf0

* commit '06ef7dfdf0a3efb44326228c55309ec6df134376':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 18:14:32 +00:00