OSDN Git Service
John Reck [Thu, 19 May 2016 22:16:42 +0000 (22:16 +0000)]
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
John Reck [Thu, 19 May 2016 19:26:24 +0000 (19:26 +0000)]
DO NOT MERGE Cherry pick libpng usage fixes
am:
7c9f2b8aa2
* commit '
7c9f2b8aa2bdbbd5ee9fc6ff52161d994a10b865':
DO NOT MERGE Cherry pick libpng usage fixes
Change-Id: If3b1a86798e4f8064fc1ad912d91b1106b24739a
John Reck [Mon, 26 Aug 2013 23:53:40 +0000 (16:53 -0700)]
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
Todd Kennedy [Mon, 11 Apr 2016 22:06:38 +0000 (22:06 +0000)]
DO NOT MERGE Fix intent filter priorities am:
60351d3
am:
3dfc6d9
* commit '
3dfc6d986f6142b1e0020c9970f626c7c435711e':
DO NOT MERGE Fix intent filter priorities
Change-Id: Id396cca79db8f830a513746f387fb866c773c778
Todd Kennedy [Mon, 11 Apr 2016 22:00:27 +0000 (22:00 +0000)]
DO NOT MERGE Fix intent filter priorities
am:
60351d3
* commit '
60351d3be29977dfe0b422de797a0429edf500b7':
DO NOT MERGE Fix intent filter priorities
Change-Id: Ieca2ee83f22e5d4083f895f52d42a2f697920be7
Todd Kennedy [Mon, 4 Apr 2016 19:29:59 +0000 (12:29 -0700)]
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
Shreyas Basarge [Sat, 20 Feb 2016 00:47:41 +0000 (00:47 +0000)]
NPE fix for SyncStorageEngine read authority am:
a962d9eba7
am:
339c4f2b05
* commit '
339c4f2b055d40acea280a2d4b6c83c17f86a8b5':
NPE fix for SyncStorageEngine read authority
Shreyas Basarge [Sat, 20 Feb 2016 00:41:03 +0000 (00:41 +0000)]
NPE fix for SyncStorageEngine read authority
am:
a962d9eba7
* commit '
a962d9eba7a8f741ed149964126fb08fe4fd7128':
NPE fix for SyncStorageEngine read authority
Shreyas Basarge [Thu, 18 Feb 2016 11:56:05 +0000 (11:56 +0000)]
NPE fix for SyncStorageEngine read authority
Add a null check after an authority is read
from disk.
Bug:
26513719
Change-Id: I18f01828141110e776cc96f3b3be3d80125e70c1
Matthew Williams [Thu, 21 Jan 2016 18:14:32 +0000 (18:14 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs am:
a5cafd2a93
am:
06ef7dfdf0
* commit '
06ef7dfdf0a3efb44326228c55309ec6df134376':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Thu, 21 Jan 2016 18:07:55 +0000 (18:07 +0000)]
DO NOT MERGE Redact Account info from getCurrentSyncs
am:
a5cafd2a93
* commit '
a5cafd2a93ce1c481328e2ce25c3bf2a19b81601':
DO NOT MERGE Redact Account info from getCurrentSyncs
Matthew Williams [Tue, 19 Jan 2016 23:04:04 +0000 (23:04 +0000)]
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)
Shreyas Basarge [Fri, 13 Nov 2015 01:50:02 +0000 (01:50 +0000)]
Sync extras bundle comparison can throw NPE am:
2f137b7705
am:
294611faa8
* commit '
294611faa8bd1bdbf75adc3cee835b69d348df86':
Sync extras bundle comparison can throw NPE
Shreyas Basarge [Fri, 13 Nov 2015 01:41:59 +0000 (01:41 +0000)]
Sync extras bundle comparison can throw NPE
am:
2f137b7705
* commit '
2f137b7705875ee026319abb8e512d918c118222':
Sync extras bundle comparison can throw NPE
Shreyas Basarge [Thu, 12 Nov 2015 15:32:44 +0000 (15:32 +0000)]
Sync extras bundle comparison can throw NPE
Bug:
23591205
Change-Id: I960dfcc1584c0a17685790d5d722eaf11b930e25
Zach Jang [Thu, 17 Sep 2015 20:24:00 +0000 (20:24 +0000)]
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
Zach Jang [Thu, 17 Sep 2015 20:09:55 +0000 (20:09 +0000)]
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
Zach Jang [Fri, 11 Sep 2015 23:35:04 +0000 (16:35 -0700)]
DO NOT MERGE - Backport of ag/748165 to klp-dev
Security patch level in Settings
b/
23946860
Change-Id: I610d4dedf18fe1825d7df5febf29e6f0c006490d
Sebastien Hertz [Fri, 21 Aug 2015 10:09:22 +0000 (10:09 +0000)]
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
Sebastien Hertz [Fri, 21 Aug 2015 09:50:24 +0000 (09:50 +0000)]
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
Sebastien Hertz [Mon, 10 Aug 2015 16:55:34 +0000 (18:55 +0200)]
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
Wale Ogunwale [Wed, 1 Jul 2015 16:39:11 +0000 (16:39 +0000)]
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
Wale Ogunwale [Wed, 1 Jul 2015 16:18:17 +0000 (16:18 +0000)]
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
Wale Ogunwale [Wed, 1 Jul 2015 16:06:32 +0000 (16:06 +0000)]
Merge "Prevent system uid component from running in an app process" into klp-dev
Amit Mahajan [Fri, 26 Jun 2015 22:31:49 +0000 (22:31 +0000)]
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.
Amit Mahajan [Fri, 26 Jun 2015 22:14:24 +0000 (22:14 +0000)]
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.
Amit Mahajan [Thu, 11 Jun 2015 00:02:39 +0000 (17:02 -0700)]
DO NOT MERGE Change to add STK_PERMISSION for stk related commands.
Bug:
21697171
Change-Id: I7649c7341428194963ac74e9ae622dfa76ea738b
Wale Ogunwale [Thu, 25 Jun 2015 16:29:58 +0000 (09:29 -0700)]
Prevent system uid component from running in an app process
Bug:
21669445
Change-Id: I792c6e676d4b6d54a51228d264130b8125075d98
Joe Fernandez [Fri, 19 Jun 2015 23:01:45 +0000 (23:01 +0000)]
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.
Joe Fernandez [Fri, 19 Jun 2015 22:49:26 +0000 (22:49 +0000)]
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
Leon Scroggins III [Tue, 2 Jun 2015 13:12:12 +0000 (13:12 +0000)]
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
Leon Scroggins III [Tue, 2 Jun 2015 12:59:29 +0000 (12:59 +0000)]
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
Leon Scroggins III [Fri, 29 May 2015 20:13:11 +0000 (16:13 -0400)]
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
bug:
20883006
Change-Id: I4f109667fb210a80fbddddf5f1bfb7ef3a02b6ce
Leon Scroggins III [Wed, 27 May 2015 14:53:00 +0000 (14:53 +0000)]
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
Leon Scroggins III [Wed, 27 May 2015 14:37:18 +0000 (14:37 +0000)]
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
Leon Scroggins III [Tue, 26 May 2015 20:41:09 +0000 (16:41 -0400)]
Check that the parcel contained the expected amount of region data. DO NOT MERGE
bug:
20883006
Change-Id: Ib47a8ec8696dbc37e958b8dbceb43fcbabf6605b
Leon Scroggins III [Thu, 23 Apr 2015 16:20:02 +0000 (16:20 +0000)]
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
Leon Scroggins III [Thu, 23 Apr 2015 15:48:12 +0000 (15:48 +0000)]
am
69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit '
69b8e962e1b8346b33a2c14889547a0ac00c8b17':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Leon Scroggins III [Wed, 15 Apr 2015 12:16:29 +0000 (08:16 -0400)]
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
Jon Larimer [Fri, 30 Jan 2015 22:01:50 +0000 (22:01 +0000)]
am
545dd853: am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
545dd853bffbf778a0a44816ac6ed381b13f2158':
Fix build breakage in older branches by avoiding <> notation
Jon Larimer [Fri, 30 Jan 2015 21:54:31 +0000 (21:54 +0000)]
am
9a425aa7: am
159aa735: am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
9a425aa71c0ae6fb8c9c84d3e71321a44433d861':
Fix build breakage in older branches by avoiding <> notation
Jon Larimer [Fri, 30 Jan 2015 21:44:17 +0000 (21:44 +0000)]
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
Jon Larimer [Fri, 30 Jan 2015 21:28:59 +0000 (21:28 +0000)]
am
d4031809: am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
d403180997898c98f0be15b810c4c9dd9002f92c':
Fix build breakage in older branches by avoiding <> notation
Jon Larimer [Fri, 30 Jan 2015 19:30:57 +0000 (19:30 +0000)]
am
48c95c43: Fix build breakage in older branches by avoiding <> notation
* commit '
48c95c4370533bf27e537cbca1e64d060a016c5f':
Fix build breakage in older branches by avoiding <> notation
Jon Larimer [Thu, 29 Jan 2015 20:54:43 +0000 (15:54 -0500)]
Fix build breakage in older branches by avoiding <> notation
Change-Id: I5e3d523dac1f364f52f0d2cab479c1705d667e5a
Jon Larimer [Thu, 29 Jan 2015 18:36:59 +0000 (18:36 +0000)]
am
88add689: am
a5ccca24: am
2982d648: am
de9a76ed: am
fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
* commit '
88add68942694fc643518bcf5c26f6c3df7e9aa0':
Fix ParceledListSlice to enforce the same concrete types among its elements.
Jon Larimer [Thu, 29 Jan 2015 18:36:55 +0000 (18:36 +0000)]
am
a43742ec: am
6813f29e: am
76cdbb04: (-s ours) am
d0318a63: am
7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
* commit '
a43742ec620cb11faffa2c2b1847dc1accce5736':
DO NOT MERGE Restore calling identity before checking permission
Jon Larimer [Thu, 29 Jan 2015 18:32:09 +0000 (18:32 +0000)]
am
a5ccca24: am
2982d648: am
de9a76ed: am
fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
* commit '
a5ccca242747d59233ec5ecebc20d4a721e7850e':
Fix ParceledListSlice to enforce the same concrete types among its elements.
Jon Larimer [Thu, 29 Jan 2015 18:32:05 +0000 (18:32 +0000)]
am
6813f29e: am
76cdbb04: (-s ours) am
d0318a63: am
7dd12d76: Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
* commit '
6813f29e3247f0567b77fe7eb451215b5fadf67b':
DO NOT MERGE Restore calling identity before checking permission
Jon Larimer [Thu, 29 Jan 2015 18:25:28 +0000 (18:25 +0000)]
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.
Jon Larimer [Thu, 29 Jan 2015 18:25:24 +0000 (18:25 +0000)]
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
Jon Larimer [Thu, 29 Jan 2015 18:12:01 +0000 (18:12 +0000)]
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.
Jon Larimer [Thu, 29 Jan 2015 18:11:57 +0000 (18:11 +0000)]
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
Jon Larimer [Thu, 29 Jan 2015 18:02:27 +0000 (18:02 +0000)]
am
64d6bacf: am
2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev
* commit '
64d6bacf13e4ae913c52b773439a542dc5b2b714':
DO NOT MERGE Restore calling identity before checking permission
Jon Larimer [Thu, 29 Jan 2015 18:00:58 +0000 (18:00 +0000)]
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.
Jon Larimer [Thu, 29 Jan 2015 18:00:55 +0000 (18:00 +0000)]
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
Jon Larimer [Thu, 29 Jan 2015 17:55:10 +0000 (17:55 +0000)]
am
2f4ad45d: Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev
* commit '
2f4ad45d60aac5b2b025e9eac34e289d406645dc':
DO NOT MERGE Restore calling identity before checking permission
Jon Larimer [Thu, 29 Jan 2015 17:48:57 +0000 (17:48 +0000)]
Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
Jon Larimer [Thu, 29 Jan 2015 17:48:19 +0000 (17:48 +0000)]
Merge "DO NOT MERGE Restore calling identity before checking permission" into klp-dev
Jon Larimer [Thu, 29 Jan 2015 17:48:14 +0000 (17:48 +0000)]
Merge "DO NOT MERGE Restore calling identity before checking permission" into jb-mr2-dev
Adam Lesinski [Fri, 7 Nov 2014 19:26:14 +0000 (11:26 -0800)]
Fix ParceledListSlice to enforce the same concrete types among its elements.
Bug:
17671747
Change-Id: I896f75738e5b464ccb6c03290f139cc2fa72f966
(cherry picked from commit
3df1c38ee098872352086e03d6f1adb16796ee29)
Leon Scroggins III [Tue, 27 Jan 2015 22:48:29 +0000 (22:48 +0000)]
am
1dbbc204: am
6106f6a4: am
93522968: am
01287549: am
9a6143fa: Handle bad ninepatch data.
* commit '
1dbbc2045ae16a4923b30c9576703d02a4363529':
Handle bad ninepatch data.
Leon Scroggins III [Tue, 27 Jan 2015 22:42:03 +0000 (22:42 +0000)]
am
6106f6a4: am
93522968: am
01287549: am
9a6143fa: Handle bad ninepatch data.
* commit '
6106f6a490cb5816602e8e3ae84a5c653dda44d3':
Handle bad ninepatch data.
Leon Scroggins III [Tue, 27 Jan 2015 22:31:47 +0000 (22:31 +0000)]
am
93522968: am
01287549: am
9a6143fa: Handle bad ninepatch data.
* commit '
9352296810926eae663477526545a55e1b1f7a27':
Handle bad ninepatch data.
Leon Scroggins III [Tue, 27 Jan 2015 22:17:11 +0000 (22:17 +0000)]
am
01287549: am
9a6143fa: Handle bad ninepatch data.
* commit '
01287549ad415c51377683696eb37c362d43061a':
Handle bad ninepatch data.
Leon Scroggins III [Tue, 27 Jan 2015 22:01:08 +0000 (22:01 +0000)]
am
9a6143fa: Handle bad ninepatch data.
* commit '
9a6143fab7d93797e4b22a12b89e07c160e5c31d':
Handle bad ninepatch data.
Leon Scroggins III [Tue, 27 Jan 2015 16:12:02 +0000 (11:12 -0500)]
Handle bad ninepatch data.
Changes proposed by Ben Hawkes of Google Project Zero.
NinePatchPeeker.cpp:
Instead of asserting, return false for bad data.
ResourceTypes.h:
Store ninepatch values as unsigned.
BUG:
19151999
Change-Id: Ibe35e7569f632c6bb8a34a7701e26bb6ed547ec2
(cherry picked from commit
a730ef3f77fc495bc90199b4d45efab26d609782)
Ricardo Cervera [Fri, 16 Jan 2015 17:21:32 +0000 (17:21 +0000)]
am
98f07d90: am
92f6a747: docs: Added info on noHistory and onActivityResult(). Bug:
13807256
* commit '
98f07d901492335f51258655fbfa032fa3f2d58e':
docs: Added info on noHistory and onActivityResult(). Bug:
13807256
Ricardo Cervera [Fri, 16 Jan 2015 17:14:44 +0000 (17:14 +0000)]
am
92f6a747: docs: Added info on noHistory and onActivityResult(). Bug:
13807256
* commit '
92f6a747085b4b5ed692de4bdb0050c096eae393':
docs: Added info on noHistory and onActivityResult(). Bug:
13807256
Todd Kennedy [Wed, 14 Jan 2015 23:40:46 +0000 (15:40 -0800)]
DO NOT MERGE Restore calling identity before checking permission
Using the system service identity to check the CHANGE_CONFIGURATION
permission isn't likely to catch a security violation. Changing
back to the original caller and then checking permissions is
preferred.
Cherry picked from lmp. Fixes bug
15989465.
Change-Id: Iff08d04422bcc052a487194154f1fd0d727d38f4
Todd Kennedy [Wed, 14 Jan 2015 23:25:13 +0000 (15:25 -0800)]
DO NOT MERGE Restore calling identity before checking permission
Using the system service identity to check the CHANGE_CONFIGURATION
permission isn't likely to catch a security violation. Changing
back to the original caller and then checking permissions is
preferred.
Cherry picked from lmp. Fixes bug
15989465.
Change-Id: Iff08d04422bcc052a487194154f1fd0d727d38f4
Deepanshu Gupta [Sat, 10 Jan 2015 02:16:44 +0000 (02:16 +0000)]
am
74147527: am
8505c387: Special case AppCompat to show action bar.
* commit '
74147527357b9abd9d30b3a2dbd72a5172a35625':
Special case AppCompat to show action bar.
Deepanshu Gupta [Sat, 10 Jan 2015 02:10:55 +0000 (02:10 +0000)]
am
8505c387: Special case AppCompat to show action bar.
* commit '
8505c3870a17f41d23329344fe381cd9ff324bd2':
Special case AppCompat to show action bar.
Deepanshu Gupta [Mon, 14 Jul 2014 22:50:49 +0000 (15:50 -0700)]
Support Locale.toLanguageTag on Java 6
Change-Id: I255e79e2c288cd24b350b7c26128bbbb0b2cb9a3
(cherry picked from commit
5cd9dde5a2a77c5095f985186d8f03147fd22870)
Deepanshu Gupta [Thu, 10 Jul 2014 20:20:42 +0000 (13:20 -0700)]
LayoutLib: Fix System.arraycopy()
Framework has specialized versions of java.lang.System.arraycopy() for
all primitive data types. These versions are not present on the Desktop
VM. This change replaces calls to any of the specialized versions with
the more general alternative - the one using Objects.
Note that this was already being done for char.
Change-Id: If1584125fea8ecc080fb39a5ee6cdb4d922d0c98
(cherry picked from commit
e1960cc0b541cda93db94de5bef42dff922b9ec3)
Deepanshu Gupta [Fri, 9 Jan 2015 03:10:07 +0000 (19:10 -0800)]
Special case AppCompat to show action bar.
Bug: http://b.android.com/78944
Change-Id: I02d68d592d812016744716f99376cfefd519b21b
Eric Laurent [Mon, 10 Nov 2014 23:33:52 +0000 (23:33 +0000)]
am
df878bd3: am
ced2f74a: am
e8c1a97f: am
3b92fc04: am
1c2b0d52: AudioEffect JNI: use new max preprocessing constant
* commit '
df878bd3fc63f26e91b055e39ba63c53c14b31a0':
AudioEffect JNI: use new max preprocessing constant
Eric Laurent [Mon, 10 Nov 2014 23:29:07 +0000 (23:29 +0000)]
am
ced2f74a: am
e8c1a97f: am
3b92fc04: am
1c2b0d52: AudioEffect JNI: use new max preprocessing constant
* commit '
ced2f74ac170439231f189e31538b9f403909966':
AudioEffect JNI: use new max preprocessing constant
Eric Laurent [Mon, 10 Nov 2014 23:24:02 +0000 (23:24 +0000)]
am
e8c1a97f: am
3b92fc04: am
1c2b0d52: AudioEffect JNI: use new max preprocessing constant
* commit '
e8c1a97fa33797df528265b6f0b0c2c39ac2c589':
AudioEffect JNI: use new max preprocessing constant
Eric Laurent [Mon, 10 Nov 2014 23:20:06 +0000 (23:20 +0000)]
am
3b92fc04: am
1c2b0d52: AudioEffect JNI: use new max preprocessing constant
* commit '
3b92fc04700a68dab3c3c4a873535837c4e51e8b':
AudioEffect JNI: use new max preprocessing constant
Eric Laurent [Mon, 10 Nov 2014 23:11:00 +0000 (23:11 +0000)]
am
1c2b0d52: AudioEffect JNI: use new max preprocessing constant
* commit '
1c2b0d52144dc94a7d1dcefb7e4fbd7fb29f5202':
AudioEffect JNI: use new max preprocessing constant
Eric Laurent [Wed, 5 Nov 2014 20:18:05 +0000 (12:18 -0800)]
AudioEffect JNI: use new max preprocessing constant
Bug:
18226810.
Change-Id: Ica5677da247268306b34dfce38f25394586817fd
(cherry picked from commit
b27a8a5bcc40054f6d775d070bc2de6eb996d1c2)
Ricardo Cervera [Thu, 6 Nov 2014 17:03:00 +0000 (17:03 +0000)]
am
e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200" into klp-modular-docs
* commit '
e7cd5f2e9cf76ed789534dfe5cc60c27a3b4984f':
docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200
Ricardo Cervera [Thu, 6 Nov 2014 16:57:12 +0000 (16:57 +0000)]
Merge "docs: Add API_UNAVAILABLE case for Wear. Bug:
17753200" into klp-modular-docs
Ricardo Cervera [Fri, 4 Apr 2014 18:17:06 +0000 (11:17 -0700)]
docs: Added info on noHistory and onActivityResult(). Bug:
13807256
Change-Id: Iae4901a311e76401396f89c552e5b27a49c65c83
Tom Taylor [Tue, 4 Nov 2014 19:18:50 +0000 (19:18 +0000)]
am
7c570346: am
47419a44: am
192a3904: am
23fb2972: am
d7044fe1: am
b2e54c1b: am
75e7fbaa: am
37906e6e: am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
7c570346082f7f0399614b87f9a4c67d1ae1f1c6':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 19:14:26 +0000 (19:14 +0000)]
am
47419a44: am
192a3904: am
23fb2972: am
d7044fe1: am
b2e54c1b: am
75e7fbaa: am
37906e6e: am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
47419a443591ea3c641da8720514e1384dd75440':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 19:08:16 +0000 (19:08 +0000)]
am
192a3904: am
23fb2972: am
d7044fe1: am
b2e54c1b: am
75e7fbaa: am
37906e6e: am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
192a39044290be84a1086a876a9d4ab0571ab97b':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 19:00:42 +0000 (19:00 +0000)]
am
23fb2972: am
d7044fe1: am
b2e54c1b: am
75e7fbaa: am
37906e6e: am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
23fb29723c47b2aeb6aecc382a503630a8d8e983':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 18:50:31 +0000 (18:50 +0000)]
am
d7044fe1: am
b2e54c1b: am
75e7fbaa: am
37906e6e: am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
d7044fe1f12b48cc7ba6803772ec4a2f2fe14c19':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 18:39:38 +0000 (18:39 +0000)]
am
b2e54c1b: am
75e7fbaa: am
37906e6e: am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
b2e54c1b46c275d017fb5bef17add3eb4c465508':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 18:30:23 +0000 (18:30 +0000)]
am
75e7fbaa: am
37906e6e: am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
75e7fbaa83448753a1db9647e58693f1a281900c':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 18:23:51 +0000 (18:23 +0000)]
am
37906e6e: am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
37906e6ebc1985ad4b7151116b7cf4fef8322b19':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 18:18:16 +0000 (18:18 +0000)]
am
44f6d0d5: am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
44f6d0d5810ce507394cc514481d977315d2496f':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 18:11:02 +0000 (18:11 +0000)]
am
4c5b16d7: am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
4c5b16d7409bbd947af3e0dadf4b1901b48e4cd7':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 18:03:07 +0000 (18:03 +0000)]
am
66aa87ae: am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
66aa87ae0355a4e6c8ed56704fec4fb225ed18f6':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 17:53:14 +0000 (17:53 +0000)]
am
90743d64: am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
90743d6409eaecdc869fdcf891ffff8b0a5757ec':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 17:49:26 +0000 (17:49 +0000)]
am
52449372: am
bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
5244937248b7283b5cf586b5637a108579217d4e':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 17:43:41 +0000 (17:43 +0000)]
am
bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
bfb7ffeb3e240784c1ea2a50187c120e6445b20e':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
Tom Taylor [Tue, 4 Nov 2014 17:42:20 +0000 (17:42 +0000)]
am
bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
* commit '
bc57a1f81317f765865e3e0c00d3421a3084955e':
Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
OSDN Git Service
