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

123051 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Matthew Williams
06ef7dfdf0 DO NOT MERGE Redact Account info from getCurrentSyncs 
am: a5cafd2a93

* commit 'a5cafd2a93ce1c481328e2ce25c3bf2a19b81601':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 18:07:55 +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
cc7c1d3812 Sync extras bundle comparison can throw NPE am: 2f137b7705 
am: 294611faa8

* commit '294611faa8bd1bdbf75adc3cee835b69d348df86':
  Sync extras bundle comparison can throw NPE
 2015-11-13 01:50:02 +00:00
Shreyas Basarge
294611faa8 Sync extras bundle comparison can throw NPE 
am: 2f137b7705

* commit '2f137b7705875ee026319abb8e512d918c118222':
  Sync extras bundle comparison can throw NPE
 2015-11-13 01:41:59 +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
fe4cbf2b1b am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings 
* commit 'cff4e09e26e3b976aa0273df78e89f592fc6d287':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
 2015-09-17 20:24:00 +00:00
Zach Jang
cff4e09e26 am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings 
* commit 'bdf7f3583c637f370e97e74526df14b9c70e6493':
  DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
 2015-09-17 20:09:55 +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
55f86b1811 am 9e7a0ddb: am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE 
* commit '9e7a0ddb65ad0bd04d49a24a68aa96730b2ba9a1':
  Allow debugging only for apps forked from zygote DO NOT MERGE
 2015-08-21 10:09:22 +00:00
Sebastien Hertz
9e7a0ddb65 am 18089ceb: Allow debugging only for apps forked from zygote DO NOT MERGE 
* commit '18089ceb71ad4ce2332096b8e7b5f8c1f8e263db':
  Allow debugging only for apps forked from zygote DO NOT MERGE
 2015-08-21 09:50:24 +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
f3dbb57ee8 am c215b2b2: am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev 
* commit 'c215b2b24575e6d7693f396c7fdfe675d5ea9d1c':
  Prevent system uid component from running in an app process
 2015-07-01 16:39:11 +00:00
Wale Ogunwale
c215b2b245 am dc9cfca8: Merge "Prevent system uid component from running in an app process" into klp-dev 
* commit 'dc9cfca80139714ca37122148d041beedbf0ceb2':
  Prevent system uid component from running in an app process
 2015-07-01 16:18:17 +00: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
23444e76d2 am eee86342: am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit 'eee86342713a7c89c30933a22f8b7e190d3af10f':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-26 22:31:49 +00:00
Amit Mahajan
eee8634271 am 9edf7ad5: DO NOT MERGE Change to add STK_PERMISSION for stk related commands. 
* commit '9edf7ad563ead119698ac3106b699515bd160ffe':
  DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
 2015-06-26 22:14:24 +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
Joe Fernandez
765255b412 am 6f8dab04: Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs 
* commit '6f8dab04572c772decef9b7ec5380f8e240a51ce':
  Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time.
 2015-06-19 23:01:45 +00:00
Joe Fernandez
6f8dab0457 Merge "Fixes a typo where parens were used instead of curly braces, preventing a link from being created at build time." into klp-modular-docs 2015-06-19 22:49:29 +00:00
Leon Scroggins III
5b751c8007 am 7496e153: am 0d208173: DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes 
* commit '7496e153f4308b39df9c53615770f44f593c3504':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
 2015-06-02 13:12:12 +00:00
Leon Scroggins III
7496e153f4 am 0d208173: DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes 
* commit '0d2081734ce124191ac1f3e8585336daa414abbe':
  DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
 2015-06-02 12:59:29 +00: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
425d7c8713 am 11297581: am 18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE 
* commit '11297581667128d2568a47ee03acab5c4f9f2784':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE
 2015-05-27 14:53:00 +00:00
Leon Scroggins III
1129758166 am 18d79267: Check that the parcel contained the expected amount of region data. DO NOT MERGE 
* commit '18d7926709451b9e767731f46778e4238fc8e3b5':
  Check that the parcel contained the expected amount of region data. DO NOT MERGE
 2015-05-27 14:37:18 +00: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
ee35410ff8 am a7501119: am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE 
* commit 'a7501119e341626536ce12c3539c2f9a986a2945':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
 2015-04-23 16:20:02 +00:00