John Reck
1fae3b370d
DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours
...
am: bfa719f448
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
2016-05-19 22:21:46 +00:00
John Reck
5527fd1323
DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2
...
am: 1b1fcbaab5
2016-05-19 22:16:42 +00:00
John Reck
1b1fcbaab5
DO NOT MERGE Cherry pick libpng usage fixes
...
am: 7c9f2b8aa2
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
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:
8dc8d37c1de8741d23d2
2016-04-18 15:20:01 -07:00
Todd Kennedy
620a4ed031
DO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9 am: ca13384 -s ours
...
am: c2cc804
2016-04-11 22:17:20 +00:00
Todd Kennedy
c2cc804407
DO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9
...
am: ca13384
2016-04-11 22:12:19 +00:00
Todd Kennedy
ca133845ef
DO NOT MERGE Fix intent filter priorities am: 60351d3
...
am: 3dfc6d9
2016-04-11 22:06:38 +00:00
Todd Kennedy
ebb136cbda
DO NOT MERGE Fix intent filter priorities
...
am: d6174e7
2016-04-11 22:00:31 +00:00
Todd Kennedy
3dfc6d986f
DO NOT MERGE Fix intent filter priorities
...
am: 60351d3
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
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
Samuel Tan
c2712ab7bd
[DO NOT MERGE] Disallow guest user from changing Wifi settings
...
am: d385a6d
2016-03-23 21:35:32 +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
Shreyas Basarge
5e4e02b009
NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: 339c4f2b05 am: 58048c1f17 am: eec587edf1
...
am: 6fc321a66d
2016-02-20 01:37:34 +00:00
Shreyas Basarge
6fc321a66d
NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: 339c4f2b05 am: 58048c1f17
...
am: eec587edf1
2016-02-20 01:27:25 +00:00
Shreyas Basarge
eec587edf1
NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: 339c4f2b05
...
am: 58048c1f17
2016-02-20 01:01:10 +00:00
Shreyas Basarge
58048c1f17
NPE fix for SyncStorageEngine read authority am: a962d9eba7
...
am: 339c4f2b05
2016-02-20 00:47:41 +00:00
Shreyas Basarge
339c4f2b05
NPE fix for SyncStorageEngine read authority
...
am: a962d9eba7
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
a76208d4e4
DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours am: 0d3e46391a
...
am: 9c841923df
2016-01-21 18:37:01 +00:00
Matthew Williams
9c841923df
DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours
...
am: 0d3e46391a
2016-01-21 18:29:33 +00:00
Matthew Williams
0d3e46391a
DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0
...
am: 5fc753acaf
2016-01-21 18:19:53 +00:00
Matthew Williams
5fc753acaf
DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93
...
am: 06ef7dfdf0
2016-01-21 18:14:32 +00:00
Matthew Williams
06ef7dfdf0
DO NOT MERGE Redact Account info from getCurrentSyncs
...
am: a5cafd2a93
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 b63057e698
2016-01-21 14:15:11 +00:00
Matthew Williams
0e7cd0a9fb
Redact Account info from getCurrentSyncs am: f39549e389
...
am: 1a0aed3257
2016-01-20 11:37:17 +00:00
Matthew Williams
1a0aed3257
Redact Account info from getCurrentSyncs
...
am: f39549e389
2016-01-20 11:32:56 +00:00
Matthew Williams
f39549e389
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 b63057e698
2016-01-20 00:02:58 +00:00
Geoff Mendal
4df8f4abe0
Revert "Import translations. DO NOT MERGE"
...
am: 8874f9754f
2016-01-11 14:28:57 +00:00
Geoff Mendal
8874f9754f
Revert "Import translations. DO NOT MERGE"
...
This reverts commit 9f9e736e0d
2016-01-11 14:24:19 +00:00
Geoff Mendal
b441c6926b
Import translations. DO NOT MERGE
...
am: 9f9e736e0d
2016-01-11 13:54:49 +00:00
Geoff Mendal
9f9e736e0d
Import translations. DO NOT MERGE
...
Change-Id: I96e1041e8b74246336e2178ad73cb4d61ad41e37
Auto-generated-cl: translation import
2016-01-11 08:46:48 -05:00
Baligh Uddin
4340e0677b
Fix plurals variable to unblock Translations Pipeline.
...
am: 61f9f31468
2016-01-07 16:18:11 +00:00
Baligh Uddin
61f9f31468
Fix plurals variable to unblock Translations Pipeline.
...
Bug: 19067882
(cherry picked from commit 50d23adfe2
2016-01-06 18:54:41 +00:00
Robert Greenwalt
5946a9b798
resolve merge conflicts of 9887f2f50a to lmp-sprout-dev.
...
am: 5a77651489
2015-12-18 18:38:10 +00:00
Robert Greenwalt
5a77651489
resolve merge conflicts of 9887f2f50a to lmp-sprout-dev.
...
Change-Id: I240cac5cba106a7f0fab61e04af2c757b46b0bb0
2015-12-17 19:32:43 -08:00
Robert Greenwalt
9887f2f50a
Protect some new broadcasts.
...
DEFAULT_*_SUBSCRIPTION_CHANGED broadcasts were added but not protected,
allowing 3rd parties to potentially spoof the bcasts feeding misinformation
to system listeners.
bug:25778215
Change-Id: Ie5fc68a7d2224ce3f6beeca91667fe9b7654f0d5
2015-12-04 15:54:53 -08:00
Sreeram Ramachandran
42faa221d7
Don\'t use framework permission strings for netd permissions. am: f1f45fe012
...
am: 0b542630dd
2015-11-19 16:10:19 +00:00
Sreeram Ramachandran
0b542630dd
Don\'t use framework permission strings for netd permissions.
...
am: f1f45fe012
2015-11-19 15:59:42 +00:00
Sreeram Ramachandran
f1f45fe012
Don't use framework permission strings for netd permissions.
...
These framework permission strings were being used as arbitrary labels
that mapped to netd permissions that have completely different meaning.
This leads to confusion, so use different strings.
This is being cherry picked from lmp-mr1-dev to lmp-dev to fix failures
when creating restricted networks due to prior back-port a1204420f8f120839
2015-11-18 17:04:18 +00:00
Michael Wright
84669ca8de
DO NOT MERGE. Prevent recents from coming up when in SUW
...
Bug: 25229538
Change-Id: If4f276d3f7c04fd89011068d90a3c3c60593bc05
2015-11-13 21:52:18 +00:00
Winson Chung
bb4da4efc3
Merge "DO NOT MERGE Ensure that the device is provisioned before showing Recents." into lmp-mr1-dev
2015-11-13 18:02:38 +00:00
Shreyas Basarge
bf29f10c1e
Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812 am: f5f03a19af
...
am: 44368e6dd4
2015-11-13 02:09:36 +00:00
Shreyas Basarge
44368e6dd4
Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8 am: cc7c1d3812
...
am: f5f03a19af
2015-11-13 02:03:01 +00:00
Shreyas Basarge
f5f03a19af
Sync extras bundle comparison can throw NPE am: 2f137b7705 am: 294611faa8
...
am: cc7c1d3812
2015-11-13 01:56:34 +00:00
Matthew Williams
a0d20db02f
Sync extras bundle comparison can throw NPE am: c0f39c1ece
...
am: 34b700a7c2
2015-11-13 01:50:11 +00:00
Shreyas Basarge
cc7c1d3812
Sync extras bundle comparison can throw NPE am: 2f137b7705
...
am: 294611faa8
2015-11-13 01:50:02 +00:00
