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

178381 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Reck
8238207ce6 DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours am: 1fae3b370d 
am: 1da8c9baa2

* commit '1da8c9baa2d2da49e14224d34995337c4709b1ad':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: Ibff7c25c48909cb77ee498f0fb3030d22a3eb381
 2016-05-19 22:37:04 +00:00
John Reck
1da8c9baa2 DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours 
am: 1fae3b370d

* commit '1fae3b370dfd9536da166ef561df630cdff02b83':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: I5015ea3a7926caf4cf2cf27feff0653507063ac3
 2016-05-19 22:32:47 +00:00
John Reck
1fae3b370d DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours 
am: bfa719f448  -s ours

* commit 'bfa719f448ab4d90368a3cdc556e515253528e17':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: I6597a3a69b8037af401000ab0123ea6d050f58ed
 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  -s ours

* commit '5527fd1323cc1d6470576386c8298f45c3895d75':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: I14fe8c28299ba6bb94cd51d1bc9c637be7766cbd
 2016-05-19 22:21:46 +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
Christopher Tate
44e07e07a1 resolve merge conflicts of 5e380f0 to lmp-mr1-ub-dev 
Change-Id: Ie8d3c154f4c98bb1c2a1954ff1dabc8f5bc20b71
 2016-04-20 11:37:20 -07:00
Christopher Tate
5e380f096c resolve merge conflicts of 7641889 to lmp-mr1-dev 
am: cebcde3b5a

* commit 'cebcde3b5a1e406d953629d5b4c87347921a17de':
  Kill the real/isolated uid group, not the ApplicationInfo uid

Change-Id: I6e3c41c59dfe4105780ad7d6d20f9096aabd575a
 2016-04-20 00:05:54 +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:

8dc8d37c1d7d694016f1ec2b3cea5fb723567be8
e8741d23d2dd05c4cb3fed5ee6a4040ee96a60e3

Bug 19285814

Change-Id: I59bcc8f1d41c426e9da635bea9ad1d7c6756d5aa
 2016-04-18 15:20:01 -07:00
Todd Kennedy
e265f35caa DO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9 am: ca13384 -s ours am: c2cc804 -s ours am: 620a4ed 
am: be58fe0

* commit 'be58fe035e8a852c903c3c1c397eaa980670d8f9':
  DO NOT MERGE Fix intent filter priorities

Change-Id: I7cd88d627c03199ee8252862c73f88d0b6507dd9
 2016-04-11 22:27:50 +00:00
Todd Kennedy
be58fe035e DO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9 am: ca13384 -s ours am: c2cc804 -s ours 
am: 620a4ed

* commit '620a4ed031d807c6945d531d1a98374eba369449':
  DO NOT MERGE Fix intent filter priorities

Change-Id: I33b683fabecb18a08e10bfd68b9c3ec6abe35f0f
 2016-04-11 22:22:35 +00:00
Todd Kennedy
620a4ed031 DO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9 am: ca13384 -s ours 
am: c2cc804  -s ours

* commit 'c2cc804407212d3431419cded89de1fd6269eaa2':
  DO NOT MERGE Fix intent filter priorities

Change-Id: I60eb783f06f0eb0c09c21ea6ec0fc10340ff63c6
 2016-04-11 22:17:20 +00:00
Todd Kennedy
c2cc804407 DO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9 
am: ca13384  -s ours

* commit 'ca133845ef815d7cc1f036b1355130a8a867a98c':
  DO NOT MERGE Fix intent filter priorities

Change-Id: I88811d2bce66e53998360909612003873e9407af
 2016-04-11 22:12:19 +00:00
Todd Kennedy
a73fa08457 DO NOT MERGE Fix intent filter priorities am: d6174e7 -s ours am: ebb136c 
am: 6e0aff3

* commit '6e0aff30cfe571c117a8f20b15c3b27f3aecc7fa':
  DO NOT MERGE Fix intent filter priorities

Change-Id: Icc23a9c2a4dafad3ecbf91e27647318c33b39d6a
 2016-04-11 22:12:09 +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
6e0aff30cf DO NOT MERGE Fix intent filter priorities am: d6174e7 -s ours 
am: ebb136c

* commit 'ebb136cbda0ba1caff3c482e00aff416edc5117f':
  DO NOT MERGE Fix intent filter priorities

Change-Id: I20536d7bca605aadb8cec8bee5383e1aef9742c9
 2016-04-11 22:06:35 +00:00
Todd Kennedy
ebb136cbda DO NOT MERGE Fix intent filter priorities 
am: d6174e7  -s ours

* commit 'd6174e74020aaec97db5780837a3edcd787018bf':
  DO NOT MERGE Fix intent filter priorities

Change-Id: I9d089bfaf20baee25c1999d24020956dcbc2509e
 2016-04-11 22:00:31 +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
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
f4fd20168f [DO NOT MERGE] Disallow guest user from changing Wifi settings am: d385a6d -s ours am: c2712ab 
am: 3253022

* commit '325302206a0129bdf16a486232d5864d71e62a44':
  [DO NOT MERGE] Disallow guest user from changing Wifi settings
 2016-03-23 21:45:25 +00:00
Samuel Tan
325302206a [DO NOT MERGE] Disallow guest user from changing Wifi settings am: d385a6d -s ours 
am: c2712ab

* commit 'c2712ab7bd3bdeaf8945bc80154f402e1cf727bc':
  [DO NOT MERGE] Disallow guest user from changing Wifi settings
 2016-03-23 21:40:45 +00:00
Samuel Tan
c2712ab7bd [DO NOT MERGE] Disallow guest user from changing Wifi settings 
am: d385a6d  -s ours

* commit 'd385a6d95fc830ecc8d55937e9f46b14165d4b34':
  [DO NOT MERGE] Disallow guest user from changing Wifi settings
 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
4aa78554df NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: 339c4f2b05 am: 58048c1f17 am: eec587edf1 am: 6fc321a66d am: 5e4e02b009 
am: 242bdb6d5b

* commit '242bdb6d5bec6e42b7caf42fd08ded0accc70fb8':
  NPE fix for SyncStorageEngine read authority
 2016-02-20 01:53:57 +00:00
Shreyas Basarge
242bdb6d5b NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: 339c4f2b05 am: 58048c1f17 am: eec587edf1 am: 6fc321a66d 
am: 5e4e02b009

* commit '5e4e02b00999db4513f43d5ddfdd2c71212cc503':
  NPE fix for SyncStorageEngine read authority
 2016-02-20 01:45:01 +00:00
Shreyas Basarge
5e4e02b009 NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: 339c4f2b05 am: 58048c1f17 am: eec587edf1 
am: 6fc321a66d

* commit '6fc321a66d74401e00b2203817f75e29a0426ab7':
  NPE fix for SyncStorageEngine read authority
 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

* commit 'eec587edf1fb4e7bc5f38695f478f191dee1e2d4':
  NPE fix for SyncStorageEngine read authority
 2016-02-20 01:27:25 +00:00
Shreyas Basarge
eec587edf1 NPE fix for SyncStorageEngine read authority am: a962d9eba7 am: 339c4f2b05 
am: 58048c1f17

* commit '58048c1f17d54166c6a048af2365d17dd32f4d57':
  NPE fix for SyncStorageEngine read authority
 2016-02-20 01:01:10 +00: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
1f6dbd910b DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours am: 0d3e46391a am: 9c841923df -s ours am: a76208d4e4 
am: 9e52b29fe2

* commit '9e52b29fe27035df4720db582637157ce9ce268d':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 18:48:55 +00:00
Matthew Williams
9e52b29fe2 DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93 am: 06ef7dfdf0 am: 5fc753acaf -s ours am: 0d3e46391a am: 9c841923df -s ours 
am: a76208d4e4

* commit 'a76208d4e4f7f690f5fde4210a00a5c3022721bd':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 18:41:55 +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  -s ours

* commit '9c841923dfc36db046909e388b8a2fda3b694be1':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 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

* commit '0d3e46391a0ffa0c428b8c8082195d1cbc4b1efa':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 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  -s ours

* commit '5fc753acaf9731742957db256b2818376fe8c4a4':
  DO NOT MERGE Redact Account info from getCurrentSyncs
 2016-01-21 18:19:53 +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
Matthew Williams
a947baa87c Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 am: 0e7cd0a9fb 
am: be136b7a3e

* commit 'be136b7a3e3f117dea283d194d1e6979fb47662b':
  Redact Account info from getCurrentSyncs
 2016-01-20 11:46:39 +00:00
Matthew Williams
be136b7a3e Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 
am: 0e7cd0a9fb

* commit '0e7cd0a9fbdcb48c551d54627eb964364dd946d0':
  Redact Account info from getCurrentSyncs
 2016-01-20 11:41:23 +00:00
Matthew Williams
0e7cd0a9fb Redact Account info from getCurrentSyncs am: f39549e389 
am: 1a0aed3257

* commit '1a0aed3257ad1b8216930928090885cf4210bd87':
  Redact Account info from getCurrentSyncs
 2016-01-20 11:37:17 +00:00
Matthew Williams
1a0aed3257 Redact Account info from getCurrentSyncs 
am: f39549e389

* commit 'f39549e389edf62f43bacd95a1b8580d75ad77ed':
  Redact Account info from getCurrentSyncs
 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 b63057e698a01dafcefc7ba09b397b0336bba43d)
 2016-01-20 00:02:58 +00:00
Geoff Mendal
66841a62f1 Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev 2016-01-11 15:33:48 +00:00
Geoff Mendal
376082a67f Revert "Import translations. DO NOT MERGE" 
This reverts commit a4505e926410cbf20dcd301f35f3496628cad9de.

Change-Id: I5929282b07b1df7a3d618e3be00974609cfcc5cf
 2016-01-11 15:33:28 +00:00
Geoff Mendal
b409a99ccc Revert "Import translations. DO NOT MERGE" am: 8874f9754f -s ours am: 4df8f4abe0 -s ours 
am: 009fb756ec  -s ours

* commit '009fb756ecabd78e5300c619c267f2e55cfd0922':
  Revert "Import translations. DO NOT MERGE"
 2016-01-11 14:36:52 +00:00